diff --git a/cmd/commander/main.go b/cmd/commander/main.go
index 2ec8d45..7893903 100644
--- a/cmd/commander/main.go
+++ b/cmd/commander/main.go
@@ -10,6 +10,12 @@ import (
 	"os"
 
 	"github.com/BurntSushi/toml"
+	"github.com/advanced-security/mrvacommander/intefaces/mci"
+	"github.com/advanced-security/mrvacommander/lib/commander/lcmem"
+	"github.com/advanced-security/mrvacommander/lib/logger/llmem"
+	"github.com/advanced-security/mrvacommander/lib/queue/lqmem"
+	"github.com/advanced-security/mrvacommander/lib/runner/lrmem"
+	"github.com/advanced-security/mrvacommander/lib/storage/lsmem"
 )
 
 func main() {
@@ -56,7 +62,15 @@ func main() {
 	// Apply 'mode' flag
 	switch *mode {
 	case "standalone":
-		// Assemble ccmem
+		// Assemble single-process version
+		state := MCState{
+			commander: lcmem.LCCommander,
+			logger:    llmem.LCLogger,
+			queue:     lqmem.LCQueue,
+			storage:   lsmem.LCStorage,
+			runner:    lrmem.LCRunner,
+		}
+
 	case "container":
 		// Assemble cccontainer
 	case "cluster":
@@ -75,12 +89,23 @@ func main() {
 
 }
 
-type CommanderParts struct {
-	commander MCCommander
-	logger    MCLogger
-	queue     MCQueue
-	storage   MCStorage
-	runner    MCRunner
+type MCCConf struct {
+}
+type MCLConf struct {
+}
+type MCQConf struct {
+}
+type MCSConf struct {
+}
+type MCRConf struct {
+}
+
+type MCState struct {
+	commander mci.MCCommander
+	logger    mci.MCLogger
+	queue     mci.MCQueue
+	storage   mci.MCStorage
+	runner    mci.MCRunner
 }
 
 type MCConfig struct {
diff --git a/interfaces/commander.go b/interfaces/commander.go
deleted file mode 100644
index e69de29..0000000
diff --git a/interfaces/common.go b/interfaces/common.go
deleted file mode 100644
index e69de29..0000000
diff --git a/interfaces/logger.go b/interfaces/logger.go
deleted file mode 100644
index e69de29..0000000
diff --git a/interfaces/mci/commander.go b/interfaces/mci/commander.go
new file mode 100644
index 0000000..a267692
--- /dev/null
+++ b/interfaces/mci/commander.go
@@ -0,0 +1,4 @@
+package mci
+
+type MCCommander struct {
+}
diff --git a/interfaces/mci/common.go b/interfaces/mci/common.go
new file mode 100644
index 0000000..3d8ae70
--- /dev/null
+++ b/interfaces/mci/common.go
@@ -0,0 +1,4 @@
+package mci
+
+type MCCommon struct {
+}
diff --git a/interfaces/mci/logger.go b/interfaces/mci/logger.go
new file mode 100644
index 0000000..69c3ba7
--- /dev/null
+++ b/interfaces/mci/logger.go
@@ -0,0 +1,4 @@
+package mci
+
+type MCLogger struct {
+}
diff --git a/interfaces/mci/queue.go b/interfaces/mci/queue.go
new file mode 100644
index 0000000..e548f7b
--- /dev/null
+++ b/interfaces/mci/queue.go
@@ -0,0 +1,4 @@
+package mci
+
+type MCQueue struct {
+}
diff --git a/interfaces/mci/runner.go b/interfaces/mci/runner.go
new file mode 100644
index 0000000..afffafa
--- /dev/null
+++ b/interfaces/mci/runner.go
@@ -0,0 +1,4 @@
+package mci
+
+type MCRunner struct {
+}
diff --git a/interfaces/mci/storage.go b/interfaces/mci/storage.go
new file mode 100644
index 0000000..ca73406
--- /dev/null
+++ b/interfaces/mci/storage.go
@@ -0,0 +1,4 @@
+package mci
+
+type MCStorage struct {
+}
diff --git a/interfaces/queue.go b/interfaces/queue.go
deleted file mode 100644
index e69de29..0000000
diff --git a/interfaces/runner.go b/interfaces/runner.go
deleted file mode 100644
index e69de29..0000000
diff --git a/interfaces/storage.go b/interfaces/storage.go
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/commander/lcmem/handlers.go b/lib/commander/lcmem/handlers.go
index b123d56..b437615 100644
--- a/lib/commander/lcmem/handlers.go
+++ b/lib/commander/lcmem/handlers.go
@@ -1,7 +1,7 @@
 /*
 Copyright © 2024 github
 */
-package ccmem
+package lcmem
 
 import (
 	"log"
@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/advanced-security/mrvacommander/lib/commander/lcmem"
 	"github.com/gorilla/mux"
 	"github.com/hohn/ghes-mirva-server/analyze"
 	co "github.com/hohn/ghes-mirva-server/common"
diff --git a/lib/logger/llmem/localdisk.go b/lib/logger/llmem/localdisk.go
new file mode 100644
index 0000000..1e1daff
--- /dev/null
+++ b/lib/logger/llmem/localdisk.go
@@ -0,0 +1 @@
+package llmem
diff --git a/lib/logger/localdisk.go b/lib/logger/localdisk.go
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/queue/inmemory.go b/lib/queue/inmemory.go
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/queue/lqmem/inmemory.go b/lib/queue/lqmem/inmemory.go
new file mode 100644
index 0000000..6acafc1
--- /dev/null
+++ b/lib/queue/lqmem/inmemory.go
@@ -0,0 +1 @@
+package lqmem
diff --git a/lib/runner/inmemory.go b/lib/runner/inmemory.go
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/runner/lrmem/inmemory.go b/lib/runner/lrmem/inmemory.go
new file mode 100644
index 0000000..74ee4a2
--- /dev/null
+++ b/lib/runner/lrmem/inmemory.go
@@ -0,0 +1 @@
+package lrmem
diff --git a/lib/storage/localdisk.go b/lib/storage/localdisk.go
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/storage/lsmem/localdisk.go b/lib/storage/lsmem/localdisk.go
new file mode 100644
index 0000000..eb9b1e4
--- /dev/null
+++ b/lib/storage/lsmem/localdisk.go
@@ -0,0 +1 @@
+package lsmem