diff --git a/aoapplication.h b/include/aoapplication.h
similarity index 100%
rename from aoapplication.h
rename to include/aoapplication.h
diff --git a/aoblipplayer.h b/include/aoblipplayer.h
similarity index 100%
rename from aoblipplayer.h
rename to include/aoblipplayer.h
diff --git a/aobutton.h b/include/aobutton.h
similarity index 100%
rename from aobutton.h
rename to include/aobutton.h
diff --git a/aocaseannouncerdialog.h b/include/aocaseannouncerdialog.h
similarity index 100%
rename from aocaseannouncerdialog.h
rename to include/aocaseannouncerdialog.h
diff --git a/aocharbutton.h b/include/aocharbutton.h
similarity index 100%
rename from aocharbutton.h
rename to include/aocharbutton.h
diff --git a/aocharmovie.h b/include/aocharmovie.h
similarity index 100%
rename from aocharmovie.h
rename to include/aocharmovie.h
diff --git a/aoemotebutton.h b/include/aoemotebutton.h
similarity index 100%
rename from aoemotebutton.h
rename to include/aoemotebutton.h
diff --git a/aoevidencebutton.h b/include/aoevidencebutton.h
similarity index 100%
rename from aoevidencebutton.h
rename to include/aoevidencebutton.h
diff --git a/aoevidencedisplay.h b/include/aoevidencedisplay.h
similarity index 100%
rename from aoevidencedisplay.h
rename to include/aoevidencedisplay.h
diff --git a/aoimage.h b/include/aoimage.h
similarity index 100%
rename from aoimage.h
rename to include/aoimage.h
diff --git a/aolineedit.h b/include/aolineedit.h
similarity index 100%
rename from aolineedit.h
rename to include/aolineedit.h
diff --git a/aomovie.h b/include/aomovie.h
similarity index 100%
rename from aomovie.h
rename to include/aomovie.h
diff --git a/aomusicplayer.h b/include/aomusicplayer.h
similarity index 100%
rename from aomusicplayer.h
rename to include/aomusicplayer.h
diff --git a/aooptionsdialog.h b/include/aooptionsdialog.h
similarity index 100%
rename from aooptionsdialog.h
rename to include/aooptionsdialog.h
diff --git a/aopacket.h b/include/aopacket.h
similarity index 100%
rename from aopacket.h
rename to include/aopacket.h
diff --git a/aoscene.h b/include/aoscene.h
similarity index 100%
rename from aoscene.h
rename to include/aoscene.h
diff --git a/aosfxplayer.h b/include/aosfxplayer.h
similarity index 100%
rename from aosfxplayer.h
rename to include/aosfxplayer.h
diff --git a/aotextarea.h b/include/aotextarea.h
similarity index 100%
rename from aotextarea.h
rename to include/aotextarea.h
diff --git a/aotextedit.h b/include/aotextedit.h
similarity index 100%
rename from aotextedit.h
rename to include/aotextedit.h
diff --git a/chatlogpiece.h b/include/chatlogpiece.h
similarity index 100%
rename from chatlogpiece.h
rename to include/chatlogpiece.h
diff --git a/courtroom.h b/include/courtroom.h
similarity index 100%
rename from courtroom.h
rename to include/courtroom.h
diff --git a/datatypes.h b/include/datatypes.h
similarity index 100%
rename from datatypes.h
rename to include/datatypes.h
diff --git a/debug_functions.h b/include/debug_functions.h
similarity index 100%
rename from debug_functions.h
rename to include/debug_functions.h
diff --git a/discord-rpc.h b/include/discord-rpc.h
similarity index 100%
rename from discord-rpc.h
rename to include/discord-rpc.h
diff --git a/discord_rich_presence.h b/include/discord_rich_presence.h
similarity index 100%
rename from discord_rich_presence.h
rename to include/discord_rich_presence.h
diff --git a/encryption_functions.h b/include/encryption_functions.h
similarity index 100%
rename from encryption_functions.h
rename to include/encryption_functions.h
diff --git a/file_functions.h b/include/file_functions.h
similarity index 100%
rename from file_functions.h
rename to include/file_functions.h
diff --git a/hardware_functions.h b/include/hardware_functions.h
similarity index 100%
rename from hardware_functions.h
rename to include/hardware_functions.h
diff --git a/hex_functions.h b/include/hex_functions.h
similarity index 100%
rename from hex_functions.h
rename to include/hex_functions.h
diff --git a/lobby.h b/include/lobby.h
similarity index 100%
rename from lobby.h
rename to include/lobby.h
diff --git a/misc_functions.h b/include/misc_functions.h
similarity index 100%
rename from misc_functions.h
rename to include/misc_functions.h
diff --git a/networkmanager.h b/include/networkmanager.h
similarity index 100%
rename from networkmanager.h
rename to include/networkmanager.h
diff --git a/text_file_functions.h b/include/text_file_functions.h
similarity index 100%
rename from text_file_functions.h
rename to include/text_file_functions.h
diff --git a/logo.ico b/resource/logo.ico
similarity index 100%
rename from logo.ico
rename to resource/logo.ico
diff --git a/logo.png b/resource/logo.png
similarity index 100%
rename from logo.png
rename to resource/logo.png
diff --git a/resources.qrc b/resources.qrc
index 51f3693..bc9f322 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>resource/fonts/Ace-Attorney.ttf</file>
-        <file>logo.png</file>
+        <file>resource/logo.png</file>
     </qresource>
 </RCC>
diff --git a/aoapplication.cpp b/src/aoapplication.cpp
similarity index 100%
rename from aoapplication.cpp
rename to src/aoapplication.cpp
diff --git a/aoblipplayer.cpp b/src/aoblipplayer.cpp
similarity index 100%
rename from aoblipplayer.cpp
rename to src/aoblipplayer.cpp
diff --git a/aobutton.cpp b/src/aobutton.cpp
similarity index 100%
rename from aobutton.cpp
rename to src/aobutton.cpp
diff --git a/aocaseannouncerdialog.cpp b/src/aocaseannouncerdialog.cpp
similarity index 100%
rename from aocaseannouncerdialog.cpp
rename to src/aocaseannouncerdialog.cpp
diff --git a/aocharbutton.cpp b/src/aocharbutton.cpp
similarity index 100%
rename from aocharbutton.cpp
rename to src/aocharbutton.cpp
diff --git a/aocharmovie.cpp b/src/aocharmovie.cpp
similarity index 100%
rename from aocharmovie.cpp
rename to src/aocharmovie.cpp
diff --git a/aoemotebutton.cpp b/src/aoemotebutton.cpp
similarity index 100%
rename from aoemotebutton.cpp
rename to src/aoemotebutton.cpp
diff --git a/aoevidencebutton.cpp b/src/aoevidencebutton.cpp
similarity index 100%
rename from aoevidencebutton.cpp
rename to src/aoevidencebutton.cpp
diff --git a/aoevidencedisplay.cpp b/src/aoevidencedisplay.cpp
similarity index 100%
rename from aoevidencedisplay.cpp
rename to src/aoevidencedisplay.cpp
diff --git a/aoimage.cpp b/src/aoimage.cpp
similarity index 100%
rename from aoimage.cpp
rename to src/aoimage.cpp
diff --git a/aolineedit.cpp b/src/aolineedit.cpp
similarity index 100%
rename from aolineedit.cpp
rename to src/aolineedit.cpp
diff --git a/aomovie.cpp b/src/aomovie.cpp
similarity index 100%
rename from aomovie.cpp
rename to src/aomovie.cpp
diff --git a/aomusicplayer.cpp b/src/aomusicplayer.cpp
similarity index 100%
rename from aomusicplayer.cpp
rename to src/aomusicplayer.cpp
diff --git a/aooptionsdialog.cpp b/src/aooptionsdialog.cpp
similarity index 100%
rename from aooptionsdialog.cpp
rename to src/aooptionsdialog.cpp
diff --git a/aopacket.cpp b/src/aopacket.cpp
similarity index 100%
rename from aopacket.cpp
rename to src/aopacket.cpp
diff --git a/aoscene.cpp b/src/aoscene.cpp
similarity index 100%
rename from aoscene.cpp
rename to src/aoscene.cpp
diff --git a/aosfxplayer.cpp b/src/aosfxplayer.cpp
similarity index 100%
rename from aosfxplayer.cpp
rename to src/aosfxplayer.cpp
diff --git a/aotextarea.cpp b/src/aotextarea.cpp
similarity index 100%
rename from aotextarea.cpp
rename to src/aotextarea.cpp
diff --git a/aotextedit.cpp b/src/aotextedit.cpp
similarity index 100%
rename from aotextedit.cpp
rename to src/aotextedit.cpp
diff --git a/charselect.cpp b/src/charselect.cpp
similarity index 100%
rename from charselect.cpp
rename to src/charselect.cpp
diff --git a/chatlogpiece.cpp b/src/chatlogpiece.cpp
similarity index 100%
rename from chatlogpiece.cpp
rename to src/chatlogpiece.cpp
diff --git a/courtroom.cpp b/src/courtroom.cpp
similarity index 100%
rename from courtroom.cpp
rename to src/courtroom.cpp
diff --git a/debug_functions.cpp b/src/debug_functions.cpp
similarity index 100%
rename from debug_functions.cpp
rename to src/debug_functions.cpp
diff --git a/discord_rich_presence.cpp b/src/discord_rich_presence.cpp
similarity index 100%
rename from discord_rich_presence.cpp
rename to src/discord_rich_presence.cpp
diff --git a/emotes.cpp b/src/emotes.cpp
similarity index 100%
rename from emotes.cpp
rename to src/emotes.cpp
diff --git a/encryption_functions.cpp b/src/encryption_functions.cpp
similarity index 100%
rename from encryption_functions.cpp
rename to src/encryption_functions.cpp
diff --git a/evidence.cpp b/src/evidence.cpp
similarity index 100%
rename from evidence.cpp
rename to src/evidence.cpp
diff --git a/file_functions.cpp b/src/file_functions.cpp
similarity index 100%
rename from file_functions.cpp
rename to src/file_functions.cpp
diff --git a/hardware_functions.cpp b/src/hardware_functions.cpp
similarity index 100%
rename from hardware_functions.cpp
rename to src/hardware_functions.cpp
diff --git a/hex_functions.cpp b/src/hex_functions.cpp
similarity index 100%
rename from hex_functions.cpp
rename to src/hex_functions.cpp
diff --git a/lobby.cpp b/src/lobby.cpp
similarity index 100%
rename from lobby.cpp
rename to src/lobby.cpp
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/misc_functions.cpp b/src/misc_functions.cpp
similarity index 100%
rename from misc_functions.cpp
rename to src/misc_functions.cpp
diff --git a/networkmanager.cpp b/src/networkmanager.cpp
similarity index 100%
rename from networkmanager.cpp
rename to src/networkmanager.cpp
diff --git a/packet_distribution.cpp b/src/packet_distribution.cpp
similarity index 100%
rename from packet_distribution.cpp
rename to src/packet_distribution.cpp
diff --git a/path_functions.cpp b/src/path_functions.cpp
similarity index 100%
rename from path_functions.cpp
rename to src/path_functions.cpp
diff --git a/text_file_functions.cpp b/src/text_file_functions.cpp
similarity index 100%
rename from text_file_functions.cpp
rename to src/text_file_functions.cpp