diff --git a/server/Makefile b/server/Makefile
index 33c4d0a..e70c712 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -3,10 +3,10 @@ info:
 	@perl -ne 'm/^([a-zA-Z0-9\-]+):/ && print("  $$1\n");' Makefile
 
 build:
-	go build knyt.go
+	cd src/ && go build -o ../knyt knyt.go
 
 run:
-	go run knyt.go
+	cd src/ && go run knyt.go
 
 run-loop:
 	pexec -R -c -e TARGET \
@@ -15,7 +15,7 @@ run-loop:
 		-- $(MAKE) '$$TARGET'
 
 run-standalone:
-	./knyt
+	cd src/ && ../knyt
 
 _run-endless-loop:
 	while true; do $(MAKE) run || sleep 3; done
diff --git a/server/data/users/764353.json b/server/data/users/764353.json
new file mode 100644
index 0000000..fe8437f
--- /dev/null
+++ b/server/data/users/764353.json
@@ -0,0 +1,5 @@
+{
+  id: "764353",
+  name: "Settel",
+  role: "admin",
+}
diff --git a/server/data/users/837293.json b/server/data/users/837293.json
new file mode 100644
index 0000000..c74faed
--- /dev/null
+++ b/server/data/users/837293.json
@@ -0,0 +1,5 @@
+{
+  id: "837293",
+  name: "Player #1",
+  role: "player",
+}
diff --git a/server/app/app.go b/server/src/app/app.go
similarity index 100%
rename from server/app/app.go
rename to server/src/app/app.go
diff --git a/server/app/appconfig.go b/server/src/app/appconfig.go
similarity index 100%
rename from server/app/appconfig.go
rename to server/src/app/appconfig.go
diff --git a/server/engine/engine.go b/server/src/engine/engine.go
similarity index 100%
rename from server/engine/engine.go
rename to server/src/engine/engine.go
diff --git a/server/go.mod b/server/src/go.mod
similarity index 100%
rename from server/go.mod
rename to server/src/go.mod
diff --git a/server/go.sum b/server/src/go.sum
similarity index 100%
rename from server/go.sum
rename to server/src/go.sum
diff --git a/server/handler/authmux.go b/server/src/handler/authmux.go
similarity index 100%
rename from server/handler/authmux.go
rename to server/src/handler/authmux.go
diff --git a/server/handler/internal.go b/server/src/handler/internal.go
similarity index 100%
rename from server/handler/internal.go
rename to server/src/handler/internal.go
diff --git a/server/handler/sync.go b/server/src/handler/sync.go
similarity index 100%
rename from server/handler/sync.go
rename to server/src/handler/sync.go
diff --git a/server/knyt.go b/server/src/knyt.go
similarity index 100%
rename from server/knyt.go
rename to server/src/knyt.go
diff --git a/server/syncdata/syncdata.go b/server/src/syncdata/syncdata.go
similarity index 100%
rename from server/syncdata/syncdata.go
rename to server/src/syncdata/syncdata.go
diff --git a/server/src/users/struct.go b/server/src/users/struct.go
new file mode 100644
index 0000000..ddd84d1
--- /dev/null
+++ b/server/src/users/struct.go
@@ -0,0 +1,7 @@
+package users
+
+type User struct {
+	Id   string `json:"id"`
+	Name string `json:"name"`
+	Role string `json:"role"`
+}
diff --git a/server/src/users/users.go b/server/src/users/users.go
new file mode 100644
index 0000000..c8a88df
--- /dev/null
+++ b/server/src/users/users.go
@@ -0,0 +1,8 @@
+package users
+
+func NewUser(id, name string) *User {
+	return &User{
+		id:   id,
+		name: name,
+	}
+}