diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97e09e4..46cf18c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Configure cmake
 cmake_minimum_required(VERSION 3.1.0)
+cmake_policy(SET CMP0076 NEW) # silence warning
 
 project(AttorneyOnline)
 
@@ -15,86 +16,7 @@ if(CMAKE_VERSION VERSION_LESS "3.7.0")
 endif()
 
 # AO
-add_executable(Attorney_Online
-# resources
-resources.qrc
-
-# src
-src/aoapplication.cpp
-src/aoblipplayer.cpp
-src/aobutton.cpp
-src/aocaseannouncerdialog.cpp
-src/aocharbutton.cpp
-src/aocharmovie.cpp
-src/aoemotebutton.cpp
-src/aoevidencebutton.cpp
-src/aoevidencedisplay.cpp
-src/aoimage.cpp
-src/aolineedit.cpp
-src/aomovie.cpp
-src/aomusicplayer.cpp
-src/aooptionsdialog.cpp
-src/aopacket.cpp
-src/aoscene.cpp
-src/aosfxplayer.cpp
-src/aotextarea.cpp
-src/aotextedit.cpp
-src/charselect.cpp
-src/chatlogpiece.cpp
-src/courtroom.cpp
-src/debug_functions.cpp
-src/discord_rich_presence.cpp
-src/emotes.cpp
-src/evidence.cpp
-src/file_functions.cpp
-src/hardware_functions.cpp
-src/lobby.cpp
-src/main.cpp
-src/misc_functions.cpp
-src/networkmanager.cpp
-src/packet_distribution.cpp
-src/path_functions.cpp
-src/scrolltext.cpp
-src/text_file_functions.cpp
-
-# include
-include/aoapplication.h
-include/aoblipplayer.h
-include/aobutton.h
-include/aocaseannouncerdialog.h
-include/aocharbutton.h
-include/aocharmovie.h
-include/aoemotebutton.h
-include/aoevidencebutton.h
-include/aoevidencedisplay.h
-include/aoimage.h
-include/aolineedit.h
-include/aomovie.h
-include/aomusicplayer.h
-include/aooptionsdialog.h
-include/aopacket.h
-include/aoscene.h
-include/aosfxplayer.h
-include/aotextarea.h
-include/aotextedit.h
-include/bass.h
-include/bassopus.h
-include/chatlogpiece.h
-include/courtroom.h
-include/datatypes.h
-include/debug_functions.h
-include/discord-rpc.h
-include/discord_register.h
-include/discord_rich_presence.h
-include/discord_rpc.h
-include/file_functions.h
-include/hardware_functions.h
-include/lobby.h
-include/misc_functions.h
-include/networkmanager.h
-include/scrolltext.h
-include/text_file_functions.h
-)
+add_executable(Attorney_Online resources.qrc)
 
 # Target Include
 target_include_directories(Attorney_Online PRIVATE include)
@@ -105,5 +27,7 @@ target_link_directories(Attorney_Online PRIVATE lib)
 target_link_libraries(Attorney_Online PRIVATE Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets
     bass bassopus discord-rpc)
 
-# Tests
+# Subdirectories
 add_subdirectory(test)
+add_subdirectory(src)
+add_subdirectory(include)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
new file mode 100644
index 0000000..b801d89
--- /dev/null
+++ b/include/CMakeLists.txt
@@ -0,0 +1,38 @@
+target_sources(Attorney_Online PRIVATE
+aoapplication.h
+aoblipplayer.h
+aobutton.h
+aocaseannouncerdialog.h
+aocharbutton.h
+aocharmovie.h
+aoemotebutton.h
+aoevidencebutton.h
+aoevidencedisplay.h
+aoimage.h
+aolineedit.h
+aomovie.h
+aomusicplayer.h
+aooptionsdialog.h
+aopacket.h
+aoscene.h
+aosfxplayer.h
+aotextarea.h
+aotextedit.h
+bass.h
+bassopus.h
+chatlogpiece.h
+courtroom.h
+datatypes.h
+debug_functions.h
+discord-rpc.h
+discord_register.h
+discord_rich_presence.h
+discord_rpc.h
+file_functions.h
+hardware_functions.h
+lobby.h
+misc_functions.h
+networkmanager.h
+scrolltext.h
+text_file_functions.h
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..533580f
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,38 @@
+target_sources(Attorney_Online PRIVATE
+aoapplication.cpp
+aoblipplayer.cpp
+aobutton.cpp
+aocaseannouncerdialog.cpp
+aocharbutton.cpp
+aocharmovie.cpp
+aoemotebutton.cpp
+aoevidencebutton.cpp
+aoevidencedisplay.cpp
+aoimage.cpp
+aolineedit.cpp
+aomovie.cpp
+aomusicplayer.cpp
+aooptionsdialog.cpp
+aopacket.cpp
+aoscene.cpp
+aosfxplayer.cpp
+aotextarea.cpp
+aotextedit.cpp
+charselect.cpp
+chatlogpiece.cpp
+courtroom.cpp
+debug_functions.cpp
+discord_rich_presence.cpp
+emotes.cpp
+evidence.cpp
+file_functions.cpp
+hardware_functions.cpp
+lobby.cpp
+main.cpp
+misc_functions.cpp
+networkmanager.cpp
+packet_distribution.cpp
+path_functions.cpp
+scrolltext.cpp
+text_file_functions.cpp
+)