diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt
index b9ddd618d..e980fb578 100644
--- a/src/modules/partition/CMakeLists.txt
+++ b/src/modules/partition/CMakeLists.txt
@@ -21,34 +21,34 @@ calamares_add_plugin( partition
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
-        BootLoaderModel.cpp
-        CheckFileSystemJob.cpp
-        ColorUtils.cpp
-        CreatePartitionDialog.cpp
-        CreatePartitionJob.cpp
-        CreatePartitionTableJob.cpp
-        DeletePartitionJob.cpp
-        DeviceModel.cpp
-        EditExistingPartitionDialog.cpp
-        FillGlobalStorageJob.cpp
-        FormatPartitionJob.cpp
-        MoveFileSystemJob.cpp
-        PartitionCoreModule.cpp
-        PartitionInfo.cpp
-        PartitionIterator.cpp
-        PartitionJob.cpp
-        PartitionModel.cpp
-        PartitionPage.cpp
-        PartitionPreview.cpp
-        PartitionSizeController.cpp
-        PartitionViewStep.cpp
-        PMUtils.cpp
-        ResizePartitionJob.cpp
+        core/BootLoaderModel.cpp
+        core/ColorUtils.cpp
+        core/DeviceModel.cpp
+        core/PartitionCoreModule.cpp
+        core/PartitionInfo.cpp
+        core/PartitionIterator.cpp
+        core/PartitionModel.cpp
+        core/PMUtils.cpp
+        gui/CreatePartitionDialog.cpp
+        gui/EditExistingPartitionDialog.cpp
+        gui/PartitionPage.cpp
+        gui/PartitionPreview.cpp
+        gui/PartitionSizeController.cpp
+        gui/PartitionViewStep.cpp
+        jobs/CheckFileSystemJob.cpp
+        jobs/CreatePartitionJob.cpp
+        jobs/CreatePartitionTableJob.cpp
+        jobs/DeletePartitionJob.cpp
+        jobs/FillGlobalStorageJob.cpp
+        jobs/FormatPartitionJob.cpp
+        jobs/MoveFileSystemJob.cpp
+        jobs/PartitionJob.cpp
+        jobs/ResizePartitionJob.cpp
     UI
-        CreatePartitionDialog.ui
-        CreatePartitionTableDialog.ui
-        EditExistingPartitionDialog.ui
-        PartitionPage.ui
+        gui/CreatePartitionDialog.ui
+        gui/CreatePartitionTableDialog.ui
+        gui/EditExistingPartitionDialog.ui
+        gui/PartitionPage.ui
     LINK_LIBRARIES
         calapm
         calamaresui
diff --git a/src/modules/partition/BootLoaderModel.cpp b/src/modules/partition/core/BootLoaderModel.cpp
similarity index 96%
rename from src/modules/partition/BootLoaderModel.cpp
rename to src/modules/partition/core/BootLoaderModel.cpp
index 6fb96b955..6c99a5dcd 100644
--- a/src/modules/partition/BootLoaderModel.cpp
+++ b/src/modules/partition/core/BootLoaderModel.cpp
@@ -15,10 +15,10 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <BootLoaderModel.h>
+#include <core/BootLoaderModel.h>
 
-#include <PartitionInfo.h>
-#include <PMUtils.h>
+#include <core/PartitionInfo.h>
+#include <core/PMUtils.h>
 
 // CalaPM
 #include <core/device.h>
diff --git a/src/modules/partition/BootLoaderModel.h b/src/modules/partition/core/BootLoaderModel.h
similarity index 100%
rename from src/modules/partition/BootLoaderModel.h
rename to src/modules/partition/core/BootLoaderModel.h
diff --git a/src/modules/partition/ColorUtils.cpp b/src/modules/partition/core/ColorUtils.cpp
similarity index 97%
rename from src/modules/partition/ColorUtils.cpp
rename to src/modules/partition/core/ColorUtils.cpp
index f9ef94793..4fbfff7d4 100644
--- a/src/modules/partition/ColorUtils.cpp
+++ b/src/modules/partition/core/ColorUtils.cpp
@@ -16,9 +16,9 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <ColorUtils.h>
+#include <core/ColorUtils.h>
 
-#include <PMUtils.h>
+#include <core/PMUtils.h>
 
 // CalaPM
 #include <core/partition.h>
diff --git a/src/modules/partition/ColorUtils.h b/src/modules/partition/core/ColorUtils.h
similarity index 100%
rename from src/modules/partition/ColorUtils.h
rename to src/modules/partition/core/ColorUtils.h
diff --git a/src/modules/partition/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp
similarity index 97%
rename from src/modules/partition/DeviceModel.cpp
rename to src/modules/partition/core/DeviceModel.cpp
index c56365935..36e7ab03e 100644
--- a/src/modules/partition/DeviceModel.cpp
+++ b/src/modules/partition/core/DeviceModel.cpp
@@ -15,8 +15,9 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <DeviceModel.h>
-#include <PartitionModel.h>
+#include <core/DeviceModel.h>
+
+#include <core/PartitionModel.h>
 
 // CalaPM
 #include <core/device.h>
diff --git a/src/modules/partition/DeviceModel.h b/src/modules/partition/core/DeviceModel.h
similarity index 100%
rename from src/modules/partition/DeviceModel.h
rename to src/modules/partition/core/DeviceModel.h
diff --git a/src/modules/partition/PMUtils.cpp b/src/modules/partition/core/PMUtils.cpp
similarity index 96%
rename from src/modules/partition/PMUtils.cpp
rename to src/modules/partition/core/PMUtils.cpp
index 10cfb8911..20030a0e5 100644
--- a/src/modules/partition/PMUtils.cpp
+++ b/src/modules/partition/core/PMUtils.cpp
@@ -16,10 +16,10 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PMUtils.h>
+#include <core/PMUtils.h>
 
-#include <PartitionInfo.h>
-#include <PartitionIterator.h>
+#include <core/PartitionInfo.h>
+#include <core/PartitionIterator.h>
 
 // CalaPM
 #include <core/partition.h>
diff --git a/src/modules/partition/PMUtils.h b/src/modules/partition/core/PMUtils.h
similarity index 100%
rename from src/modules/partition/PMUtils.h
rename to src/modules/partition/core/PMUtils.h
diff --git a/src/modules/partition/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
similarity index 96%
rename from src/modules/partition/PartitionCoreModule.cpp
rename to src/modules/partition/core/PartitionCoreModule.cpp
index 017a8e6b6..a681660cc 100644
--- a/src/modules/partition/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -16,20 +16,21 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PartitionCoreModule.h>
+#include <core/PartitionCoreModule.h>
+
+#include <core/BootLoaderModel.h>
+#include <core/DeviceModel.h>
+#include <core/PartitionInfo.h>
+#include <core/PartitionIterator.h>
+#include <core/PartitionModel.h>
+#include <core/PMUtils.h>
+#include <jobs/CreatePartitionJob.h>
+#include <jobs/CreatePartitionTableJob.h>
+#include <jobs/DeletePartitionJob.h>
+#include <jobs/FillGlobalStorageJob.h>
+#include <jobs/FormatPartitionJob.h>
+#include <jobs/ResizePartitionJob.h>
 
-#include <BootLoaderModel.h>
-#include <CreatePartitionJob.h>
-#include <CreatePartitionTableJob.h>
-#include <DeletePartitionJob.h>
-#include <FillGlobalStorageJob.h>
-#include <FormatPartitionJob.h>
-#include <DeviceModel.h>
-#include <PartitionInfo.h>
-#include <PartitionIterator.h>
-#include <PartitionModel.h>
-#include <PMUtils.h>
-#include <ResizePartitionJob.h>
 #include <Typedefs.h>
 #include <utils/Logger.h>
 
diff --git a/src/modules/partition/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h
similarity index 99%
rename from src/modules/partition/PartitionCoreModule.h
rename to src/modules/partition/core/PartitionCoreModule.h
index e9ff47617..0c0ccf60c 100644
--- a/src/modules/partition/PartitionCoreModule.h
+++ b/src/modules/partition/core/PartitionCoreModule.h
@@ -19,7 +19,7 @@
 #ifndef PARTITIONCOREMODULE_H
 #define PARTITIONCOREMODULE_H
 
-#include <PartitionModel.h>
+#include <core/PartitionModel.h>
 #include <Typedefs.h>
 
 // CalaPM
diff --git a/src/modules/partition/PartitionInfo.cpp b/src/modules/partition/core/PartitionInfo.cpp
similarity index 98%
rename from src/modules/partition/PartitionInfo.cpp
rename to src/modules/partition/core/PartitionInfo.cpp
index ad2bda823..396e2f6a3 100644
--- a/src/modules/partition/PartitionInfo.cpp
+++ b/src/modules/partition/core/PartitionInfo.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <PartitionInfo.h>
+#include <core/PartitionInfo.h>
 
 // CalaPM
 #include <core/partition.h>
diff --git a/src/modules/partition/PartitionInfo.h b/src/modules/partition/core/PartitionInfo.h
similarity index 100%
rename from src/modules/partition/PartitionInfo.h
rename to src/modules/partition/core/PartitionInfo.h
diff --git a/src/modules/partition/PartitionIterator.cpp b/src/modules/partition/core/PartitionIterator.cpp
similarity index 98%
rename from src/modules/partition/PartitionIterator.cpp
rename to src/modules/partition/core/PartitionIterator.cpp
index f31e53866..a7adc71c6 100644
--- a/src/modules/partition/PartitionIterator.cpp
+++ b/src/modules/partition/core/PartitionIterator.cpp
@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PartitionIterator.h>
+#include <core/PartitionIterator.h>
 
 // CalaPM
 #include <core/device.h>
diff --git a/src/modules/partition/PartitionIterator.h b/src/modules/partition/core/PartitionIterator.h
similarity index 100%
rename from src/modules/partition/PartitionIterator.h
rename to src/modules/partition/core/PartitionIterator.h
diff --git a/src/modules/partition/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp
similarity index 97%
rename from src/modules/partition/PartitionModel.cpp
rename to src/modules/partition/core/PartitionModel.cpp
index 3ce3f4df2..b51c6f74e 100644
--- a/src/modules/partition/PartitionModel.cpp
+++ b/src/modules/partition/core/PartitionModel.cpp
@@ -15,11 +15,11 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <PartitionModel.h>
+#include <core/PartitionModel.h>
 
-#include <ColorUtils.h>
-#include <PartitionInfo.h>
-#include <PMUtils.h>
+#include <core/ColorUtils.h>
+#include <core/PartitionInfo.h>
+#include <core/PMUtils.h>
 #include <utils/Logger.h>
 
 // CalaPM
diff --git a/src/modules/partition/PartitionModel.h b/src/modules/partition/core/PartitionModel.h
similarity index 100%
rename from src/modules/partition/PartitionModel.h
rename to src/modules/partition/core/PartitionModel.h
diff --git a/src/modules/partition/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp
similarity index 97%
rename from src/modules/partition/CreatePartitionDialog.cpp
rename to src/modules/partition/gui/CreatePartitionDialog.cpp
index 06d12827e..344ddf76a 100644
--- a/src/modules/partition/CreatePartitionDialog.cpp
+++ b/src/modules/partition/gui/CreatePartitionDialog.cpp
@@ -16,13 +16,15 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <CreatePartitionDialog.h>
+#include <gui/CreatePartitionDialog.h>
+
+#include <core/ColorUtils.h>
+#include <core/PartitionInfo.h>
+#include <core/PMUtils.h>
+#include <gui/PartitionSizeController.h>
 
-#include <ColorUtils.h>
-#include <PartitionInfo.h>
-#include <PartitionSizeController.h>
-#include <PMUtils.h>
 #include <ui_CreatePartitionDialog.h>
+
 #include <utils/Logger.h>
 
 // CalaPM
diff --git a/src/modules/partition/CreatePartitionDialog.h b/src/modules/partition/gui/CreatePartitionDialog.h
similarity index 100%
rename from src/modules/partition/CreatePartitionDialog.h
rename to src/modules/partition/gui/CreatePartitionDialog.h
diff --git a/src/modules/partition/CreatePartitionDialog.ui b/src/modules/partition/gui/CreatePartitionDialog.ui
similarity index 100%
rename from src/modules/partition/CreatePartitionDialog.ui
rename to src/modules/partition/gui/CreatePartitionDialog.ui
diff --git a/src/modules/partition/CreatePartitionTableDialog.ui b/src/modules/partition/gui/CreatePartitionTableDialog.ui
similarity index 100%
rename from src/modules/partition/CreatePartitionTableDialog.ui
rename to src/modules/partition/gui/CreatePartitionTableDialog.ui
diff --git a/src/modules/partition/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
similarity index 96%
rename from src/modules/partition/EditExistingPartitionDialog.cpp
rename to src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 3d20e9793..31eb59fe9 100644
--- a/src/modules/partition/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -16,14 +16,16 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <EditExistingPartitionDialog.h>
+#include <gui/EditExistingPartitionDialog.h>
+
+#include <core/ColorUtils.h>
+#include <core/PartitionCoreModule.h>
+#include <core/PartitionInfo.h>
+#include <core/PMUtils.h>
+#include <gui/PartitionSizeController.h>
 
-#include <ColorUtils.h>
-#include <PartitionCoreModule.h>
-#include <PartitionInfo.h>
-#include <PartitionSizeController.h>
-#include <PMUtils.h>
 #include <ui_EditExistingPartitionDialog.h>
+
 #include <utils/Logger.h>
 
 // CalaPM
diff --git a/src/modules/partition/EditExistingPartitionDialog.h b/src/modules/partition/gui/EditExistingPartitionDialog.h
similarity index 100%
rename from src/modules/partition/EditExistingPartitionDialog.h
rename to src/modules/partition/gui/EditExistingPartitionDialog.h
diff --git a/src/modules/partition/EditExistingPartitionDialog.ui b/src/modules/partition/gui/EditExistingPartitionDialog.ui
similarity index 100%
rename from src/modules/partition/EditExistingPartitionDialog.ui
rename to src/modules/partition/gui/EditExistingPartitionDialog.ui
diff --git a/src/modules/partition/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
similarity index 97%
rename from src/modules/partition/PartitionPage.cpp
rename to src/modules/partition/gui/PartitionPage.cpp
index 85955a366..c4bc58f17 100644
--- a/src/modules/partition/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -19,13 +19,14 @@
 #include "PartitionPage.h"
 
 // Local
-#include <BootLoaderModel.h>
-#include <CreatePartitionDialog.h>
-#include <EditExistingPartitionDialog.h>
-#include <DeviceModel.h>
-#include <PartitionCoreModule.h>
-#include <PartitionModel.h>
-#include <PMUtils.h>
+#include <core/BootLoaderModel.h>
+#include <core/DeviceModel.h>
+#include <core/PartitionCoreModule.h>
+#include <core/PartitionModel.h>
+#include <core/PMUtils.h>
+#include <gui/CreatePartitionDialog.h>
+#include <gui/EditExistingPartitionDialog.h>
+
 #include <ui_PartitionPage.h>
 #include <ui_CreatePartitionTableDialog.h>
 
diff --git a/src/modules/partition/PartitionPage.h b/src/modules/partition/gui/PartitionPage.h
similarity index 100%
rename from src/modules/partition/PartitionPage.h
rename to src/modules/partition/gui/PartitionPage.h
diff --git a/src/modules/partition/PartitionPage.ui b/src/modules/partition/gui/PartitionPage.ui
similarity index 98%
rename from src/modules/partition/PartitionPage.ui
rename to src/modules/partition/gui/PartitionPage.ui
index 777b6f939..5e43dfec0 100644
--- a/src/modules/partition/PartitionPage.ui
+++ b/src/modules/partition/gui/PartitionPage.ui
@@ -177,7 +177,7 @@
   <customwidget>
    <class>PartitionPreview</class>
    <extends>QFrame</extends>
-   <header location="global">PartitionPreview.h</header>
+   <header location="global">gui/PartitionPreview.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/modules/partition/PartitionPreview.cpp b/src/modules/partition/gui/PartitionPreview.cpp
similarity index 98%
rename from src/modules/partition/PartitionPreview.cpp
rename to src/modules/partition/gui/PartitionPreview.cpp
index fd1749b32..9be1dc032 100644
--- a/src/modules/partition/PartitionPreview.cpp
+++ b/src/modules/partition/gui/PartitionPreview.cpp
@@ -15,9 +15,9 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <PartitionPreview.h>
+#include <gui/PartitionPreview.h>
 
-#include <PartitionModel.h>
+#include <core/PartitionModel.h>
 
 // Qt
 #include <QDebug>
diff --git a/src/modules/partition/PartitionPreview.h b/src/modules/partition/gui/PartitionPreview.h
similarity index 100%
rename from src/modules/partition/PartitionPreview.h
rename to src/modules/partition/gui/PartitionPreview.h
diff --git a/src/modules/partition/PartitionSizeController.cpp b/src/modules/partition/gui/PartitionSizeController.cpp
similarity index 98%
rename from src/modules/partition/PartitionSizeController.cpp
rename to src/modules/partition/gui/PartitionSizeController.cpp
index 4fa4dc3e0..a08c08d8c 100644
--- a/src/modules/partition/PartitionSizeController.cpp
+++ b/src/modules/partition/gui/PartitionSizeController.cpp
@@ -16,9 +16,9 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PartitionSizeController.h>
+#include <gui/PartitionSizeController.h>
 
-#include <ColorUtils.h>
+#include <core/ColorUtils.h>
 
 // Qt
 #include <QSpinBox>
diff --git a/src/modules/partition/PartitionSizeController.h b/src/modules/partition/gui/PartitionSizeController.h
similarity index 100%
rename from src/modules/partition/PartitionSizeController.h
rename to src/modules/partition/gui/PartitionSizeController.h
diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
similarity index 92%
rename from src/modules/partition/PartitionViewStep.cpp
rename to src/modules/partition/gui/PartitionViewStep.cpp
index 2d21ef53e..372873516 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -16,13 +16,13 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PartitionViewStep.h>
+#include <gui/PartitionViewStep.h>
 
-#include <DeviceModel.h>
-#include <PartitionCoreModule.h>
-#include <PartitionModel.h>
-#include <PartitionPage.h>
-#include <PartitionPreview.h>
+#include <core/DeviceModel.h>
+#include <core/PartitionCoreModule.h>
+#include <core/PartitionModel.h>
+#include <gui/PartitionPage.h>
+#include <gui/PartitionPreview.h>
 
 // Qt
 #include <QFormLayout>
diff --git a/src/modules/partition/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h
similarity index 100%
rename from src/modules/partition/PartitionViewStep.h
rename to src/modules/partition/gui/PartitionViewStep.h
diff --git a/src/modules/partition/CheckFileSystemJob.cpp b/src/modules/partition/jobs/CheckFileSystemJob.cpp
similarity index 97%
rename from src/modules/partition/CheckFileSystemJob.cpp
rename to src/modules/partition/jobs/CheckFileSystemJob.cpp
index 3d353bd7a..151490e7f 100644
--- a/src/modules/partition/CheckFileSystemJob.cpp
+++ b/src/modules/partition/jobs/CheckFileSystemJob.cpp
@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <CheckFileSystemJob.h>
+#include <jobs/CheckFileSystemJob.h>
 
 // CalaPM
 #include <core/partition.h>
diff --git a/src/modules/partition/CheckFileSystemJob.h b/src/modules/partition/jobs/CheckFileSystemJob.h
similarity index 97%
rename from src/modules/partition/CheckFileSystemJob.h
rename to src/modules/partition/jobs/CheckFileSystemJob.h
index f0cf152d2..1d42cf1dd 100644
--- a/src/modules/partition/CheckFileSystemJob.h
+++ b/src/modules/partition/jobs/CheckFileSystemJob.h
@@ -19,7 +19,7 @@
 #ifndef CHECKFILESYSTEMJOB_H
 #define CHECKFILESYSTEMJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 /**
  * Runs a file system check on an existing partition.
diff --git a/src/modules/partition/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
similarity index 99%
rename from src/modules/partition/CreatePartitionJob.cpp
rename to src/modules/partition/jobs/CreatePartitionJob.cpp
index 67c9789a3..f2eef3d3f 100644
--- a/src/modules/partition/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <CreatePartitionJob.h>
+#include <jobs/CreatePartitionJob.h>
 
 #include <utils/Logger.h>
 
diff --git a/src/modules/partition/CreatePartitionJob.h b/src/modules/partition/jobs/CreatePartitionJob.h
similarity index 97%
rename from src/modules/partition/CreatePartitionJob.h
rename to src/modules/partition/jobs/CreatePartitionJob.h
index bf6183177..648043440 100644
--- a/src/modules/partition/CreatePartitionJob.h
+++ b/src/modules/partition/jobs/CreatePartitionJob.h
@@ -19,7 +19,7 @@
 #ifndef CREATEPARTITIONJOB_H
 #define CREATEPARTITIONJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 class Device;
 class Partition;
diff --git a/src/modules/partition/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
similarity index 98%
rename from src/modules/partition/CreatePartitionTableJob.cpp
rename to src/modules/partition/jobs/CreatePartitionTableJob.cpp
index 92d6a47e0..5adbc6fa5 100644
--- a/src/modules/partition/CreatePartitionTableJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <CreatePartitionTableJob.h>
+#include <jobs/CreatePartitionTableJob.h>
 
 #include <utils/Logger.h>
 
diff --git a/src/modules/partition/CreatePartitionTableJob.h b/src/modules/partition/jobs/CreatePartitionTableJob.h
similarity index 100%
rename from src/modules/partition/CreatePartitionTableJob.h
rename to src/modules/partition/jobs/CreatePartitionTableJob.h
diff --git a/src/modules/partition/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp
similarity index 99%
rename from src/modules/partition/DeletePartitionJob.cpp
rename to src/modules/partition/jobs/DeletePartitionJob.cpp
index b5f090494..d9ec56f84 100644
--- a/src/modules/partition/DeletePartitionJob.cpp
+++ b/src/modules/partition/jobs/DeletePartitionJob.cpp
@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <DeletePartitionJob.h>
+#include <jobs/DeletePartitionJob.h>
 
 // CalaPM
 #include <backend/corebackend.h>
diff --git a/src/modules/partition/DeletePartitionJob.h b/src/modules/partition/jobs/DeletePartitionJob.h
similarity index 98%
rename from src/modules/partition/DeletePartitionJob.h
rename to src/modules/partition/jobs/DeletePartitionJob.h
index a0e2fef56..aabacc9c0 100644
--- a/src/modules/partition/DeletePartitionJob.h
+++ b/src/modules/partition/jobs/DeletePartitionJob.h
@@ -19,7 +19,7 @@
 #ifndef DELETEPARTITIONJOB_H
 #define DELETEPARTITIONJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 class Device;
 class Partition;
diff --git a/src/modules/partition/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
similarity index 96%
rename from src/modules/partition/FillGlobalStorageJob.cpp
rename to src/modules/partition/jobs/FillGlobalStorageJob.cpp
index e6e770941..83783c4bc 100644
--- a/src/modules/partition/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -16,13 +16,13 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <FillGlobalStorageJob.h>
+#include <jobs/FillGlobalStorageJob.h>
 
 #include <GlobalStorage.h>
 #include <JobQueue.h>
-#include <PartitionInfo.h>
-#include <PartitionIterator.h>
-#include <PMUtils.h>
+#include <core/PartitionInfo.h>
+#include <core/PartitionIterator.h>
+#include <core/PMUtils.h>
 
 // CalaPM
 #include <core/device.h>
diff --git a/src/modules/partition/FillGlobalStorageJob.h b/src/modules/partition/jobs/FillGlobalStorageJob.h
similarity index 100%
rename from src/modules/partition/FillGlobalStorageJob.h
rename to src/modules/partition/jobs/FillGlobalStorageJob.h
diff --git a/src/modules/partition/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
similarity index 98%
rename from src/modules/partition/FormatPartitionJob.cpp
rename to src/modules/partition/jobs/FormatPartitionJob.cpp
index 13439da1e..d3817beec 100644
--- a/src/modules/partition/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <FormatPartitionJob.h>
+#include <jobs/FormatPartitionJob.h>
 
 #include <utils/Logger.h>
 
diff --git a/src/modules/partition/FormatPartitionJob.h b/src/modules/partition/jobs/FormatPartitionJob.h
similarity index 97%
rename from src/modules/partition/FormatPartitionJob.h
rename to src/modules/partition/jobs/FormatPartitionJob.h
index 54f7dae76..e014389a0 100644
--- a/src/modules/partition/FormatPartitionJob.h
+++ b/src/modules/partition/jobs/FormatPartitionJob.h
@@ -19,7 +19,7 @@
 #ifndef FORMATPARTITIONJOB_H
 #define FORMATPARTITIONJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 class Device;
 class Partition;
diff --git a/src/modules/partition/MoveFileSystemJob.cpp b/src/modules/partition/jobs/MoveFileSystemJob.cpp
similarity index 99%
rename from src/modules/partition/MoveFileSystemJob.cpp
rename to src/modules/partition/jobs/MoveFileSystemJob.cpp
index eb1391f57..bb0944f25 100644
--- a/src/modules/partition/MoveFileSystemJob.cpp
+++ b/src/modules/partition/jobs/MoveFileSystemJob.cpp
@@ -40,7 +40,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <MoveFileSystemJob.h>
+#include <jobs/MoveFileSystemJob.h>
 
 #include <utils/Logger.h>
 
diff --git a/src/modules/partition/MoveFileSystemJob.h b/src/modules/partition/jobs/MoveFileSystemJob.h
similarity index 99%
rename from src/modules/partition/MoveFileSystemJob.h
rename to src/modules/partition/jobs/MoveFileSystemJob.h
index d8f520847..303b2b507 100644
--- a/src/modules/partition/MoveFileSystemJob.h
+++ b/src/modules/partition/jobs/MoveFileSystemJob.h
@@ -40,7 +40,7 @@
 #ifndef MOVEFILESYSTEMJOB_H
 #define MOVEFILESYSTEMJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 class CopySourceDevice;
 class CopyTargetDevice;
diff --git a/src/modules/partition/PartitionJob.cpp b/src/modules/partition/jobs/PartitionJob.cpp
similarity index 96%
rename from src/modules/partition/PartitionJob.cpp
rename to src/modules/partition/jobs/PartitionJob.cpp
index ec4ff3ee7..a85540704 100644
--- a/src/modules/partition/PartitionJob.cpp
+++ b/src/modules/partition/jobs/PartitionJob.cpp
@@ -16,7 +16,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 PartitionJob::PartitionJob( Partition* partition )
     : m_partition( partition )
diff --git a/src/modules/partition/PartitionJob.h b/src/modules/partition/jobs/PartitionJob.h
similarity index 100%
rename from src/modules/partition/PartitionJob.h
rename to src/modules/partition/jobs/PartitionJob.h
diff --git a/src/modules/partition/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp
similarity index 99%
rename from src/modules/partition/ResizePartitionJob.cpp
rename to src/modules/partition/jobs/ResizePartitionJob.cpp
index 856fcae70..794dc2504 100644
--- a/src/modules/partition/ResizePartitionJob.cpp
+++ b/src/modules/partition/jobs/ResizePartitionJob.cpp
@@ -38,10 +38,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <ResizePartitionJob.h>
+#include <jobs/ResizePartitionJob.h>
 
-#include <CheckFileSystemJob.h>
-#include <MoveFileSystemJob.h>
+#include <jobs/CheckFileSystemJob.h>
+#include <jobs/MoveFileSystemJob.h>
 #include <utils/Logger.h>
 
 // CalaPM
diff --git a/src/modules/partition/ResizePartitionJob.h b/src/modules/partition/jobs/ResizePartitionJob.h
similarity index 98%
rename from src/modules/partition/ResizePartitionJob.h
rename to src/modules/partition/jobs/ResizePartitionJob.h
index c5e04b06b..d1b55938b 100644
--- a/src/modules/partition/ResizePartitionJob.h
+++ b/src/modules/partition/jobs/ResizePartitionJob.h
@@ -19,7 +19,7 @@
 #ifndef RESIZEPARTITIONJOB_H
 #define RESIZEPARTITIONJOB_H
 
-#include <PartitionJob.h>
+#include <jobs/PartitionJob.h>
 
 class Device;
 class Partition;
diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index 8eb8c3fc0..3faee608d 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -2,16 +2,16 @@ find_package( Qt5 COMPONENTS Test REQUIRED )
 include( ECMAddTests )
 
 set( jobtests_SRCS
-    ${PartitionModule_SOURCE_DIR}/CheckFileSystemJob.cpp
-    ${PartitionModule_SOURCE_DIR}/CreatePartitionJob.cpp
-    ${PartitionModule_SOURCE_DIR}/CreatePartitionTableJob.cpp
-    ${PartitionModule_SOURCE_DIR}/DeletePartitionJob.cpp
-    ${PartitionModule_SOURCE_DIR}/MoveFileSystemJob.cpp
-    ${PartitionModule_SOURCE_DIR}/PartitionInfo.cpp
-    ${PartitionModule_SOURCE_DIR}/PartitionIterator.cpp
-    ${PartitionModule_SOURCE_DIR}/PartitionJob.cpp
-    ${PartitionModule_SOURCE_DIR}/PMUtils.cpp
-    ${PartitionModule_SOURCE_DIR}/ResizePartitionJob.cpp
+    ${PartitionModule_SOURCE_DIR}/core/PMUtils.cpp
+    ${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp
+    ${PartitionModule_SOURCE_DIR}/core/PartitionIterator.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/CheckFileSystemJob.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionJob.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionTableJob.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/MoveFileSystemJob.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp
+    ${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp
     JobTests.cpp
 )
 
diff --git a/src/modules/partition/tests/JobTests.cpp b/src/modules/partition/tests/JobTests.cpp
index 40edce79b..0f77ee360 100644
--- a/src/modules/partition/tests/JobTests.cpp
+++ b/src/modules/partition/tests/JobTests.cpp
@@ -1,9 +1,9 @@
 #include <JobTests.h>
 
-#include <CreatePartitionJob.h>
-#include <CreatePartitionTableJob.h>
-#include <ResizePartitionJob.h>
-#include <PMUtils.h>
+#include <jobs/CreatePartitionJob.h>
+#include <jobs/CreatePartitionTableJob.h>
+#include <jobs/ResizePartitionJob.h>
+#include <core/PMUtils.h>
 
 // CalaPM
 #include <CalaPM.h>