diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 8f1abe8..b75d007 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -35,12 +35,15 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE
+                CheckableItem
 		MetaData
 		VerbEnd
 		Genus
 		Qt5::Widgets
 )
 
+add_subdirectory(CheckableItem)
+
 add_subdirectory(MetaData)
 add_subdirectory(VerbEnd)
 add_subdirectory(Genus)
diff --git a/source/CheckableItem/CMakeLists.txt b/source/CheckableItem/CMakeLists.txt
new file mode 100644
index 0000000..f5667a5
--- /dev/null
+++ b/source/CheckableItem/CMakeLists.txt
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.6)
+
+project(CheckableItem LANGUAGES CXX)
+
+find_package(Qt5Core REQUIRED)
+
+add_library(${PROJECT_NAME}
+        CheckableItem.cpp
+        CheckableItems.cpp
+)
+
+set_target_properties(${PROJECT_NAME}
+	PROPERTIES CXX_STANDARD 14
+)
+
+target_include_directories(${PROJECT_NAME}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries(${PROJECT_NAME}
+	PRIVATE
+                Qt5::Core
+)
diff --git a/source/CheckableItem.cpp b/source/CheckableItem/CheckableItem.cpp
similarity index 100%
rename from source/CheckableItem.cpp
rename to source/CheckableItem/CheckableItem.cpp
diff --git a/source/CheckableItem.h b/source/CheckableItem/CheckableItem.h
similarity index 100%
rename from source/CheckableItem.h
rename to source/CheckableItem/CheckableItem.h
diff --git a/source/CheckableItems.cpp b/source/CheckableItem/CheckableItems.cpp
similarity index 100%
rename from source/CheckableItems.cpp
rename to source/CheckableItem/CheckableItems.cpp
diff --git a/source/CheckableItems.h b/source/CheckableItem/CheckableItems.h
similarity index 100%
rename from source/CheckableItems.h
rename to source/CheckableItem/CheckableItems.h
diff --git a/source/Genus/CMakeLists.txt b/source/Genus/CMakeLists.txt
index 1d5b8a1..cf7dcf1 100644
--- a/source/Genus/CMakeLists.txt
+++ b/source/Genus/CMakeLists.txt
@@ -13,8 +13,6 @@ qt5_wrap_ui(GENUS_UI
 add_library(${PROJECT_NAME}
 	GenusWidget.cpp
 	GenusModel.cpp
-	../CheckableItem.cpp
-	../CheckableItems.cpp
 	${GENUS_UI}
 )
 
@@ -29,5 +27,6 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE
+                CheckableItem
 		Qt5::Widgets
 )
diff --git a/source/Genus/GenusModel.h b/source/Genus/GenusModel.h
index 895bf7b..bceab15 100644
--- a/source/Genus/GenusModel.h
+++ b/source/Genus/GenusModel.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../CheckableItem.h"
-#include "../CheckableItems.h"
+#include "CheckableItem.h"
+#include "CheckableItems.h"
 
 #include <QAbstractTableModel>
 
diff --git a/source/VerbEnd/CMakeLists.txt b/source/VerbEnd/CMakeLists.txt
index 27629a3..06bb136 100644
--- a/source/VerbEnd/CMakeLists.txt
+++ b/source/VerbEnd/CMakeLists.txt
@@ -13,8 +13,6 @@ qt5_wrap_ui(UI_HEADERS
 add_library(${PROJECT_NAME}
 	VerbEndWidget.cpp
 	VerbEndModel.cpp
-	../CheckableItem.cpp
-	../CheckableItems.cpp
 	${UI_HEADERS}
 )
 
@@ -29,5 +27,6 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE
+                CheckableItem
 		Qt5::Widgets
 )
diff --git a/source/VerbEnd/VerbEndModel.h b/source/VerbEnd/VerbEndModel.h
index 2b02269..e73867f 100644
--- a/source/VerbEnd/VerbEndModel.h
+++ b/source/VerbEnd/VerbEndModel.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../CheckableItem.h"
-#include "../CheckableItems.h"
+#include "CheckableItem.h"
+#include "CheckableItems.h"
 
 #include <QAbstractTableModel>