diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5badfe8..20cb358 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,34 +1,17 @@
 cmake_minimum_required(VERSION 3.4)
 
-project(Engine)
-project(RBXNuServer)
-project(RBXNuStudio)
-project(RBXNuPlayer)
+project(player)
+project(server)
+project(studio)
 
-add_library(Engine STATIC
-    roblox/engine/RBXNu.cpp
+add_executable(player
+    src/client/player/main.cpp
 )
 
-add_executable(RBXNuServer
-    roblox/server/RBXNuServer.cpp
+add_executable(server
+    src/client/server/main.cpp
 )
 
-add_executable(RBXNuStudio 
-    roblox/studio/RBXNuStudio.cpp
-)
-
-add_executable(RBXNuPlayer
-    roblox/player/RBXNuPlayer.cpp
-)
-
-target_link_libraries(RBXNuServer
-    Engine
-)
-
-target_link_libraries(RBXNuStudio
-    Engine 
-)
-
-target_link_libraries(RBXNuPlayer
-    Engine
+add_executable(studio 
+    src/client/studio/main.cpp
 )
\ No newline at end of file
diff --git a/roblox/player/RBXNuPlayer.cpp b/src/client/player/main.cpp
similarity index 53%
rename from roblox/player/RBXNuPlayer.cpp
rename to src/client/player/main.cpp
index 4222995..e5ecee2 100644
--- a/roblox/player/RBXNuPlayer.cpp
+++ b/src/client/player/main.cpp
@@ -2,5 +2,5 @@
 
 int main()
 {
-    printf("Hello World");
+    printf("Hello world!");
 }
\ No newline at end of file
diff --git a/roblox/server/RBXNuServer.cpp b/src/client/server/main.cpp
similarity index 53%
rename from roblox/server/RBXNuServer.cpp
rename to src/client/server/main.cpp
index 4222995..e5ecee2 100644
--- a/roblox/server/RBXNuServer.cpp
+++ b/src/client/server/main.cpp
@@ -2,5 +2,5 @@
 
 int main()
 {
-    printf("Hello World");
+    printf("Hello world!");
 }
\ No newline at end of file
diff --git a/roblox/studio/RBXNuStudio.cpp b/src/client/studio/main.cpp
similarity index 53%
rename from roblox/studio/RBXNuStudio.cpp
rename to src/client/studio/main.cpp
index 4222995..e5ecee2 100644
--- a/roblox/studio/RBXNuStudio.cpp
+++ b/src/client/studio/main.cpp
@@ -2,5 +2,5 @@
 
 int main()
 {
-    printf("Hello World");
+    printf("Hello world!");
 }
\ No newline at end of file
diff --git a/roblox/engine/RBXNu.cpp b/src/engine/app/gui/.gitkeep
similarity index 100%
rename from roblox/engine/RBXNu.cpp
rename to src/engine/app/gui/.gitkeep
diff --git a/src/engine/app/humanoid/.gitkeep b/src/engine/app/humanoid/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/engine/app/lua/.gitkeep b/src/engine/app/lua/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/engine/app/v8/kernel/.gitkeep b/src/engine/app/v8/kernel/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/engine/app/v8/model/.gitkeep b/src/engine/app/v8/model/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/engine/app/v8/tree/.gitkeep b/src/engine/app/v8/tree/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/engine/app/v8/world/.gitkeep b/src/engine/app/v8/world/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/engine/network/raknet/.gitkeep b/src/engine/network/raknet/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/engine/rendering/g3d/.gitkeep b/src/engine/rendering/g3d/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/engine/rendering/sdl/.gitkeep b/src/engine/rendering/sdl/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/engine/utilities/.gitkeep b/src/engine/utilities/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/client/player/.gitkeep b/src/include/client/player/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/client/server/.gitkeep b/src/include/client/server/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/client/studio/.gitkeep b/src/include/client/studio/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/app/gui/.gitkeep b/src/include/engine/app/gui/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/app/humanoid/.gitkeep b/src/include/engine/app/humanoid/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/app/lua/.gitkeep b/src/include/engine/app/lua/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/app/v8/kernel/.gitkeep b/src/include/engine/app/v8/kernel/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/app/v8/model/.gitkeep b/src/include/engine/app/v8/model/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/app/v8/tree/.gitkeep b/src/include/engine/app/v8/tree/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/app/v8/world/.gitkeep b/src/include/engine/app/v8/world/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/network/raknet/.gitkeep b/src/include/engine/network/raknet/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/rendering/g3d/.gitkeep b/src/include/engine/rendering/g3d/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/rendering/sdl/.gitkeep b/src/include/engine/rendering/sdl/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/include/engine/utilities/.gitkeep b/src/include/engine/utilities/.gitkeep
new file mode 100644
index 0000000..e69de29