diff --git a/cmd/svc/server/auth/crypto/crypto.cpp b/cmd/server/auth/crypto/crypto.cpp
similarity index 100%
rename from cmd/svc/server/auth/crypto/crypto.cpp
rename to cmd/server/auth/crypto/crypto.cpp
diff --git a/cmd/svc/server/auth/crypto/crypto.go b/cmd/server/auth/crypto/crypto.go
similarity index 100%
rename from cmd/svc/server/auth/crypto/crypto.go
rename to cmd/server/auth/crypto/crypto.go
diff --git a/cmd/svc/server/auth/crypto/crypto.h b/cmd/server/auth/crypto/crypto.h
similarity index 100%
rename from cmd/svc/server/auth/crypto/crypto.h
rename to cmd/server/auth/crypto/crypto.h
diff --git a/cmd/svc/server/auth/crypto/crypto.swigcxx b/cmd/server/auth/crypto/crypto.swigcxx
similarity index 100%
rename from cmd/svc/server/auth/crypto/crypto.swigcxx
rename to cmd/server/auth/crypto/crypto.swigcxx
diff --git a/cmd/svc/server/auth/crypto/tools.h b/cmd/server/auth/crypto/tools.h
similarity index 100%
rename from cmd/svc/server/auth/crypto/tools.h
rename to cmd/server/auth/crypto/tools.h
diff --git a/cmd/svc/server/auth/module.go b/cmd/server/auth/module.go
similarity index 100%
rename from cmd/svc/server/auth/module.go
rename to cmd/server/auth/module.go
diff --git a/cmd/svc/server/config/module.go b/cmd/server/config/module.go
similarity index 100%
rename from cmd/svc/server/config/module.go
rename to cmd/server/config/module.go
diff --git a/cmd/svc/server/ingress/enet.go b/cmd/server/ingress/enet.go
similarity index 100%
rename from cmd/svc/server/ingress/enet.go
rename to cmd/server/ingress/enet.go
diff --git a/cmd/svc/server/ingress/module.go b/cmd/server/ingress/module.go
similarity index 100%
rename from cmd/svc/server/ingress/module.go
rename to cmd/server/ingress/module.go
diff --git a/cmd/svc/server/ingress/ws.go b/cmd/server/ingress/ws.go
similarity index 100%
rename from cmd/svc/server/ingress/ws.go
rename to cmd/server/ingress/ws.go
diff --git a/cmd/svc/server/main.go b/cmd/server/main.go
similarity index 100%
rename from cmd/svc/server/main.go
rename to cmd/server/main.go
diff --git a/cmd/svc/server/servers/gameserver.go b/cmd/server/servers/gameserver.go
similarity index 100%
rename from cmd/svc/server/servers/gameserver.go
rename to cmd/server/servers/gameserver.go
diff --git a/cmd/svc/server/servers/module.go b/cmd/server/servers/module.go
similarity index 100%
rename from cmd/svc/server/servers/module.go
rename to cmd/server/servers/module.go
diff --git a/cmd/svc/server/servers/serverinfo.go b/cmd/server/servers/serverinfo.go
similarity index 100%
rename from cmd/svc/server/servers/serverinfo.go
rename to cmd/server/servers/serverinfo.go
diff --git a/cmd/svc/server/service/api.go b/cmd/server/service/api.go
similarity index 100%
rename from cmd/svc/server/service/api.go
rename to cmd/server/service/api.go
diff --git a/cmd/svc/server/service/auth.go b/cmd/server/service/auth.go
similarity index 100%
rename from cmd/svc/server/service/auth.go
rename to cmd/server/service/auth.go
diff --git a/cmd/svc/server/service/commands.go b/cmd/server/service/commands.go
similarity index 100%
rename from cmd/svc/server/service/commands.go
rename to cmd/server/service/commands.go
diff --git a/cmd/svc/server/service/cs.go b/cmd/server/service/cs.go
similarity index 100%
rename from cmd/svc/server/service/cs.go
rename to cmd/server/service/cs.go
diff --git a/cmd/svc/server/service/elo.go b/cmd/server/service/elo.go
similarity index 100%
rename from cmd/svc/server/service/elo.go
rename to cmd/server/service/elo.go
diff --git a/cmd/svc/server/service/events.go b/cmd/server/service/events.go
similarity index 100%
rename from cmd/svc/server/service/events.go
rename to cmd/server/service/events.go
diff --git a/cmd/svc/server/service/home.go b/cmd/server/service/home.go
similarity index 100%
rename from cmd/svc/server/service/home.go
rename to cmd/server/service/home.go
diff --git a/cmd/svc/server/service/maps.go b/cmd/server/service/maps.go
similarity index 100%
rename from cmd/svc/server/service/maps.go
rename to cmd/server/service/maps.go
diff --git a/cmd/svc/server/service/matchmaking.go b/cmd/server/service/matchmaking.go
similarity index 100%
rename from cmd/svc/server/service/matchmaking.go
rename to cmd/server/service/matchmaking.go
diff --git a/cmd/svc/server/service/module.go b/cmd/server/service/module.go
similarity index 100%
rename from cmd/svc/server/service/module.go
rename to cmd/server/service/module.go
diff --git a/cmd/svc/server/service/purgatory.ogz b/cmd/server/service/purgatory.ogz
similarity index 100%
rename from cmd/svc/server/service/purgatory.ogz
rename to cmd/server/service/purgatory.ogz
diff --git a/cmd/svc/server/service/sessions.go b/cmd/server/service/sessions.go
similarity index 100%
rename from cmd/svc/server/service/sessions.go
rename to cmd/server/service/sessions.go
diff --git a/cmd/svc/server/service/users.go b/cmd/server/service/users.go
similarity index 100%
rename from cmd/svc/server/service/users.go
rename to cmd/server/service/users.go
diff --git a/cmd/svc/server/state/module.go b/cmd/server/state/module.go
similarity index 100%
rename from cmd/svc/server/state/module.go
rename to cmd/server/state/module.go
diff --git a/cmd/svc/server/state/sql.go b/cmd/server/state/sql.go
similarity index 100%
rename from cmd/svc/server/state/sql.go
rename to cmd/server/state/sql.go
diff --git a/cmd/svc/server/static/.gitignore b/cmd/server/static/.gitignore
similarity index 100%
rename from cmd/svc/server/static/.gitignore
rename to cmd/server/static/.gitignore
diff --git a/cmd/svc/server/static/module.go b/cmd/server/static/module.go
similarity index 100%
rename from cmd/svc/server/static/module.go
rename to cmd/server/static/module.go
diff --git a/cmd/svc/server/stores/module.go b/cmd/server/stores/module.go
similarity index 100%
rename from cmd/svc/server/stores/module.go
rename to cmd/server/stores/module.go
diff --git a/cmd/svc/server/verse/editing.go b/cmd/server/verse/editing.go
similarity index 100%
rename from cmd/svc/server/verse/editing.go
rename to cmd/server/verse/editing.go
diff --git a/cmd/svc/server/verse/module.go b/cmd/server/verse/module.go
similarity index 100%
rename from cmd/svc/server/verse/module.go
rename to cmd/server/verse/module.go
diff --git a/cmd/svc/server/verse/spaces.go b/cmd/server/verse/spaces.go
similarity index 100%
rename from cmd/svc/server/verse/spaces.go
rename to cmd/server/verse/spaces.go
diff --git a/cmd/svc/server/watcher/module.go b/cmd/server/watcher/module.go
similarity index 100%
rename from cmd/svc/server/watcher/module.go
rename to cmd/server/watcher/module.go