diff --git a/bin/mpw b/bin/mpw
index 0663c6a..669a0f0 100755
--- a/bin/mpw
+++ b/bin/mpw
@@ -124,7 +124,7 @@ end.parse!
 config      = MPW::Config.new(options[:config])
 check_error = config.checkconfig
 
-cli = Cli.new(config)
+cli = MPW::Cli.new(config)
 	
 # Setup a new config 
 if not check_error or not options[:setup].nil?
diff --git a/lib/mpw/ui/cli.rb b/lib/mpw/ui/cli.rb
index 4d36cd8..3dd85a1 100644
--- a/lib/mpw/ui/cli.rb
+++ b/lib/mpw/ui/cli.rb
@@ -11,6 +11,7 @@ require 'highline/import'
 require "#{APP_ROOT}/../lib/mpw/item.rb"
 require "#{APP_ROOT}/../lib/mpw/mpw.rb"
 
+module MPW
 class Cli
 
 	# Constructor
@@ -88,7 +89,7 @@ class Cli
 	def decrypt
 		if not defined?(@mpw)
 			@password = ask(I18n.t('display.gpg_password')) {|q| q.echo = false}
-			@mpw = MPW::MPW.new(@config.key, @wallet_file, @password)
+			@mpw = MPW.new(@config.key, @wallet_file, @password)
 		end
 
 		@mpw.read_data
@@ -208,7 +209,7 @@ class Cli
 		options[:port]     = ask(I18n.t('form.add.port')).to_s
 		options[:comment]  = ask(I18n.t('form.add.comment')).to_s
 
-		item = MPW::Item.new(options)
+		item = Item.new(options)
 
 		@mpw.add(item)
 		@mpw.set_password(item.id, password)
@@ -299,3 +300,4 @@ class Cli
 		puts "#{I18n.t('display.error')} #18: #{e}".red
 	end
 end
+end