diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index a05e73fe95..d997a88fb6 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -66,19 +66,19 @@ from UM.Settings.SettingFunction import SettingFunction
 from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
 from cura.Settings.MachineNameValidator import MachineNameValidator
 
-from cura.UI.Models.BuildPlateModel import BuildPlateModel
-from cura.UI.Models.NozzleModel import NozzleModel
-from cura.UI.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
-from cura.UI.Models.CustomQualityProfilesDropDownMenuModel import CustomQualityProfilesDropDownMenuModel
-from cura.UI.Models.MultiBuildPlateModel import MultiBuildPlateModel
-from cura.UI.Models.FavoriteMaterialsModel import FavoriteMaterialsModel
-from cura.UI.Models.GenericMaterialsModel import GenericMaterialsModel
-from cura.UI.Models.MaterialBrandsModel import MaterialBrandsModel
-from cura.UI.Models import QualityManagementModel
-from cura.UI.Models.QualitySettingsModel import QualitySettingsModel
-from cura.UI.Models.MachineManagementModel import MachineManagementModel
+from cura.UI.MachineModels.BuildPlateModel import BuildPlateModel
+from cura.UI.MachineModels.NozzleModel import NozzleModel
+from cura.UI.MachineModels.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
+from cura.UI.MachineModels.CustomQualityProfilesDropDownMenuModel import CustomQualityProfilesDropDownMenuModel
+from cura.UI.MachineModels.MultiBuildPlateModel import MultiBuildPlateModel
+from cura.UI.MachineModels.FavoriteMaterialsModel import FavoriteMaterialsModel
+from cura.UI.MachineModels.GenericMaterialsModel import GenericMaterialsModel
+from cura.UI.MachineModels.MaterialBrandsModel import MaterialBrandsModel
+from cura.UI.MachineModels.QualityManagementModel import QualityManagementModel
+from cura.UI.MachineModels.QualitySettingsModel import QualitySettingsModel
+from cura.UI.MachineModels.MachineManagementModel import MachineManagementModel
 
-from cura.UI.Models.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel
+from cura.UI.MachineModels.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel
 
 from cura.Machines.MachineErrorChecker import MachineErrorChecker
 
@@ -111,7 +111,7 @@ from cura.Settings.CuraFormulaFunctions import CuraFormulaFunctions
 
 from cura.UI.ObjectsModel import ObjectsModel
 
-from cura.UI.Models.DiscoveredPrintersModel import DiscoveredPrintersModel
+from cura.UI.MachineModels.DiscoveredPrintersModel import DiscoveredPrintersModel
 
 from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
 from cura.PrinterOutput.NetworkMJPGImage import NetworkMJPGImage
diff --git a/cura/Scene/CuraSceneController.py b/cura/Scene/CuraSceneController.py
index e331a109ec..b0e9e10c32 100644
--- a/cura/Scene/CuraSceneController.py
+++ b/cura/Scene/CuraSceneController.py
@@ -5,7 +5,7 @@ from PyQt5.QtWidgets import QApplication
 
 from UM.Scene.Camera import Camera
 from cura.UI.ObjectsModel import ObjectsModel
-from cura.UI.Models.MultiBuildPlateModel import MultiBuildPlateModel
+from cura.UI.MachineModels.MultiBuildPlateModel import MultiBuildPlateModel
 
 from UM.Application import Application
 from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
diff --git a/cura/UI/MachineModels/CustomQualityProfilesDropDownMenuModel.py b/cura/UI/MachineModels/CustomQualityProfilesDropDownMenuModel.py
index 9a31256ec3..387182dd90 100644
--- a/cura/UI/MachineModels/CustomQualityProfilesDropDownMenuModel.py
+++ b/cura/UI/MachineModels/CustomQualityProfilesDropDownMenuModel.py
@@ -3,7 +3,7 @@
 
 from UM.Logger import Logger
 
-from cura.UI.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
+from cura.UI.MachineModels.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
 
 
 #
diff --git a/cura/UI/MachineModels/FavoriteMaterialsModel.py b/cura/UI/MachineModels/FavoriteMaterialsModel.py
index 2540fd0608..b81c25a2b4 100644
--- a/cura/UI/MachineModels/FavoriteMaterialsModel.py
+++ b/cura/UI/MachineModels/FavoriteMaterialsModel.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from cura.UI.Models.BaseMaterialsModel import BaseMaterialsModel
+from cura.UI.MachineModels.BaseMaterialsModel import BaseMaterialsModel
 
 ##  Model that shows the list of favorite materials.
 class FavoriteMaterialsModel(BaseMaterialsModel):
diff --git a/cura/UI/MachineModels/GenericMaterialsModel.py b/cura/UI/MachineModels/GenericMaterialsModel.py
index a99cdfc8eb..122bb3fc8f 100644
--- a/cura/UI/MachineModels/GenericMaterialsModel.py
+++ b/cura/UI/MachineModels/GenericMaterialsModel.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from cura.UI.Models.BaseMaterialsModel import BaseMaterialsModel
+from cura.UI.MachineModels.BaseMaterialsModel import BaseMaterialsModel
 
 class GenericMaterialsModel(BaseMaterialsModel):
 
diff --git a/cura/UI/MachineModels/MaterialBrandsModel.py b/cura/UI/MachineModels/MaterialBrandsModel.py
index 7f02dd5302..bd641d29e7 100644
--- a/cura/UI/MachineModels/MaterialBrandsModel.py
+++ b/cura/UI/MachineModels/MaterialBrandsModel.py
@@ -3,7 +3,7 @@
 
 from PyQt5.QtCore import Qt, pyqtSignal
 from UM.Qt.ListModel import ListModel
-from cura.UI.Models.BaseMaterialsModel import BaseMaterialsModel
+from cura.UI.MachineModels.BaseMaterialsModel import BaseMaterialsModel
 
 class MaterialTypesModel(ListModel):
 
diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py
index 3d0d4fb11e..0527b4534e 100755
--- a/plugins/CuraEngineBackend/CuraEngineBackend.py
+++ b/plugins/CuraEngineBackend/CuraEngineBackend.py
@@ -30,7 +30,7 @@ from .StartSliceJob import StartSliceJob, StartJobResult
 import Arcus
 
 if TYPE_CHECKING:
-    from cura.UI.Models.MultiBuildPlateModel import MultiBuildPlateModel
+    from cura.UI.MachineModels.MultiBuildPlateModel import MultiBuildPlateModel
     from cura.Machines.MachineErrorChecker import MachineErrorChecker
     from UM.Scene.Scene import Scene
     from UM.Settings.ContainerStack import ContainerStack
diff --git a/tests/Settings/TestSettingVisibilityPresets.py b/tests/Settings/TestSettingVisibilityPresets.py
index 079bda3912..13089e8aa6 100644
--- a/tests/Settings/TestSettingVisibilityPresets.py
+++ b/tests/Settings/TestSettingVisibilityPresets.py
@@ -5,7 +5,7 @@ import os.path
 from UM.Preferences import Preferences
 from UM.Resources import Resources
 from cura.CuraApplication import CuraApplication
-from cura.UI.Models.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel
+from cura.UI.MachineModels.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel
 from cura.Settings.SettingVisibilityPreset import SettingVisibilityPreset
 
 setting_visibility_preset_test_settings = {"test", "zomg", "derp", "yay", "whoo"}