diff --git a/lib/mpw/cli.rb b/lib/mpw/cli.rb
index 7f1c2da..d2dcd0b 100644
--- a/lib/mpw/cli.rb
+++ b/lib/mpw/cli.rb
@@ -26,8 +26,7 @@ require 'tmpdir'
 require 'mpw/item'
 require 'mpw/mpw'
 
-module MPW
-class Cli
+class MPW::Cli
 
   # Constructor
   # @args: config -> the config
@@ -533,4 +532,3 @@ class Cli
     puts "#{I18n.t('display.error')} #18: #{e}".red
   end
 end
-end
diff --git a/lib/mpw/config.rb b/lib/mpw/config.rb
index c722c39..4c4e259 100644
--- a/lib/mpw/config.rb
+++ b/lib/mpw/config.rb
@@ -21,8 +21,7 @@ require 'yaml'
 require 'i18n'
 require 'fileutils'
 
-module MPW
-class Config
+class MPW::Config
 
   attr_accessor :error_msg
 
@@ -156,4 +155,3 @@ class Config
     false
   end
 end
-end
diff --git a/lib/mpw/item.rb b/lib/mpw/item.rb
index 225a3d7..a5528a6 100644
--- a/lib/mpw/item.rb
+++ b/lib/mpw/item.rb
@@ -18,8 +18,7 @@
 
 require 'i18n'
 
-module MPW
-class Item
+class MPW::Item
 
   attr_accessor :id
   attr_accessor :group
@@ -100,4 +99,3 @@ class Item
     ([*('A'..'Z'), *('a'..'z'), *('0'..'9')]).sample(16).join
   end
 end
-end
diff --git a/lib/mpw/mpw.rb b/lib/mpw/mpw.rb
index ffdccff..0eac01c 100644
--- a/lib/mpw/mpw.rb
+++ b/lib/mpw/mpw.rb
@@ -23,8 +23,7 @@ require 'yaml'
 require 'rotp'
 require 'mpw/item'
 
-module MPW
-class MPW
+class MPW::MPW
 
   # Constructor
   def initialize(key, wallet_file, gpg_pass = nil, gpg_exe = nil)
@@ -361,4 +360,3 @@ class MPW
     raise "#{I18n.t('error.gpg_file.encrypt')}\n#{e}"
   end
 end
-end