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