diff --git a/MPW/Config.rb b/lib/Config.rb
similarity index 100%
rename from MPW/Config.rb
rename to lib/Config.rb
diff --git a/MPW/MPW.rb b/lib/MPW.rb
similarity index 100%
rename from MPW/MPW.rb
rename to lib/MPW.rb
diff --git a/MPW/Server.rb b/lib/Server.rb
similarity index 100%
rename from MPW/Server.rb
rename to lib/Server.rb
diff --git a/MPW/Sync/FTP.rb b/lib/Sync/FTP.rb
similarity index 100%
rename from MPW/Sync/FTP.rb
rename to lib/Sync/FTP.rb
diff --git a/MPW/Sync/MPWSync.rb b/lib/Sync/MPWSync.rb
similarity index 100%
rename from MPW/Sync/MPWSync.rb
rename to lib/Sync/MPWSync.rb
diff --git a/MPW/Sync/SSH.rb b/lib/Sync/SSH.rb
similarity index 100%
rename from MPW/Sync/SSH.rb
rename to lib/Sync/SSH.rb
diff --git a/MPW/UI/Cli.rb b/lib/UI/Cli.rb
similarity index 98%
rename from MPW/UI/Cli.rb
rename to lib/UI/Cli.rb
index 3a3502c..c045885 100644
--- a/MPW/UI/Cli.rb
+++ b/lib/UI/Cli.rb
@@ -10,7 +10,7 @@ require 'readline'
 require 'i18n'
 require 'yaml'
 
-require "#{APP_ROOT}/MPW/MPW"
+require "#{APP_ROOT}/lib/MPW"
 
 class Cli
 
@@ -27,13 +27,13 @@ class Cli
 		if !defined?(@sync)
 			case @config.sync_type
 			when 'mpw'
-				require "#{APP_ROOT}/MPW/Sync/MPWSync"
+				require "#{APP_ROOT}/lib/Sync/MPWSync"
 				@sync = MPW::Sync::MPWSync.new
 			when 'sftp', 'scp', 'ssh'
-				require "#{APP_ROOT}/MPW/Sync/SSH"
+				require "#{APP_ROOT}/lib/Sync/SSH"
 				@sync = MPW::Sync::SSH.new
 			when 'ftp'
-				require "#{APP_ROOT}/MPW/Sync/FTP"
+				require "#{APP_ROOT}/lib/Sync/FTP"
 				@sync = MPW::Sync::FTP.new
 			else
 				return false
diff --git a/MPW/UI/CliSSH.rb b/lib/UI/CliSSH.rb
similarity index 100%
rename from MPW/UI/CliSSH.rb
rename to lib/UI/CliSSH.rb
diff --git a/mpw b/mpw
index 3c206de..1250bba 100755
--- a/mpw
+++ b/mpw
@@ -10,9 +10,9 @@ require 'locale'
 require 'i18n'
 
 APP_ROOT = File.dirname(Pathname.new(__FILE__).realpath)
-require "#{APP_ROOT}/MPW/UI/Cli"
-require "#{APP_ROOT}/MPW/Config"
-require "#{APP_ROOT}/MPW/MPW"
+require "#{APP_ROOT}/lib/UI/Cli"
+require "#{APP_ROOT}/lib/Config"
+require "#{APP_ROOT}/lib/MPW"
 
 # --------------------------------------------------------- #
 # Set local
diff --git a/mpw-server b/mpw-server
index 0c94289..688973f 100755
--- a/mpw-server
+++ b/mpw-server
@@ -10,7 +10,7 @@ require 'locale'
 require 'i18n'
 
 APP_ROOT = File.dirname(Pathname.new(__FILE__).realpath)
-require "#{APP_ROOT}/MPW/Server.rb"
+require "#{APP_ROOT}/lib/Server.rb"
 
 # --------------------------------------------------------- #
 # Set local
diff --git a/mpw-ssh b/mpw-ssh
index 1af952d..5674b1e 100755
--- a/mpw-ssh
+++ b/mpw-ssh
@@ -10,8 +10,8 @@ require 'locale'
 require 'i18n'
 
 APP_ROOT = File.dirname(Pathname.new(__FILE__).realpath)
-require "#{APP_ROOT}/MPW/UI/CliSSH"
-require "#{APP_ROOT}/MPW/Config"
+require "#{APP_ROOT}/lib/UI/CliSSH"
+require "#{APP_ROOT}/lib/Config"
 
 lang = Locale::Tag.parse(ENV['LANG']).to_simple.to_s[0..1]