diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 3d236c7..621084a 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -49,5 +49,4 @@ add_subdirectory(CheckableTest)
 add_subdirectory(CheckableTestModel)
 
 add_subdirectory(MetaData)
-add_subdirectory(VerbEnd)
-add_subdirectory(Genus)
+add_subdirectory(SubTests)
diff --git a/source/DataModel.h b/source/DataModel.h
index ec37fb0..c8c38b0 100644
--- a/source/DataModel.h
+++ b/source/DataModel.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "MetaData/MetaDataModel.h"
-#include "Genus/GenusModel.h"
-#include "VerbEnd/VerbEndModel.h"
+#include "GenusModel.h"
+#include "VerbEndModel.h"
 
 #include <QJsonObject>
 
diff --git a/source/SubTests/CMakeLists.txt b/source/SubTests/CMakeLists.txt
new file mode 100644
index 0000000..8b813b3
--- /dev/null
+++ b/source/SubTests/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.6)
+
+add_subdirectory(VerbEnd)
+add_subdirectory(Genus)
diff --git a/source/Genus/CMakeLists.txt b/source/SubTests/Genus/CMakeLists.txt
similarity index 93%
rename from source/Genus/CMakeLists.txt
rename to source/SubTests/Genus/CMakeLists.txt
index b27ef6d..96bad12 100644
--- a/source/Genus/CMakeLists.txt
+++ b/source/SubTests/Genus/CMakeLists.txt
@@ -21,6 +21,8 @@ set_target_properties(${PROJECT_NAME}
 )
 
 target_include_directories(${PROJECT_NAME}
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
 	PRIVATE
 		${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/source/Genus/GenusModel.cpp b/source/SubTests/Genus/GenusModel.cpp
similarity index 100%
rename from source/Genus/GenusModel.cpp
rename to source/SubTests/Genus/GenusModel.cpp
diff --git a/source/Genus/GenusModel.h b/source/SubTests/Genus/GenusModel.h
similarity index 100%
rename from source/Genus/GenusModel.h
rename to source/SubTests/Genus/GenusModel.h
diff --git a/source/Genus/GenusWidget.cpp b/source/SubTests/Genus/GenusWidget.cpp
similarity index 100%
rename from source/Genus/GenusWidget.cpp
rename to source/SubTests/Genus/GenusWidget.cpp
diff --git a/source/Genus/GenusWidget.h b/source/SubTests/Genus/GenusWidget.h
similarity index 100%
rename from source/Genus/GenusWidget.h
rename to source/SubTests/Genus/GenusWidget.h
diff --git a/source/Genus/GenusWidget.ui b/source/SubTests/Genus/GenusWidget.ui
similarity index 100%
rename from source/Genus/GenusWidget.ui
rename to source/SubTests/Genus/GenusWidget.ui
diff --git a/source/VerbEnd/CMakeLists.txt b/source/SubTests/VerbEnd/CMakeLists.txt
similarity index 93%
rename from source/VerbEnd/CMakeLists.txt
rename to source/SubTests/VerbEnd/CMakeLists.txt
index d9d91ff..c65fca1 100644
--- a/source/VerbEnd/CMakeLists.txt
+++ b/source/SubTests/VerbEnd/CMakeLists.txt
@@ -21,6 +21,8 @@ set_target_properties(${PROJECT_NAME}
 )
 
 target_include_directories(${PROJECT_NAME}
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
 	PRIVATE
 		${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/source/VerbEnd/VerbEndModel.cpp b/source/SubTests/VerbEnd/VerbEndModel.cpp
similarity index 100%
rename from source/VerbEnd/VerbEndModel.cpp
rename to source/SubTests/VerbEnd/VerbEndModel.cpp
diff --git a/source/VerbEnd/VerbEndModel.h b/source/SubTests/VerbEnd/VerbEndModel.h
similarity index 100%
rename from source/VerbEnd/VerbEndModel.h
rename to source/SubTests/VerbEnd/VerbEndModel.h
diff --git a/source/VerbEnd/VerbEndWidget.cpp b/source/SubTests/VerbEnd/VerbEndWidget.cpp
similarity index 100%
rename from source/VerbEnd/VerbEndWidget.cpp
rename to source/SubTests/VerbEnd/VerbEndWidget.cpp
diff --git a/source/VerbEnd/VerbEndWidget.h b/source/SubTests/VerbEnd/VerbEndWidget.h
similarity index 100%
rename from source/VerbEnd/VerbEndWidget.h
rename to source/SubTests/VerbEnd/VerbEndWidget.h
diff --git a/source/VerbEnd/VerbEndWidget.ui b/source/SubTests/VerbEnd/VerbEndWidget.ui
similarity index 100%
rename from source/VerbEnd/VerbEndWidget.ui
rename to source/SubTests/VerbEnd/VerbEndWidget.ui
diff --git a/source/mainwindow.ui b/source/mainwindow.ui
index fa1fd31..74f6462 100644
--- a/source/mainwindow.ui
+++ b/source/mainwindow.ui
@@ -160,13 +160,13 @@
   <customwidget>
    <class>GenusWidget</class>
    <extends>QWidget</extends>
-   <header>Genus/GenusWidget.h</header>
+   <header>GenusWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>VerbEndWidget</class>
    <extends>QWidget</extends>
-   <header>VerbEnd/VerbEndWidget.h</header>
+   <header>VerbEndWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>