diff --git a/Makefile b/Makefile
index df72c25e..77a5e159 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
 all: fmt vet nnf-deploy
 
-nnf-deploy: main.go
-	go build
+nnf-deploy: cmd/main.go
+	go build -o ./nnf-deploy cmd/main.go
 
 .PHONY: fmt
 fmt:
-	go fmt ./main.go
+	go fmt cmd/main.go
 	go fmt ./config/*.go
 
 .PHONY: vet
 vet:
-	go vet ./main.go
+	go vet cmd/main.go
 
 .PHONY: test
 test:
diff --git a/main.go b/cmd/main.go
similarity index 100%
rename from main.go
rename to cmd/main.go
diff --git a/dws b/dws
index b6d65b00..13a5a69a 160000
--- a/dws
+++ b/dws
@@ -1 +1 @@
-Subproject commit b6d65b00cad695f91e319d55cd8d8f0b26455329
+Subproject commit 13a5a69a969e165650de6bce7a2cb4a0cac0c55c
diff --git a/lustre-fs-operator b/lustre-fs-operator
index 1ecbc574..531116c1 160000
--- a/lustre-fs-operator
+++ b/lustre-fs-operator
@@ -1 +1 @@
-Subproject commit 1ecbc574e6afabc641a5d4dc4124f3433539cf38
+Subproject commit 531116c1194ee95040e3a0998b47417a1a06251b
diff --git a/nnf-dm b/nnf-dm
index 10db72ba..66e6f080 160000
--- a/nnf-dm
+++ b/nnf-dm
@@ -1 +1 @@
-Subproject commit 10db72ba8f0a77747dfac3958c2f81b502b107d4
+Subproject commit 66e6f08012fc2645b55f45834cfb9055823d4212
diff --git a/nnf-integration-test b/nnf-integration-test
index 6df15e09..42d8f4fd 160000
--- a/nnf-integration-test
+++ b/nnf-integration-test
@@ -1 +1 @@
-Subproject commit 6df15e09b97fd26e85c41b6947e5fa46662e98b9
+Subproject commit 42d8f4fd2a13ffcc8fbdec247003e89f39d6c265
diff --git a/nnf-sos b/nnf-sos
index dbe94019..621786eb 160000
--- a/nnf-sos
+++ b/nnf-sos
@@ -1 +1 @@
-Subproject commit dbe940193534efe95d559524598d1a9dde89cadf
+Subproject commit 621786eb596f24ffeb17c50198a1c5b0ad19e5dc