diff --git a/Client.exe b/Client.exe
new file mode 100644
index 00000000..2d162e8e
Binary files /dev/null and b/Client.exe differ
diff --git a/src/OpenDiablo2/Common/SceneInterface.go b/Common/SceneInterface.go
similarity index 100%
rename from src/OpenDiablo2/Common/SceneInterface.go
rename to Common/SceneInterface.go
diff --git a/src/OpenDiablo2/CryptoBuff.go b/CryptoBuff.go
similarity index 100%
rename from src/OpenDiablo2/CryptoBuff.go
rename to CryptoBuff.go
diff --git a/src/OpenDiablo2/Engine.go b/Engine.go
similarity index 98%
rename from src/OpenDiablo2/Engine.go
rename to Engine.go
index 779fd743..3da50c12 100644
--- a/src/OpenDiablo2/Engine.go
+++ b/Engine.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"sync"
 
-	"./Common"
-	"./ResourcePaths"
+	"github.com/essial/OpenDiablo2/Common"
+	"github.com/essial/OpenDiablo2/ResourcePaths"
 
 	"github.com/hajimehoshi/ebiten"
 )
diff --git a/src/OpenDiablo2/MPQ.go b/MPQ.go
similarity index 100%
rename from src/OpenDiablo2/MPQ.go
rename to MPQ.go
diff --git a/src/OpenDiablo2/MPQFont.go b/MPQFont.go
similarity index 100%
rename from src/OpenDiablo2/MPQFont.go
rename to MPQFont.go
diff --git a/src/OpenDiablo2/MPQStream.go b/MPQStream.go
similarity index 100%
rename from src/OpenDiablo2/MPQStream.go
rename to MPQStream.go
diff --git a/src/OpenDiablo2/Math.go b/Math.go
similarity index 100%
rename from src/OpenDiablo2/Math.go
rename to Math.go
diff --git a/Old/OpenDiablo2_Original.tar.gz b/Old/OpenDiablo2_Original.tar.gz
deleted file mode 100644
index ff332997..00000000
Binary files a/Old/OpenDiablo2_Original.tar.gz and /dev/null differ
diff --git a/src/OpenDiablo2/Palette.go b/Palette.go
similarity index 100%
rename from src/OpenDiablo2/Palette.go
rename to Palette.go
diff --git a/README.md b/README.md
index ef8c0bf8..e563f5f4 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,15 @@ ALL OTHER TRADEMARKS ARE THE PROPERTY OF THEIR RESPECTIVE OWNERS.
 
 ## Building
 
-In the root folder, run `go get -d ./src/App` to pull down all dependencies.
+To pull the project down, run `go get https://github.com/essial/OpenDiablo2`
 
-To run the project, run `go run ./src/App` from the root project folder.
+On windows this folder will most likely be in `C:\\users\\(you)\\go\\src\\github.com\\essial\\OpenDiablo2`
+
+In the root folder, run `go get -d` to pull down all dependencies.
+
+To run the project, run `go run ./cmd/Client` from the root folder.
+
+You can also open the root folder in VSCode. Make sure you have the `ms-vscode.go` plugin installed.
 
 ## Configuration
 
diff --git a/src/OpenDiablo2/ResourcePaths/ResourcePaths.go b/ResourcePaths/ResourcePaths.go
similarity index 100%
rename from src/OpenDiablo2/ResourcePaths/ResourcePaths.go
rename to ResourcePaths/ResourcePaths.go
diff --git a/src/OpenDiablo2/SceneMainMenu.go b/SceneMainMenu.go
similarity index 98%
rename from src/OpenDiablo2/SceneMainMenu.go
rename to SceneMainMenu.go
index aa3ce3e9..77471ecd 100644
--- a/src/OpenDiablo2/SceneMainMenu.go
+++ b/SceneMainMenu.go
@@ -1,7 +1,7 @@
 package OpenDiablo2
 
 import (
-	"./ResourcePaths"
+	"github.com/essial/OpenDiablo2/ResourcePaths"
 	"github.com/hajimehoshi/ebiten"
 )
 
diff --git a/src/OpenDiablo2/SoundEntry.go b/SoundEntry.go
similarity index 100%
rename from src/OpenDiablo2/SoundEntry.go
rename to SoundEntry.go
diff --git a/src/OpenDiablo2/Sprite.go b/Sprite.go
similarity index 100%
rename from src/OpenDiablo2/Sprite.go
rename to Sprite.go
diff --git a/src/OpenDiablo2/StringUtils.go b/StringUtils.go
similarity index 100%
rename from src/OpenDiablo2/StringUtils.go
rename to StringUtils.go
diff --git a/src/OpenDiablo2/UILabel.go b/UILabel.go
similarity index 100%
rename from src/OpenDiablo2/UILabel.go
rename to UILabel.go
diff --git a/cibuild.sh b/cibuild.sh
index a32f6325..1080d443 100644
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-go get ./src/App
-golangci-lint run ./src/App
-go build ./src/App
+go get 
+golangci-lint run .
+go build ./cmd/Client
diff --git a/src/App/OpenDiablo2.go b/cmd/Client/main.go
similarity index 95%
rename from src/App/OpenDiablo2.go
rename to cmd/Client/main.go
index aa2f96d7..4647d2a7 100644
--- a/src/App/OpenDiablo2.go
+++ b/cmd/Client/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"../OpenDiablo2"
+	"github.com/essial/OpenDiablo2"
 	"github.com/hajimehoshi/ebiten"
 )
 
diff --git a/src/.vscode/launch.json b/src/.vscode/launch.json
deleted file mode 100644
index 8d21f482..00000000
--- a/src/.vscode/launch.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    // 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
deleted file mode 100644
index 53d1f17b..00000000
--- a/src/.vscode/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "go.lintFlags": [
-        "--exclude=\"\bexported \\w+ (\\S*['.]*)([a-zA-Z'.*]*) should have comment or be unexported\b\""
-    ]
-}