diff --git a/adventura b/adventura
index 9d77931..e4d48fd 100755
Binary files a/adventura and b/adventura differ
diff --git a/completed_single_level.screen.txt b/screens/completed_single_level.txt
similarity index 100%
rename from completed_single_level.screen.txt
rename to screens/completed_single_level.txt
diff --git a/death.screen.txt b/screens/death.txt
similarity index 100%
rename from death.screen.txt
rename to screens/death.txt
diff --git a/help.screen.txt b/screens/help.txt
similarity index 100%
rename from help.screen.txt
rename to screens/help.txt
diff --git a/start.screen.txt b/screens/start.txt
similarity index 100%
rename from start.screen.txt
rename to screens/start.txt
diff --git a/victory.screen.txt b/screens/victory.txt
similarity index 100%
rename from victory.screen.txt
rename to screens/victory.txt
diff --git a/block.hpp b/src/block.hpp
similarity index 100%
rename from block.hpp
rename to src/block.hpp
diff --git a/blockPos.hpp b/src/blockPos.hpp
similarity index 100%
rename from blockPos.hpp
rename to src/blockPos.hpp
diff --git a/blockRegistry.hpp b/src/blockRegistry.hpp
similarity index 100%
rename from blockRegistry.hpp
rename to src/blockRegistry.hpp
diff --git a/blockSettings.hpp b/src/blockSettings.hpp
similarity index 100%
rename from blockSettings.hpp
rename to src/blockSettings.hpp
diff --git a/color.hpp b/src/color.hpp
similarity index 100%
rename from color.hpp
rename to src/color.hpp
diff --git a/fileUtils.hpp b/src/fileUtils.hpp
similarity index 100%
rename from fileUtils.hpp
rename to src/fileUtils.hpp
diff --git a/identifier.hpp b/src/identifier.hpp
similarity index 100%
rename from identifier.hpp
rename to src/identifier.hpp
diff --git a/main.cpp b/src/main.cpp
similarity index 87%
rename from main.cpp
rename to src/main.cpp
index 5d11f62..512bab3 100644
--- a/main.cpp
+++ b/src/main.cpp
@@ -31,18 +31,18 @@ int main(int argc, char *argv[]) {
     if (parseArgs(argc, argv)) return 0;
     
     if (!testMode) {
-        printFile("./start.screen.txt", Color::BRIGHT_YELLOW); // Show the story introduction
+        printFile("./screens/start.txt", Color::BRIGHT_YELLOW); // Show the story introduction
         waitForInput();
         printGuide(); // Show the block guide
         waitForInput();
     }
     
     // Load every world in order
-    for (const auto & world : getOrderedFileNames("./", ".world.txt"))
+    for (const auto & world : getOrderedFileNames("./worlds/", ".txt"))
         if (!startWorld(world)) return 0; // If the player dies, exit
 
     // Print the victory screen once all levels have been completed
-    printFile("./victory.screen.txt", Color::BRIGHT_GREEN);
+    printFile("./screens/victory.txt", Color::BRIGHT_GREEN);
 
     return 0;
 }
@@ -64,7 +64,7 @@ bool startWorld(string worldFile) {
     inputLoop(player, world, testMode, worldIndex);
 
     worldIndex++;
-    if (!player.isAlive()) printFile("./death.screen.txt", Color::BRIGHT_RED);
+    if (!player.isAlive()) printFile("./screens/death.txt", Color::BRIGHT_RED);
     return player.hasReachedGoal();
 }
 
@@ -96,12 +96,12 @@ bool parseArgs(int argc, char *argv[]) {
                 if (!startWorld("./" + string(argv[i+1]))) // This warning can also be ignored, again – we do this in a safe way
                     return true; // Load only the specified world
                 else
-                    printFile("./completed_single_level.screen.txt", Color::BRIGHT_GREEN);
+                    printFile("./screens/completed_single_level.txt", Color::BRIGHT_GREEN);
                 return true;
             }
         }
         if (!testMode) {
-            printFile("./help.screen.txt", Color::BRIGHT_BLUE); // Print help screen
+            printFile("./screens/help.txt", Color::BRIGHT_BLUE); // Print help screen
             return true;
         }
     }
diff --git a/movementHandler.hpp b/src/movementHandler.hpp
similarity index 100%
rename from movementHandler.hpp
rename to src/movementHandler.hpp
diff --git a/output.hpp b/src/output.hpp
similarity index 100%
rename from output.hpp
rename to src/output.hpp
diff --git a/player.hpp b/src/player.hpp
similarity index 100%
rename from player.hpp
rename to src/player.hpp
diff --git a/world.hpp b/src/world.hpp
similarity index 100%
rename from world.hpp
rename to src/world.hpp
diff --git a/1.world.txt b/worlds/1.txt
similarity index 100%
rename from 1.world.txt
rename to worlds/1.txt
diff --git a/2.world.txt b/worlds/2.txt
similarity index 100%
rename from 2.world.txt
rename to worlds/2.txt
diff --git a/3.world.txt b/worlds/3.txt
similarity index 100%
rename from 3.world.txt
rename to worlds/3.txt
diff --git a/4.world.txt b/worlds/4.txt
similarity index 100%
rename from 4.world.txt
rename to worlds/4.txt
diff --git a/5.world.txt b/worlds/5.txt
similarity index 100%
rename from 5.world.txt
rename to worlds/5.txt