diff --git a/cura/ContainerManager.py b/cura/Settings/ContainerManager.py
similarity index 100%
rename from cura/ContainerManager.py
rename to cura/Settings/ContainerManager.py
diff --git a/cura/ContainerSettingsModel.py b/cura/Settings/ContainerSettingsModel.py
similarity index 100%
rename from cura/ContainerSettingsModel.py
rename to cura/Settings/ContainerSettingsModel.py
diff --git a/cura/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py
similarity index 100%
rename from cura/CuraContainerRegistry.py
rename to cura/Settings/CuraContainerRegistry.py
diff --git a/cura/ExtruderManager.py b/cura/Settings/ExtruderManager.py
similarity index 100%
rename from cura/ExtruderManager.py
rename to cura/Settings/ExtruderManager.py
diff --git a/cura/ExtrudersModel.py b/cura/Settings/ExtrudersModel.py
similarity index 100%
rename from cura/ExtrudersModel.py
rename to cura/Settings/ExtrudersModel.py
diff --git a/cura/SettingOverrideDecorator.py b/cura/Settings/SettingOverrideDecorator.py
similarity index 100%
rename from cura/SettingOverrideDecorator.py
rename to cura/Settings/SettingOverrideDecorator.py
diff --git a/cura/Settings/__init__.py b/cura/Settings/__init__.py
index d6fe389478..c3d45dc81e 100644
--- a/cura/Settings/__init__.py
+++ b/cura/Settings/__init__.py
@@ -1,2 +1,11 @@
+# Copyright (c) 2016 Ultimaker B.V.
+# Cura is released under the terms of the AGPLv3 or higher.
 
 from .MaterialSettingsVisibilityHandler import MaterialSettingsVisibilityHandler
+from .ContainerManager import ContainerManager
+from .ContainerSettingsModel import ContainerSettingsModel
+from .CuraContainerRegistry import CuraContainerRegistry
+from .ExtruderManager import ExtruderManager
+from .ExtrudersModel import ExtrudersModel
+from .MaterialSettingsVisibilityHandler import MaterialSettingsVisibilityHandler
+from .SettingOverrideDecorator import SettingOverrideDecorator