diff --git a/cura_app.py b/cura_app.py
index 3548acedb6..4df40344b9 100755
--- a/cura_app.py
+++ b/cura_app.py
@@ -35,7 +35,7 @@ sys.excepthook = exceptHook
 import Arcus #@UnusedImport
 from UM.Platform import Platform
 import cura.CuraApplication
-import cura.CuraContainerRegistry
+import cura.Settings.CuraContainerRegistry
 
 if Platform.isWindows() and hasattr(sys, "frozen"):
     dirpath = os.path.expanduser("~/AppData/Local/cura/")
@@ -44,7 +44,7 @@ if Platform.isWindows() and hasattr(sys, "frozen"):
     sys.stderr = open(os.path.join(dirpath, "stderr.log"), "w")
 
 # Force an instance of CuraContainerRegistry to be created and reused later.
-cura.CuraContainerRegistry.CuraContainerRegistry.getInstance()
+cura.Settings.CuraContainerRegistry.getInstance()
 
 app = cura.CuraApplication.CuraApplication.getInstance()
 app.run()
diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py
index c91e414a13..d222e37bd9 100644
--- a/plugins/CuraEngineBackend/CuraEngineBackend.py
+++ b/plugins/CuraEngineBackend/CuraEngineBackend.py
@@ -13,7 +13,7 @@ from UM.Resources import Resources
 from UM.Settings.Validator import ValidatorState #To find if a setting is in an error state. We can't slice then.
 from UM.Platform import Platform
 
-from cura.ExtruderManager import ExtruderManager
+from cura.Settings.ExtruderManager import ExtruderManager
 
 from cura.OneAtATimeIterator import OneAtATimeIterator
 from . import ProcessSlicedLayersJob
diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py
index 3d2eb0ed4a..6ed103d0b5 100644
--- a/plugins/CuraEngineBackend/StartSliceJob.py
+++ b/plugins/CuraEngineBackend/StartSliceJob.py
@@ -15,7 +15,7 @@ from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
 from UM.Settings.Validator import ValidatorState
 
 from cura.OneAtATimeIterator import OneAtATimeIterator
-from cura.ExtruderManager import ExtruderManager
+from cura.Settings.ExtruderManager import ExtruderManager
 
 class StartJobResult(IntEnum):
     Finished = 1
diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py
index ddbc06d119..2af4108f23 100644
--- a/plugins/SolidView/SolidView.py
+++ b/plugins/SolidView/SolidView.py
@@ -10,7 +10,7 @@ from UM.View.Renderer import Renderer
 
 from UM.View.GL.OpenGL import OpenGL
 
-from cura.ExtrudersModel import ExtrudersModel
+from cura.Settings.ExtrudersModel import ExtrudersModel
 
 import math