diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 3b8df13..108a0c7 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -31,7 +31,7 @@ jobs:
         fi
 
     - name: Build
-      run: go build -v .
+      run: go build -v ./...
 
     - name: Test
-      run: go test -v .
+      run: go test -v ./...
diff --git a/Dockerfile b/Dockerfile
index d9f9426..29fd85d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,6 @@ WORKDIR /app
 COPY . .
 RUN go mod download
 
-RUN go build -o rove .
+RUN go build -o rove ./...
 
 CMD "./rove"
diff --git a/main.go b/cmd/rove-server/main.go
similarity index 100%
rename from main.go
rename to cmd/rove-server/main.go
diff --git a/router.go b/cmd/rove-server/router.go
similarity index 100%
rename from router.go
rename to cmd/rove-server/router.go
diff --git a/router_test.go b/cmd/rove-server/router_test.go
similarity index 100%
rename from router_test.go
rename to cmd/rove-server/router_test.go