diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..dd7c74f
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "Lua.diagnostics.disable": [
+        "different-requires"
+    ]
+}
\ No newline at end of file
diff --git a/main.lua b/main.lua
index ae2b7d3..707627f 100644
--- a/main.lua
+++ b/main.lua
@@ -1,11 +1,11 @@
 local Height = 0
 local Width = 0
 
-local myMath = require("modules.math")
-local myTypes = require("modules.types")
-local conductor = require("modules.conductor")
-local json = require("modules.json")
-local files = require("modules.files")
+local myMath = require("source.modules.math")
+local myTypes = require("source.modules.types")
+local conductor = require("source.modules.conductor")
+local json = require("source.modules.json")
+local files = require("source.modules.files")
 local socket = require("socket")
 
 local newVector2 = myTypes.Vector2(10, 10)
@@ -17,6 +17,10 @@ local songDifficulty = "erect"
 
 local chartString = files.read_file(string.format("charts/%s/%s-%s.json", songName, songName, songDifficulty))
 
+if not chartString then
+    error("Chart couldn't be loaded!")
+end
+
 print(chartString)
 local chart = json.parse(chartString).song
 
diff --git a/modules/conductor.lua b/source/modules/conductor.lua
similarity index 96%
rename from modules/conductor.lua
rename to source/modules/conductor.lua
index 317dde5..e6536c6 100644
--- a/modules/conductor.lua
+++ b/source/modules/conductor.lua
@@ -1,5 +1,5 @@
-local myMath = require("modules.math")
-local logging = require("modules.logging")
+local myMath = require("source.modules.math")
+local logging = require("source.modules.logging")
 
 local conductor = {}
 conductor.bpm = 120
diff --git a/modules/files.lua b/source/modules/files.lua
similarity index 100%
rename from modules/files.lua
rename to source/modules/files.lua
diff --git a/modules/json.lua b/source/modules/json.lua
similarity index 100%
rename from modules/json.lua
rename to source/modules/json.lua
diff --git a/modules/logging.lua b/source/modules/logging.lua
similarity index 100%
rename from modules/logging.lua
rename to source/modules/logging.lua
diff --git a/modules/math.lua b/source/modules/math.lua
similarity index 100%
rename from modules/math.lua
rename to source/modules/math.lua
diff --git a/modules/types.lua b/source/modules/types.lua
similarity index 89%
rename from modules/types.lua
rename to source/modules/types.lua
index 90fea1c..fa11022 100644
--- a/modules/types.lua
+++ b/source/modules/types.lua
@@ -1,6 +1,6 @@
 local module = {}
 
-local myMath = require("modules.math")
+local myMath = require("source.modules.math")
 
 local Vector2 = {}
 Vector2.__index = Vector2