Redefine namespaces and requires

lib/msf/core/exploit/mixins.rb

@@ -29,8 +29,8 @@ require 'msf/core/exploit/dhcp'
 require 'msf/core/exploit/ntlm'
 require 'msf/core/exploit/dcerpc'
 require 'msf/core/exploit/smb/client'
-require 'msf/core/exploit/smb/authenticated'
-require 'msf/core/exploit/smb/psexec'
+require 'msf/core/exploit/smb/client/authenticated'
+require 'msf/core/exploit/smb/client/psexec'
 require 'msf/core/exploit/smb/server'
 require 'msf/core/exploit/ftp'
 require 'msf/core/exploit/tftp'

lib/msf/core/exploit/smb/client.rb

@@ -46,7 +46,7 @@ module Exploit::Remote::SMB::Client
       OptInt.new('SMB::pad_file_level',  [ true, 'Obscure path names used in open/create (level 0-3)', 0]),
       OptInt.new('SMB::obscure_trans_pipe_level',  [ true, 'Obscure PIPE string in TransNamedPipe (level 0-3)', 0]),
 
-    ], Msf::Exploit::Remote::SMB)
+    ], Msf::Exploit::Remote::SMB::Client)
 
     register_advanced_options(
     [
@@ -63,13 +63,13 @@ module Exploit::Remote::SMB::Client
       OptString.new('SMB::Native_OS', [ true, 'The Native OS to send during authentication', 'Windows 2000 2195']),
       OptString.new('SMB::Native_LM', [ true, 'The Native LM to send during authentication', 'Windows 2000 5.0']),
 
-    ], Msf::Exploit::Remote::SMB)
+    ], Msf::Exploit::Remote::SMB::Client)
 
     register_options(
     [
       Opt::RHOST,
       OptInt.new('RPORT', [ true, 'Set the SMB service port', 445])
-    ], Msf::Exploit::Remote::SMB)
+    ], Msf::Exploit::Remote::SMB::Client)
 
     register_autofilter_ports([ 139, 445])
     register_autofilter_services(%W{ netbios-ssn microsoft-ds })

lib/msf/core/exploit/smb/client/authenticated.rb

@@ -4,7 +4,7 @@ module Msf
 
 # Mini-mixin for making SMBUser/SMBPass/SMBDomain regular options vs advanced
 # Included when the module needs credentials to function
-module Exploit::Remote::SMB::Authenticated
+module Exploit::Remote::SMB::Client::Authenticated
 
   include Msf::Exploit::Remote::SMB::Client
 
@@ -15,7 +15,7 @@ module Exploit::Remote::SMB::Authenticated
         OptString.new('SMBUser', [ false, 'The username to authenticate as', '']),
         OptString.new('SMBPass', [ false, 'The password for the specified username', '']),
         OptString.new('SMBDomain',  [ false, 'The Windows domain to use for authentication', 'WORKGROUP']),
-      ], Msf::Exploit::Remote::SMB::Authenticated)
+      ], Msf::Exploit::Remote::SMB::Client::Authenticated)
   end
 end
 

lib/msf/core/exploit/smb/client/psexec.rb

@@ -11,11 +11,11 @@ module Msf
 # and running a binary.
 ####
 
-module Exploit::Remote::SMB::Psexec
+module Exploit::Remote::SMB::Client::Psexec
 
   include Rex::Constants::Windows
   include Msf::Exploit::Remote::DCERPC
-  include Msf::Exploit::Remote::SMB::Authenticated
+  include Msf::Exploit::Remote::SMB::Client::Authenticated
 
   def initialize(info = {})
     super

lib/msf/core/exploit/smb/server.rb

@@ -8,7 +8,7 @@ module Msf
 #
 ###
 
-module Exploit::Remote::SMBServer
+module Exploit::Remote::SMB::Server
   include Exploit::Remote::TcpServer
   include Exploit::NTLM
   CONST = ::Rex::Proto::SMB::Constants