diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 1020b4b..c5266d8 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -31,6 +31,7 @@ find_package(OpenSSL REQUIRED)
 
 # Setup include directories
 target_include_directories(jupiter PUBLIC ../include)
+target_include_directories(jupiter PRIVATE ../include/Jupiter)
 target_include_directories(jupiter PRIVATE ${OPENSSL_INCLUDE_DIR})
 
 # Setup platform-specific definitions
diff --git a/src/include/Algorithm.h b/src/include/Jupiter/Algorithm.h
similarity index 100%
rename from src/include/Algorithm.h
rename to src/include/Jupiter/Algorithm.h
diff --git a/src/include/ArrayList.h b/src/include/Jupiter/ArrayList.h
similarity index 100%
rename from src/include/ArrayList.h
rename to src/include/Jupiter/ArrayList.h
diff --git a/src/include/Base64.h b/src/include/Jupiter/Base64.h
similarity index 100%
rename from src/include/Base64.h
rename to src/include/Jupiter/Base64.h
diff --git a/src/include/CString.h b/src/include/Jupiter/CString.h
similarity index 100%
rename from src/include/CString.h
rename to src/include/Jupiter/CString.h
diff --git a/src/include/CString_Imp.h b/src/include/Jupiter/CString_Imp.h
similarity index 100%
rename from src/include/CString_Imp.h
rename to src/include/Jupiter/CString_Imp.h
diff --git a/src/include/Command.h b/src/include/Jupiter/Command.h
similarity index 100%
rename from src/include/Command.h
rename to src/include/Jupiter/Command.h
diff --git a/src/include/Config.h b/src/include/Jupiter/Config.h
similarity index 100%
rename from src/include/Config.h
rename to src/include/Jupiter/Config.h
diff --git a/src/include/DataBuffer.h b/src/include/Jupiter/DataBuffer.h
similarity index 100%
rename from src/include/DataBuffer.h
rename to src/include/Jupiter/DataBuffer.h
diff --git a/src/include/DataBuffer_Imp.h b/src/include/Jupiter/DataBuffer_Imp.h
similarity index 100%
rename from src/include/DataBuffer_Imp.h
rename to src/include/Jupiter/DataBuffer_Imp.h
diff --git a/src/include/Database.h b/src/include/Jupiter/Database.h
similarity index 100%
rename from src/include/Database.h
rename to src/include/Jupiter/Database.h
diff --git a/src/include/File.h b/src/include/Jupiter/File.h
similarity index 100%
rename from src/include/File.h
rename to src/include/Jupiter/File.h
diff --git a/src/include/Functions.h b/src/include/Jupiter/Functions.h
similarity index 100%
rename from src/include/Functions.h
rename to src/include/Jupiter/Functions.h
diff --git a/src/include/GenericCommand.h b/src/include/Jupiter/GenericCommand.h
similarity index 100%
rename from src/include/GenericCommand.h
rename to src/include/Jupiter/GenericCommand.h
diff --git a/src/include/HTTP.h b/src/include/Jupiter/HTTP.h
similarity index 100%
rename from src/include/HTTP.h
rename to src/include/Jupiter/HTTP.h
diff --git a/src/include/HTTP_QueryString.h b/src/include/Jupiter/HTTP_QueryString.h
similarity index 100%
rename from src/include/HTTP_QueryString.h
rename to src/include/Jupiter/HTTP_QueryString.h
diff --git a/src/include/HTTP_Server.h b/src/include/Jupiter/HTTP_Server.h
similarity index 100%
rename from src/include/HTTP_Server.h
rename to src/include/Jupiter/HTTP_Server.h
diff --git a/src/include/Hash.h b/src/include/Jupiter/Hash.h
similarity index 100%
rename from src/include/Hash.h
rename to src/include/Jupiter/Hash.h
diff --git a/src/include/Hash_Table.h b/src/include/Jupiter/Hash_Table.h
similarity index 100%
rename from src/include/Hash_Table.h
rename to src/include/Jupiter/Hash_Table.h
diff --git a/src/include/Hash_Table_Imp.h b/src/include/Jupiter/Hash_Table_Imp.h
similarity index 100%
rename from src/include/Hash_Table_Imp.h
rename to src/include/Jupiter/Hash_Table_Imp.h
diff --git a/src/include/INIConfig.h b/src/include/Jupiter/INIConfig.h
similarity index 100%
rename from src/include/INIConfig.h
rename to src/include/Jupiter/INIConfig.h
diff --git a/src/include/IRC.h b/src/include/Jupiter/IRC.h
similarity index 100%
rename from src/include/IRC.h
rename to src/include/Jupiter/IRC.h
diff --git a/src/include/IRC_Client.h b/src/include/Jupiter/IRC_Client.h
similarity index 100%
rename from src/include/IRC_Client.h
rename to src/include/Jupiter/IRC_Client.h
diff --git a/src/include/IRC_Numerics.h b/src/include/Jupiter/IRC_Numerics.h
similarity index 100%
rename from src/include/IRC_Numerics.h
rename to src/include/Jupiter/IRC_Numerics.h
diff --git a/src/include/InvalidIndex.h b/src/include/Jupiter/InvalidIndex.h
similarity index 100%
rename from src/include/InvalidIndex.h
rename to src/include/Jupiter/InvalidIndex.h
diff --git a/src/include/Jupiter.h b/src/include/Jupiter/Jupiter.h
similarity index 100%
rename from src/include/Jupiter.h
rename to src/include/Jupiter/Jupiter.h
diff --git a/src/include/Plugin.h b/src/include/Jupiter/Plugin.h
similarity index 100%
rename from src/include/Plugin.h
rename to src/include/Jupiter/Plugin.h
diff --git a/src/include/Readable_String.h b/src/include/Jupiter/Readable_String.h
similarity index 100%
rename from src/include/Readable_String.h
rename to src/include/Jupiter/Readable_String.h
diff --git a/src/include/Readable_String_Imp.h b/src/include/Jupiter/Readable_String_Imp.h
similarity index 100%
rename from src/include/Readable_String_Imp.h
rename to src/include/Jupiter/Readable_String_Imp.h
diff --git a/src/include/Reference_String.h b/src/include/Jupiter/Reference_String.h
similarity index 100%
rename from src/include/Reference_String.h
rename to src/include/Jupiter/Reference_String.h
diff --git a/src/include/Reference_String_Imp.h b/src/include/Jupiter/Reference_String_Imp.h
similarity index 100%
rename from src/include/Reference_String_Imp.h
rename to src/include/Jupiter/Reference_String_Imp.h
diff --git a/src/include/Rehash.h b/src/include/Jupiter/Rehash.h
similarity index 100%
rename from src/include/Rehash.h
rename to src/include/Jupiter/Rehash.h
diff --git a/src/include/SecureSocket.h b/src/include/Jupiter/SecureSocket.h
similarity index 100%
rename from src/include/SecureSocket.h
rename to src/include/Jupiter/SecureSocket.h
diff --git a/src/include/Shift_String.h b/src/include/Jupiter/Shift_String.h
similarity index 100%
rename from src/include/Shift_String.h
rename to src/include/Jupiter/Shift_String.h
diff --git a/src/include/Shift_String_Imp.h b/src/include/Jupiter/Shift_String_Imp.h
similarity index 100%
rename from src/include/Shift_String_Imp.h
rename to src/include/Jupiter/Shift_String_Imp.h
diff --git a/src/include/Socket.h b/src/include/Jupiter/Socket.h
similarity index 100%
rename from src/include/Socket.h
rename to src/include/Jupiter/Socket.h
diff --git a/src/include/String.hpp b/src/include/Jupiter/String.hpp
similarity index 100%
rename from src/include/String.hpp
rename to src/include/Jupiter/String.hpp
diff --git a/src/include/String_Imp.h b/src/include/Jupiter/String_Imp.h
similarity index 100%
rename from src/include/String_Imp.h
rename to src/include/Jupiter/String_Imp.h
diff --git a/src/include/String_Type.h b/src/include/Jupiter/String_Type.h
similarity index 100%
rename from src/include/String_Type.h
rename to src/include/Jupiter/String_Type.h
diff --git a/src/include/String_Type_Imp.h b/src/include/Jupiter/String_Type_Imp.h
similarity index 100%
rename from src/include/String_Type_Imp.h
rename to src/include/Jupiter/String_Type_Imp.h
diff --git a/src/include/TCPSocket.h b/src/include/Jupiter/TCPSocket.h
similarity index 100%
rename from src/include/TCPSocket.h
rename to src/include/Jupiter/TCPSocket.h
diff --git a/src/include/Thinker.h b/src/include/Jupiter/Thinker.h
similarity index 100%
rename from src/include/Thinker.h
rename to src/include/Jupiter/Thinker.h
diff --git a/src/include/Timer.h b/src/include/Jupiter/Timer.h
similarity index 100%
rename from src/include/Timer.h
rename to src/include/Jupiter/Timer.h
diff --git a/src/include/UDPSocket.h b/src/include/Jupiter/UDPSocket.h
similarity index 100%
rename from src/include/UDPSocket.h
rename to src/include/Jupiter/UDPSocket.h