diff --git a/lib/msf/core/exploit/smb/server/share.rb b/lib/msf/core/exploit/smb/server/share.rb
index 01710b55cb..ebb21245b0 100644
--- a/lib/msf/core/exploit/smb/server/share.rb
+++ b/lib/msf/core/exploit/smb/server/share.rb
@@ -21,18 +21,12 @@ module Msf
       include Msf::Exploit::Remote::SMB::Server::Share::Command::NtCreateAndx
       include Msf::Exploit::Remote::SMB::Server::Share::Command::ReadAndx
       include Msf::Exploit::Remote::SMB::Server::Share::Command::SessionSetupAndx
+      include Msf::Exploit::Remote::SMB::Server::Share::Command::Trans2
+      include Msf::Exploit::Remote::SMB::Server::Share::Command::Trans2::FindFirst2
+      include Msf::Exploit::Remote::SMB::Server::Share::Command::Trans2::QueryFileInformation
+      include Msf::Exploit::Remote::SMB::Server::Share::Command::Trans2::QueryPathInformation
       include Msf::Exploit::Remote::SMB::Server::Share::InformationLevel::Find
       include Msf::Exploit::Remote::SMB::Server::Share::InformationLevel::Query
-      include Msf::Exploit::Remote::SMB::Server::Share::SubCommand::Trans2
-      include Msf::Exploit::Remote::SMB::Server::Share::SubCommand::Trans2::FindFirst2
-      include Msf::Exploit::Remote::SMB::Server::Share::SubCommand::Trans2::QueryFileInformation
-      include Msf::Exploit::Remote::SMB::Server::Share::SubCommand::Trans2::QueryPathInformation
-      include Msf::Exploit::Remote::SMB::Server::Share::InformationLevel::Find
-      include Msf::Exploit::Remote::SMB::Server::Share::InformationLevel::Query
-      include Msf::Exploit::Remote::SMB::Server::Share::SubCommand::Trans2
-      include Msf::Exploit::Remote::SMB::Server::Share::SubCommand::Trans2::FindFirst2
-      include Msf::Exploit::Remote::SMB::Server::Share::SubCommand::Trans2::QueryFileInformation
-      include Msf::Exploit::Remote::SMB::Server::Share::SubCommand::Trans2::QueryPathInformation
 
       include Msf::Exploit::Remote::SMB::Server
 
diff --git a/lib/msf/core/exploit/smb/server/share/command.rb b/lib/msf/core/exploit/smb/server/share/command.rb
index 92878afa7e..1d6c708be6 100644
--- a/lib/msf/core/exploit/smb/server/share/command.rb
+++ b/lib/msf/core/exploit/smb/server/share/command.rb
@@ -9,6 +9,7 @@ module Msf
         require 'msf/core/exploit/smb/server/share/command/nt_create_andx'
         require 'msf/core/exploit/smb/server/share/command/read_andx'
         require 'msf/core/exploit/smb/server/share/command/session_setup_andx'
+        require 'msf/core/exploit/smb/server/share/command/trans2'
       end
     end
   end
diff --git a/lib/msf/core/exploit/smb/server/share/command/trans2.rb b/lib/msf/core/exploit/smb/server/share/command/trans2.rb
index 0504c4ec74..8ae27c9e8a 100644
--- a/lib/msf/core/exploit/smb/server/share/command/trans2.rb
+++ b/lib/msf/core/exploit/smb/server/share/command/trans2.rb
@@ -3,11 +3,11 @@
 module Msf
   module Exploit::Remote::SMB::Server
     module Share
-      module SubCommand
+      module Command
         module Trans2
-          require 'msf/core/exploit/smb/server/share/sub_command/trans2/find_first2'
-          require 'msf/core/exploit/smb/server/share/sub_command/trans2/query_file_information'
-          require 'msf/core/exploit/smb/server/share/sub_command/trans2/query_path_information'
+          require 'msf/core/exploit/smb/server/share/command/trans2/find_first2'
+          require 'msf/core/exploit/smb/server/share/command/trans2/query_file_information'
+          require 'msf/core/exploit/smb/server/share/command/trans2/query_path_information'
 
           #
           # Responds to client TRANSACTION2 requests and dispatches the request off to
diff --git a/lib/msf/core/exploit/smb/server/share/command/trans2/find_first2.rb b/lib/msf/core/exploit/smb/server/share/command/trans2/find_first2.rb
index d69e558c9e..b70b3f11a5 100644
--- a/lib/msf/core/exploit/smb/server/share/command/trans2/find_first2.rb
+++ b/lib/msf/core/exploit/smb/server/share/command/trans2/find_first2.rb
@@ -3,7 +3,7 @@
 module Msf
   module Exploit::Remote::SMB::Server
     module Share
-      module SubCommand
+      module Command
         module Trans2
           # This mixin provides methods to handle TRAN2_FIND_FIRST2 subcommands
           module FindFirst2
diff --git a/lib/msf/core/exploit/smb/server/share/command/trans2/query_file_information.rb b/lib/msf/core/exploit/smb/server/share/command/trans2/query_file_information.rb
index 9965c81ec2..13bbaa96e1 100644
--- a/lib/msf/core/exploit/smb/server/share/command/trans2/query_file_information.rb
+++ b/lib/msf/core/exploit/smb/server/share/command/trans2/query_file_information.rb
@@ -3,7 +3,7 @@
 module Msf
   module Exploit::Remote::SMB::Server
     module Share
-      module SubCommand
+      module Command
         module Trans2
           # This mixin provides methods to handle TRAN2_QUERY_PATH_INFORMATION subcommands
           module QueryFileInformation
diff --git a/lib/msf/core/exploit/smb/server/share/command/trans2/query_path_information.rb b/lib/msf/core/exploit/smb/server/share/command/trans2/query_path_information.rb
index a191012bd4..bfb5c140d3 100644
--- a/lib/msf/core/exploit/smb/server/share/command/trans2/query_path_information.rb
+++ b/lib/msf/core/exploit/smb/server/share/command/trans2/query_path_information.rb
@@ -3,7 +3,7 @@
 module Msf
   module Exploit::Remote::SMB::Server
     module Share
-      module SubCommand
+      module Command
         module Trans2
           # This mixin provides methods to handle TRAN2_QUERY_PATH_INFORMATION subcommands
           module QueryPathInformation