restructure dirs more modern idomatic go

.github/workflows/build-test.yml

@@ -13,12 +13,10 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version-file: src/go.mod
+          go-version-file: go.mod
 
       - name: Build
-        working-directory: src
         run: go build ./...
 
       - name: Test
-        working-directory: src
         run: go test ./...

AGENTS.md

@@ -2,11 +2,12 @@
 
 ## General
 
-- This is a Go HTTP API backed by PostgreSQL. Source lives under `src/`.
-- Build: `cd src && go build ./...`
-- Test: `cd src && go test ./...`
+- This is a Go HTTP API backed by PostgreSQL. The executable entrypoint lives under `cmd/fmsg-webapi/`, with application packages under `internal/`.
+- Build: `go build ./...`
+- Test: `go test ./...`
 - Always run tests after making code changes to verify nothing is broken.
 - This repository is an open-source implementation and not tied to one specific deployment - config should come from the environment
+- Check sensitive files are not accidentally committed to git, e.g .env should NEVER be
 
 ## README
 
@@ -18,7 +19,7 @@
 - Change build or run instructions.
 
 The API routes table and each route's section must reflect the live code in
-`src/main.go` and `src/handlers/`.
+`cmd/fmsg-webapi/main.go` and `internal/handlers/`.
 
 ## Database
 

README.md

@@ -79,14 +79,12 @@ shared secret in `FMSG_API_JWT_SECRET`. Required claims are `sub` and `exp`;
 Requires **Go 1.25** or newer.
 
 ```bash
-cd src
 go build ./...
 ```
 
 ## Testing
 
 ```bash
-cd src
 go test ./...
 ```
 
@@ -110,8 +108,7 @@ export PGUSER=fmsg
 export PGPASSWORD=secret
 export PGDATABASE=fmsg
 
-cd src
-go run .
+go run ./cmd/fmsg-webapi
 ```
 
 ### Plain HTTP mode (development / reverse proxy)
@@ -131,8 +128,7 @@ export PGUSER=fmsg
 export PGPASSWORD=secret
 export PGDATABASE=fmsg
 
-cd src
-go run .
+go run ./cmd/fmsg-webapi
 ```
 
 The server starts on port `8000` by default. Override with `FMSG_API_PORT`.

src/main.go → cmd/fmsg-webapi/main.go

@@ -16,9 +16,9 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/joho/godotenv"
 
-	"github.com/markmnl/fmsg-webapi/db"
-	"github.com/markmnl/fmsg-webapi/handlers"
-	"github.com/markmnl/fmsg-webapi/middleware"
+	"github.com/markmnl/fmsg-webapi/internal/db"
+	"github.com/markmnl/fmsg-webapi/internal/handlers"
+	"github.com/markmnl/fmsg-webapi/internal/middleware"
 )
 
 func main() {

src/handlers/attachments.go → internal/handlers/attachments.go

@@ -13,8 +13,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/jackc/pgx/v5"
 
-	"github.com/markmnl/fmsg-webapi/db"
-	"github.com/markmnl/fmsg-webapi/middleware"
+	"github.com/markmnl/fmsg-webapi/internal/db"
+	"github.com/markmnl/fmsg-webapi/internal/middleware"
 )
 
 // AttachmentHandler holds dependencies for attachment routes.

src/handlers/messages.go → internal/handlers/messages.go

@@ -19,9 +19,9 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/jackc/pgx/v5"
 
-	"github.com/markmnl/fmsg-webapi/db"
-	"github.com/markmnl/fmsg-webapi/middleware"
-	"github.com/markmnl/fmsg-webapi/models"
+	"github.com/markmnl/fmsg-webapi/internal/db"
+	"github.com/markmnl/fmsg-webapi/internal/middleware"
+	"github.com/markmnl/fmsg-webapi/internal/models"
 )
 
 // MessageHandler holds dependencies for message routes.

src/handlers/push.go → internal/handlers/push.go

@@ -13,8 +13,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/jackc/pgx/v5"
 
-	"github.com/markmnl/fmsg-webapi/db"
-	"github.com/markmnl/fmsg-webapi/middleware"
+	"github.com/markmnl/fmsg-webapi/internal/db"
+	"github.com/markmnl/fmsg-webapi/internal/middleware"
 )
 
 // pushTimeout caps how long a single new_msg push fan-out may take. It runs on

src/handlers/push_test.go → internal/handlers/push_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"github.com/markmnl/fmsg-webapi/middleware"
+	"github.com/markmnl/fmsg-webapi/internal/middleware"
 )
 
 func TestShouldPrune(t *testing.T) {

src/handlers/ws.go → internal/handlers/ws.go

@@ -10,7 +10,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 
-	"github.com/markmnl/fmsg-webapi/middleware"
+	"github.com/markmnl/fmsg-webapi/internal/middleware"
 )
 
 // WebSocket tuning constants.