diff --git a/src/.vscode/launch.json b/src/.vscode/launch.json
new file mode 100644
index 00000000..8d21f482
--- /dev/null
+++ b/src/.vscode/launch.json
@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/App",
+            "env": {},
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}
diff --git a/src/.vscode/settings.json b/src/.vscode/settings.json
new file mode 100644
index 00000000..53d1f17b
--- /dev/null
+++ b/src/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "go.lintFlags": [
+        "--exclude=\"\bexported \\w+ (\\S*['.]*)([a-zA-Z'.*]*) should have comment or be unexported\b\""
+    ]
+}
diff --git a/App/OpenDiablo2.go b/src/App/OpenDiablo2.go
similarity index 100%
rename from App/OpenDiablo2.go
rename to src/App/OpenDiablo2.go
diff --git a/OpenDiablo2/Common/SceneInterface.go b/src/OpenDiablo2/Common/SceneInterface.go
similarity index 100%
rename from OpenDiablo2/Common/SceneInterface.go
rename to src/OpenDiablo2/Common/SceneInterface.go
diff --git a/OpenDiablo2/CryptoBuff.go b/src/OpenDiablo2/CryptoBuff.go
similarity index 100%
rename from OpenDiablo2/CryptoBuff.go
rename to src/OpenDiablo2/CryptoBuff.go
diff --git a/OpenDiablo2/Engine.go b/src/OpenDiablo2/Engine.go
similarity index 100%
rename from OpenDiablo2/Engine.go
rename to src/OpenDiablo2/Engine.go
diff --git a/OpenDiablo2/MPQ.go b/src/OpenDiablo2/MPQ.go
similarity index 100%
rename from OpenDiablo2/MPQ.go
rename to src/OpenDiablo2/MPQ.go
diff --git a/OpenDiablo2/MPQFont.go b/src/OpenDiablo2/MPQFont.go
similarity index 100%
rename from OpenDiablo2/MPQFont.go
rename to src/OpenDiablo2/MPQFont.go
diff --git a/OpenDiablo2/MPQStream.go b/src/OpenDiablo2/MPQStream.go
similarity index 100%
rename from OpenDiablo2/MPQStream.go
rename to src/OpenDiablo2/MPQStream.go
diff --git a/OpenDiablo2/Math.go b/src/OpenDiablo2/Math.go
similarity index 100%
rename from OpenDiablo2/Math.go
rename to src/OpenDiablo2/Math.go
diff --git a/OpenDiablo2/Palette.go b/src/OpenDiablo2/Palette.go
similarity index 100%
rename from OpenDiablo2/Palette.go
rename to src/OpenDiablo2/Palette.go
diff --git a/OpenDiablo2/ResourcePaths/ResourcePaths.go b/src/OpenDiablo2/ResourcePaths/ResourcePaths.go
similarity index 100%
rename from OpenDiablo2/ResourcePaths/ResourcePaths.go
rename to src/OpenDiablo2/ResourcePaths/ResourcePaths.go
diff --git a/OpenDiablo2/SceneMainMenu.go b/src/OpenDiablo2/SceneMainMenu.go
similarity index 100%
rename from OpenDiablo2/SceneMainMenu.go
rename to src/OpenDiablo2/SceneMainMenu.go
diff --git a/OpenDiablo2/SoundEntry.go b/src/OpenDiablo2/SoundEntry.go
similarity index 100%
rename from OpenDiablo2/SoundEntry.go
rename to src/OpenDiablo2/SoundEntry.go
diff --git a/OpenDiablo2/Sprite.go b/src/OpenDiablo2/Sprite.go
similarity index 100%
rename from OpenDiablo2/Sprite.go
rename to src/OpenDiablo2/Sprite.go
diff --git a/OpenDiablo2/StringUtils.go b/src/OpenDiablo2/StringUtils.go
similarity index 100%
rename from OpenDiablo2/StringUtils.go
rename to src/OpenDiablo2/StringUtils.go
diff --git a/OpenDiablo2/UILabel.go b/src/OpenDiablo2/UILabel.go
similarity index 100%
rename from OpenDiablo2/UILabel.go
rename to src/OpenDiablo2/UILabel.go