diff --git a/SimPEG/Examples1/DC.py b/SimPEG/Examples/DC.py
similarity index 100%
rename from SimPEG/Examples1/DC.py
rename to SimPEG/Examples/DC.py
diff --git a/SimPEG/Examples1/Linear.py b/SimPEG/Examples/Linear.py
similarity index 100%
rename from SimPEG/Examples1/Linear.py
rename to SimPEG/Examples/Linear.py
diff --git a/SimPEG/Examples1/__init__.py b/SimPEG/Examples/__init__.py
similarity index 100%
rename from SimPEG/Examples1/__init__.py
rename to SimPEG/Examples/__init__.py
diff --git a/SimPEG/Inverse1/BetaSchedule.py b/SimPEG/Inverse/BetaSchedule.py
similarity index 100%
rename from SimPEG/Inverse1/BetaSchedule.py
rename to SimPEG/Inverse/BetaSchedule.py
diff --git a/SimPEG/Inverse1/Inversion.py b/SimPEG/Inverse/Inversion.py
similarity index 100%
rename from SimPEG/Inverse1/Inversion.py
rename to SimPEG/Inverse/Inversion.py
diff --git a/SimPEG/Inverse1/Optimize.py b/SimPEG/Inverse/Optimize.py
similarity index 100%
rename from SimPEG/Inverse1/Optimize.py
rename to SimPEG/Inverse/Optimize.py
diff --git a/SimPEG/Inverse1/Regularization.py b/SimPEG/Inverse/Regularization.py
similarity index 100%
rename from SimPEG/Inverse1/Regularization.py
rename to SimPEG/Inverse/Regularization.py
diff --git a/SimPEG/Inverse1/__init__.py b/SimPEG/Inverse/__init__.py
similarity index 100%
rename from SimPEG/Inverse1/__init__.py
rename to SimPEG/Inverse/__init__.py
diff --git a/SimPEG/Mesh1/BaseMesh.py b/SimPEG/Mesh/BaseMesh.py
similarity index 100%
rename from SimPEG/Mesh1/BaseMesh.py
rename to SimPEG/Mesh/BaseMesh.py
diff --git a/SimPEG/Mesh1/Cyl1DMesh.py b/SimPEG/Mesh/Cyl1DMesh.py
similarity index 100%
rename from SimPEG/Mesh1/Cyl1DMesh.py
rename to SimPEG/Mesh/Cyl1DMesh.py
diff --git a/SimPEG/Mesh1/DiffOperators.py b/SimPEG/Mesh/DiffOperators.py
similarity index 100%
rename from SimPEG/Mesh1/DiffOperators.py
rename to SimPEG/Mesh/DiffOperators.py
diff --git a/SimPEG/Mesh1/InnerProducts.py b/SimPEG/Mesh/InnerProducts.py
similarity index 100%
rename from SimPEG/Mesh1/InnerProducts.py
rename to SimPEG/Mesh/InnerProducts.py
diff --git a/SimPEG/Mesh1/LogicallyOrthogonalMesh.py b/SimPEG/Mesh/LogicallyOrthogonalMesh.py
similarity index 100%
rename from SimPEG/Mesh1/LogicallyOrthogonalMesh.py
rename to SimPEG/Mesh/LogicallyOrthogonalMesh.py
diff --git a/SimPEG/Mesh1/LomView.py b/SimPEG/Mesh/LomView.py
similarity index 100%
rename from SimPEG/Mesh1/LomView.py
rename to SimPEG/Mesh/LomView.py
diff --git a/SimPEG/Mesh1/TensorMesh.py b/SimPEG/Mesh/TensorMesh.py
similarity index 100%
rename from SimPEG/Mesh1/TensorMesh.py
rename to SimPEG/Mesh/TensorMesh.py
diff --git a/SimPEG/Mesh1/TensorView.py b/SimPEG/Mesh/TensorView.py
similarity index 100%
rename from SimPEG/Mesh1/TensorView.py
rename to SimPEG/Mesh/TensorView.py
diff --git a/SimPEG/Mesh1/__init__.py b/SimPEG/Mesh/__init__.py
similarity index 100%
rename from SimPEG/Mesh1/__init__.py
rename to SimPEG/Mesh/__init__.py
diff --git a/SimPEG/Tests1/HTMLTestRunner.py b/SimPEG/Tests/HTMLTestRunner.py
similarity index 100%
rename from SimPEG/Tests1/HTMLTestRunner.py
rename to SimPEG/Tests/HTMLTestRunner.py
diff --git a/SimPEG/Tests1/TestUtils.py b/SimPEG/Tests/TestUtils.py
similarity index 100%
rename from SimPEG/Tests1/TestUtils.py
rename to SimPEG/Tests/TestUtils.py
diff --git a/SimPEG/Tests1/__init__.py b/SimPEG/Tests/__init__.py
similarity index 100%
rename from SimPEG/Tests1/__init__.py
rename to SimPEG/Tests/__init__.py
diff --git a/SimPEG/Tests1/runTests.py b/SimPEG/Tests/runTests.py
similarity index 100%
rename from SimPEG/Tests1/runTests.py
rename to SimPEG/Tests/runTests.py
diff --git a/SimPEG/Tests1/runTests.sh b/SimPEG/Tests/runTests.sh
similarity index 100%
rename from SimPEG/Tests1/runTests.sh
rename to SimPEG/Tests/runTests.sh
diff --git a/SimPEG/Tests1/test_LogicallyOrthogonalMesh.py b/SimPEG/Tests/test_LogicallyOrthogonalMesh.py
similarity index 100%
rename from SimPEG/Tests1/test_LogicallyOrthogonalMesh.py
rename to SimPEG/Tests/test_LogicallyOrthogonalMesh.py
diff --git a/SimPEG/Tests1/test_Solver.py b/SimPEG/Tests/test_Solver.py
similarity index 100%
rename from SimPEG/Tests1/test_Solver.py
rename to SimPEG/Tests/test_Solver.py
diff --git a/SimPEG/Tests1/test_basemesh.py b/SimPEG/Tests/test_basemesh.py
similarity index 100%
rename from SimPEG/Tests1/test_basemesh.py
rename to SimPEG/Tests/test_basemesh.py
diff --git a/SimPEG/Tests1/test_forward_DCproblem.py b/SimPEG/Tests/test_forward_DCproblem.py
similarity index 100%
rename from SimPEG/Tests1/test_forward_DCproblem.py
rename to SimPEG/Tests/test_forward_DCproblem.py
diff --git a/SimPEG/Tests1/test_interpolation.py b/SimPEG/Tests/test_interpolation.py
similarity index 100%
rename from SimPEG/Tests1/test_interpolation.py
rename to SimPEG/Tests/test_interpolation.py
diff --git a/SimPEG/Tests1/test_massMatrices.py b/SimPEG/Tests/test_massMatrices.py
similarity index 100%
rename from SimPEG/Tests1/test_massMatrices.py
rename to SimPEG/Tests/test_massMatrices.py
diff --git a/SimPEG/Tests1/test_model.py b/SimPEG/Tests/test_model.py
similarity index 100%
rename from SimPEG/Tests1/test_model.py
rename to SimPEG/Tests/test_model.py
diff --git a/SimPEG/Tests1/test_operators.py b/SimPEG/Tests/test_operators.py
similarity index 100%
rename from SimPEG/Tests1/test_operators.py
rename to SimPEG/Tests/test_operators.py
diff --git a/SimPEG/Tests1/test_optimizers.py b/SimPEG/Tests/test_optimizers.py
similarity index 100%
rename from SimPEG/Tests1/test_optimizers.py
rename to SimPEG/Tests/test_optimizers.py
diff --git a/SimPEG/Tests1/test_problem.py b/SimPEG/Tests/test_problem.py
similarity index 100%
rename from SimPEG/Tests1/test_problem.py
rename to SimPEG/Tests/test_problem.py
diff --git a/SimPEG/Tests1/test_tensorMesh.py b/SimPEG/Tests/test_tensorMesh.py
similarity index 100%
rename from SimPEG/Tests1/test_tensorMesh.py
rename to SimPEG/Tests/test_tensorMesh.py
diff --git a/SimPEG/Tests1/test_utils.py b/SimPEG/Tests/test_utils.py
similarity index 100%
rename from SimPEG/Tests1/test_utils.py
rename to SimPEG/Tests/test_utils.py
diff --git a/SimPEG/Utils1/Geophysics/__init__.py b/SimPEG/Utils/Geophysics/__init__.py
similarity index 100%
rename from SimPEG/Utils1/Geophysics/__init__.py
rename to SimPEG/Utils/Geophysics/__init__.py
diff --git a/SimPEG/Utils1/Geophysics/emSources/__init__.py b/SimPEG/Utils/Geophysics/emSources/__init__.py
similarity index 100%
rename from SimPEG/Utils1/Geophysics/emSources/__init__.py
rename to SimPEG/Utils/Geophysics/emSources/__init__.py
diff --git a/SimPEG/Utils1/Geophysics/emSources/emSources.py b/SimPEG/Utils/Geophysics/emSources/emSources.py
similarity index 100%
rename from SimPEG/Utils1/Geophysics/emSources/emSources.py
rename to SimPEG/Utils/Geophysics/emSources/emSources.py
diff --git a/SimPEG/Utils1/ModelBuilder.py b/SimPEG/Utils/ModelBuilder.py
similarity index 100%
rename from SimPEG/Utils1/ModelBuilder.py
rename to SimPEG/Utils/ModelBuilder.py
diff --git a/SimPEG/Utils1/Save.py b/SimPEG/Utils/Save.py
similarity index 100%
rename from SimPEG/Utils1/Save.py
rename to SimPEG/Utils/Save.py
diff --git a/SimPEG/Utils1/Solver.py b/SimPEG/Utils/Solver.py
similarity index 100%
rename from SimPEG/Utils1/Solver.py
rename to SimPEG/Utils/Solver.py
diff --git a/SimPEG/Utils1/TriSolve.f b/SimPEG/Utils/TriSolve.f
similarity index 100%
rename from SimPEG/Utils1/TriSolve.f
rename to SimPEG/Utils/TriSolve.f
diff --git a/SimPEG/Utils1/__init__.py b/SimPEG/Utils/__init__.py
similarity index 100%
rename from SimPEG/Utils1/__init__.py
rename to SimPEG/Utils/__init__.py
diff --git a/SimPEG/Utils1/interputils.py b/SimPEG/Utils/interputils.py
similarity index 100%
rename from SimPEG/Utils1/interputils.py
rename to SimPEG/Utils/interputils.py
diff --git a/SimPEG/Utils1/ipythonutils.py b/SimPEG/Utils/ipythonutils.py
similarity index 100%
rename from SimPEG/Utils1/ipythonutils.py
rename to SimPEG/Utils/ipythonutils.py
diff --git a/SimPEG/Utils1/lomutils.py b/SimPEG/Utils/lomutils.py
similarity index 100%
rename from SimPEG/Utils1/lomutils.py
rename to SimPEG/Utils/lomutils.py
diff --git a/SimPEG/Utils1/matutils.py b/SimPEG/Utils/matutils.py
similarity index 100%
rename from SimPEG/Utils1/matutils.py
rename to SimPEG/Utils/matutils.py
diff --git a/SimPEG/Utils1/meshutils.py b/SimPEG/Utils/meshutils.py
similarity index 100%
rename from SimPEG/Utils1/meshutils.py
rename to SimPEG/Utils/meshutils.py
diff --git a/SimPEG/Utils1/sputils.py b/SimPEG/Utils/sputils.py
similarity index 100%
rename from SimPEG/Utils1/sputils.py
rename to SimPEG/Utils/sputils.py