diff --git a/Dockerfile b/Dockerfile
index 7ec52042..e9f55bb8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,9 +15,9 @@ COPY go.sum go.sum
 RUN go mod download
 
 # Copy the go source
-COPY main.go main.go
-COPY api/ api/
-COPY controllers/ controllers/
+COPY Nimbus/cmd/main.go Nimbus/cmd/main.go
+COPY Nimbus/api/ Nimbus/api/
+COPY Nimbus/ontrollers/ Nimbus/controllers/
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command
diff --git a/Makefile b/Makefile
index ea881017..fe0c835c 100644
--- a/Makefile
+++ b/Makefile
@@ -88,11 +88,11 @@ lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes
 
 .PHONY: build
 build: manifests generate fmt vet ## Build manager binary.
-	go build -o bin/manager main.go
+	go build -o bin/manager Nimbus/cmd/main.go
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
-	go run ./main.go
+	go run Nimbus/cmd/main.go
 
 # If you wish to build the manager image targeting other platforms you can use the --platform flag.
 # (i.e. docker build --platform linux/arm64). However, you must enable docker buildKit for it.
diff --git a/go.mod b/go.mod
index 3692a362..9c9342b7 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/5GSEC/nimbus
+module github.com/5GSEC/nimbus/Nimbus
 
 go 1.20