diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 21e3a0b..719ec3a 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,3 +1,5 @@
+include(core/raid/CMakeLists.txt)
+
 set(CORE_SRC
     core/copysource.cpp
     core/copysourcedevice.cpp
@@ -23,8 +25,8 @@ set(CORE_SRC
     core/smartparser.cpp
     core/smartattributeparseddata.cpp
     core/smartdiskinformation.cpp
-    core/softwareraid.cpp
     core/volumemanagerdevice.cpp
+    ${RAID_SRC}
 )
 
 set(CORE_LIB_HDRS
@@ -42,6 +44,6 @@ set(CORE_LIB_HDRS
     core/partitiontable.h
     core/smartattribute.h
     core/smartstatus.h
-    core/softwareraid.h
     core/volumemanagerdevice.h
+    ${RAID_LIB_HDRS}
 )
diff --git a/src/core/raid/CMakeLists.txt b/src/core/raid/CMakeLists.txt
new file mode 100644
index 0000000..d2e18f1
--- /dev/null
+++ b/src/core/raid/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(RAID_SRC
+    core/raid/softwareraid.cpp
+)
+
+set(RAID_LIB_HDRS
+    core/raid/softwareraid.h
+)
diff --git a/src/core/softwareraid.cpp b/src/core/raid/softwareraid.cpp
similarity index 100%
rename from src/core/softwareraid.cpp
rename to src/core/raid/softwareraid.cpp
diff --git a/src/core/softwareraid.h b/src/core/raid/softwareraid.h
similarity index 100%
rename from src/core/softwareraid.h
rename to src/core/raid/softwareraid.h
diff --git a/src/plugins/sfdisk/sfdiskbackend.cpp b/src/plugins/sfdisk/sfdiskbackend.cpp
index 9989ee8..fed674e 100644
--- a/src/plugins/sfdisk/sfdiskbackend.cpp
+++ b/src/plugins/sfdisk/sfdiskbackend.cpp
@@ -23,9 +23,9 @@
 
 #include "core/diskdevice.h"
 #include "core/lvmdevice.h"
-#include "core/softwareraid.h"
 #include "core/partitiontable.h"
 #include "core/partitionalignment.h"
+#include "core/raid/softwareraid.h"
 
 #include "fs/filesystemfactory.h"
 #include "fs/luks.h"