diff --git a/bin/mpw b/bin/mpw
index f36bc87..f385cb7 100755
--- a/bin/mpw
+++ b/bin/mpw
@@ -8,9 +8,6 @@ require 'pathname'
 require 'locale'
 require 'set'
 require 'i18n'
-require 'mpw/mpw'
-require 'mpw/config'
-require 'mpw/cli'
 
 # --------------------------------------------------------- #
 # Set local
@@ -24,6 +21,11 @@ end
 
 APP_ROOT = File.dirname(Pathname.new(__FILE__).realpath)
 
+# TODO
+require "#{APP_ROOT}/../lib/mpw/mpw.rb"
+require "#{APP_ROOT}/../lib/mpw/config.rb"
+require "#{APP_ROOT}/../lib/mpw/ui/cli.rb"
+
 I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
 I18n.load_path      = Dir["#{APP_ROOT}/../i18n/cli/*.yml"]
 I18n.default_locale = :en
diff --git a/lib/mpw/mpw.rb b/lib/mpw/mpw.rb
index 9fad675..654cd25 100644
--- a/lib/mpw/mpw.rb
+++ b/lib/mpw/mpw.rb
@@ -7,7 +7,9 @@ require 'gpgme'
 require 'i18n'
 require 'fileutils'
 require 'yaml'
-require 'mpw/item'
+
+#TODO
+require "#{APP_ROOT}/../lib/mpw/item.rb"
 	
 module MPW
 class MPW
diff --git a/lib/mpw/ui/cli.rb b/lib/mpw/ui/cli.rb
index bb6768e..1d05c8b 100644
--- a/lib/mpw/ui/cli.rb
+++ b/lib/mpw/ui/cli.rb
@@ -6,8 +6,10 @@ require 'readline'
 require 'i18n'
 require 'colorize'
 require 'highline/import'
-require 'mpw/mpw'
-require 'mpw/item'
+
+#TODO
+require "#{APP_ROOT}/../lib/mpw/item.rb"
+require "#{APP_ROOT}/../lib/mpw/mpw.rb"
 
 class Cli