diff --git a/dist/ServerStatus-linux b/dist/ServerStatus-linux
index 3fa72b5..a68cad5 100755
Binary files a/dist/ServerStatus-linux and b/dist/ServerStatus-linux differ
diff --git a/dist/ServerStatus-windows.exe b/dist/ServerStatus-windows.exe
index c43ea68..21b2c3d 100755
Binary files a/dist/ServerStatus-windows.exe and b/dist/ServerStatus-windows.exe differ
diff --git a/makefile b/makefile
index 21f87fa..7d6e36b 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,8 @@
-all:
+run:
+	@go run ./src/main.go
+
+build:
 	@rm -rf ./dist
-	@GOOS=windows GOARCH=386 go build -o ./dist/ServerStatus-windows.exe main.go
-	@go build -o ./dist/ServerStatus-linux main.go
+	@GOOS=windows GOARCH=386 go build -o ./dist/ServerStatus-windows.exe ./src/main.go
+	@go build -o ./dist/ServerStatus-linux ./src/main.go
 	@cp config.template.json ./dist/config.json
\ No newline at end of file
diff --git a/readme.md b/readme.md
index a2bcc2d..15504a9 100644
--- a/readme.md
+++ b/readme.md
@@ -5,12 +5,11 @@ This bot will send a chat notification when the status of a server changes.
 
 ## Configuration
 
-- Download or Clone the repo
-- Add your bot token to the config.json file in the dist folder
-- Add your room id to this file as well
-- Execute the correct executable for your operating system!
+- Download or Clone the repository
+- Add your bot token and room ID to the config.json file in the dist folder
+- Execute the Windows or Linux binary!
 
-### How to get bot token
+### How to get the bot token
 https://github.com/reactiflux/discord-irc/wiki/Creating-a-discord-bot-&-getting-a-token
 
 ### How to get your room ID
diff --git a/bot/bot.go b/src/bot/bot.go
similarity index 100%
rename from bot/bot.go
rename to src/bot/bot.go
diff --git a/config/config.go b/src/config/config.go
similarity index 100%
rename from config/config.go
rename to src/config/config.go
diff --git a/main.go b/src/main.go
similarity index 100%
rename from main.go
rename to src/main.go
diff --git a/serverstatus/serverstatus.go b/src/serverstatus/serverstatus.go
similarity index 100%
rename from serverstatus/serverstatus.go
rename to src/serverstatus/serverstatus.go