diff --git a/cmdHandlers.go b/server/cmdHandlers.go
similarity index 99%
rename from cmdHandlers.go
rename to server/cmdHandlers.go
index 105d46d..b04ede5 100644
--- a/cmdHandlers.go
+++ b/server/cmdHandlers.go
@@ -160,6 +160,7 @@ func serve(protocol, port string) {
 
 func serveHTTP(socketServer *socketio.Server, serveHTTPS bool, port string) {
 	http.Handle("/socket.io/", socketServer)
+	http.Handle("/", http.FileServer(http.Dir("static")))
 
 	if serveHTTPS {
 		httpsAddr := ":" + port
diff --git a/db/client.go b/server/db/client.go
similarity index 97%
rename from db/client.go
rename to server/db/client.go
index 00fb725..2b7dc6d 100644
--- a/db/client.go
+++ b/server/db/client.go
@@ -46,7 +46,7 @@ func NewDBClient() (DBClient, error) {
 		return NewMongoClient(dbUri)
 
 	case "sqlite":
-		return NewSQLiteClient("db.sqlite3")
+		return NewSQLiteClient("db/db.sqlite3")
 
 	default:
 		return nil, fmt.Errorf("unsupported database type: %s", DBtype)
diff --git a/db/mongo.go b/server/db/mongo.go
similarity index 100%
rename from db/mongo.go
rename to server/db/mongo.go
diff --git a/db/sqlite.go b/server/db/sqlite.go
similarity index 100%
rename from db/sqlite.go
rename to server/db/sqlite.go
diff --git a/go.mod b/server/go.mod
similarity index 100%
rename from go.mod
rename to server/go.mod
diff --git a/go.sum b/server/go.sum
similarity index 100%
rename from go.sum
rename to server/go.sum
diff --git a/main.go b/server/main.go
similarity index 100%
rename from main.go
rename to server/main.go
diff --git a/models/models.go b/server/models/models.go
similarity index 100%
rename from models/models.go
rename to server/models/models.go
diff --git a/shazam/fft.go b/server/shazam/fft.go
similarity index 100%
rename from shazam/fft.go
rename to server/shazam/fft.go
diff --git a/shazam/fingerprint.go b/server/shazam/fingerprint.go
similarity index 100%
rename from shazam/fingerprint.go
rename to server/shazam/fingerprint.go
diff --git a/shazam/image.go b/server/shazam/image.go
similarity index 100%
rename from shazam/image.go
rename to server/shazam/image.go
diff --git a/shazam/shazam.go b/server/shazam/shazam.go
similarity index 100%
rename from shazam/shazam.go
rename to server/shazam/shazam.go
diff --git a/shazam/spectrogram.go b/server/shazam/spectrogram.go
similarity index 100%
rename from shazam/spectrogram.go
rename to server/shazam/spectrogram.go
diff --git a/socketHandlers.go b/server/socketHandlers.go
similarity index 100%
rename from socketHandlers.go
rename to server/socketHandlers.go
diff --git a/server/songs/Chiquitita.wav b/server/songs/Chiquitita.wav
new file mode 100644
index 0000000..508ceb7
Binary files /dev/null and b/server/songs/Chiquitita.wav differ
diff --git a/server/songs/Dancing Queen.wav b/server/songs/Dancing Queen.wav
new file mode 100644
index 0000000..61b05a6
Binary files /dev/null and b/server/songs/Dancing Queen.wav differ
diff --git a/server/songs/Jolene.wav b/server/songs/Jolene.wav
new file mode 100644
index 0000000..c9df3d5
Binary files /dev/null and b/server/songs/Jolene.wav differ
diff --git a/spotify/downloader.go b/server/spotify/downloader.go
similarity index 100%
rename from spotify/downloader.go
rename to server/spotify/downloader.go
diff --git a/spotify/spotify.go b/server/spotify/spotify.go
similarity index 100%
rename from spotify/spotify.go
rename to server/spotify/spotify.go
diff --git a/spotify/utils.go b/server/spotify/utils.go
similarity index 100%
rename from spotify/utils.go
rename to server/spotify/utils.go
diff --git a/spotify/youtube.go b/server/spotify/youtube.go
similarity index 100%
rename from spotify/youtube.go
rename to server/spotify/youtube.go
diff --git a/utils/helpers.go b/server/utils/helpers.go
similarity index 100%
rename from utils/helpers.go
rename to server/utils/helpers.go
diff --git a/utils/logger.go b/server/utils/logger.go
similarity index 100%
rename from utils/logger.go
rename to server/utils/logger.go
diff --git a/utils/utils.go b/server/utils/utils.go
similarity index 100%
rename from utils/utils.go
rename to server/utils/utils.go
diff --git a/wasm/wasm_main.go b/server/wasm/wasm_main.go
similarity index 100%
rename from wasm/wasm_main.go
rename to server/wasm/wasm_main.go
diff --git a/wav/convert.go b/server/wav/convert.go
similarity index 100%
rename from wav/convert.go
rename to server/wav/convert.go
diff --git a/wav/wav.go b/server/wav/wav.go
similarity index 100%
rename from wav/wav.go
rename to server/wav/wav.go