diff --git a/mach b/mach
index c077d099c04..743dbbda8c8 100755
--- a/mach
+++ b/mach
@@ -38,7 +38,6 @@ our_dir = os.path.dirname(os.path.abspath(__file__))
 try:
     import mach.main
 except ImportError:
-    SEARCH_PATHS.reverse()
     sys.path[0:0] = [os.path.join(our_dir, path) for path in SEARCH_PATHS]
 
     import mach.main
diff --git a/python/mach/mach/commands/__init__.py b/python/mach/mach/commands/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/mach/mach/settings.py b/python/mach/mach/commands/settings.py
similarity index 100%
rename from python/mach/mach/settings.py
rename to python/mach/mach/commands/settings.py
diff --git a/python/mach/mach/main.py b/python/mach/mach/main.py
index 053029d9dfb..987c179e287 100644
--- a/python/mach/mach/main.py
+++ b/python/mach/mach/main.py
@@ -22,11 +22,10 @@ from mach.registrar import populate_argument_parser
 # Import sub-command modules
 # TODO Bug 794509 do this via auto-discovery. Update README once this is
 # done.
-from mach.build import Build
-from mach.settings import Settings
-from mach.testing import Testing
-from mach.warnings import Warnings
-
+from mach.commands.build import Build
+from mach.commands.settings import Settings
+from mach.commands.testing import Testing
+from mach.commands.warnings import Warnings
 
 # Classes inheriting from ConfigProvider that provide settings.
 # TODO this should come from auto-discovery somehow.
diff --git a/python/mozbuild/mach/__init__.py b/python/mozbuild/mach/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/mozbuild/mach/commands/__init__.py b/python/mozbuild/mach/commands/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/python/mach/mach/build.py b/python/mozbuild/mach/commands/build.py
similarity index 100%
rename from python/mach/mach/build.py
rename to python/mozbuild/mach/commands/build.py
diff --git a/python/mach/mach/testing.py b/python/mozbuild/mach/commands/testing.py
similarity index 100%
rename from python/mach/mach/testing.py
rename to python/mozbuild/mach/commands/testing.py
diff --git a/python/mach/mach/warnings.py b/python/mozbuild/mach/commands/warnings.py
similarity index 100%
rename from python/mach/mach/warnings.py
rename to python/mozbuild/mach/commands/warnings.py
diff --git a/python/mozbuild/setup.py b/python/mozbuild/setup.py
index fe267abee61..91d6a3964c2 100644
--- a/python/mozbuild/setup.py
+++ b/python/mozbuild/setup.py
@@ -10,6 +10,6 @@ setup(
     name='mozbuild',
     description='Mozilla build system functionality.',
     license='MPL 2.0',
-    packages=['mozbuild'],
+    packages=['mach', 'mozbuild'],
     version=VERSION
 )