diff --git a/app/commands/.gitkeep b/app/commands/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/app/commands/spi/_packages.txt b/app/commands/_packages.txt
similarity index 100%
rename from app/commands/spi/_packages.txt
rename to app/commands/_packages.txt
diff --git a/app/commands/spi/authorize_interaction.go b/app/commands/authorize_interaction.go
similarity index 93%
rename from app/commands/spi/authorize_interaction.go
rename to app/commands/authorize_interaction.go
index 0036cd3..df40ad1 100644
--- a/app/commands/spi/authorize_interaction.go
+++ b/app/commands/authorize_interaction.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import . "github.com/reiver/greatape/components/contracts"
 
diff --git a/app/commands/spi/constants.go b/app/commands/constants.go
similarity index 96%
rename from app/commands/spi/constants.go
rename to app/commands/constants.go
index 841ed51..a38419b 100644
--- a/app/commands/spi/constants.go
+++ b/app/commands/constants.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 const (
 	// ACTIVITY_PUB
diff --git a/app/commands/spi/echo.go b/app/commands/echo.go
similarity index 90%
rename from app/commands/spi/echo.go
rename to app/commands/echo.go
index a1fd02e..0c078e1 100644
--- a/app/commands/spi/echo.go
+++ b/app/commands/echo.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import . "github.com/reiver/greatape/components/contracts"
 
diff --git a/app/commands/spi/follow_actor.go b/app/commands/follow_actor.go
similarity index 98%
rename from app/commands/spi/follow_actor.go
rename to app/commands/follow_actor.go
index 4731384..92a6c7a 100644
--- a/app/commands/spi/follow_actor.go
+++ b/app/commands/follow_actor.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	"fmt"
diff --git a/app/commands/spi/get_actor.go b/app/commands/get_actor.go
similarity index 99%
rename from app/commands/spi/get_actor.go
rename to app/commands/get_actor.go
index d462878..706bec2 100644
--- a/app/commands/spi/get_actor.go
+++ b/app/commands/get_actor.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	"time"
diff --git a/app/commands/spi/get_followers.go b/app/commands/get_followers.go
similarity index 98%
rename from app/commands/spi/get_followers.go
rename to app/commands/get_followers.go
index a874dfc..ec3d793 100644
--- a/app/commands/spi/get_followers.go
+++ b/app/commands/get_followers.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	. "github.com/reiver/greatape/components/constants"
diff --git a/app/commands/spi/get_following.go b/app/commands/get_following.go
similarity index 98%
rename from app/commands/spi/get_following.go
rename to app/commands/get_following.go
index 5a95c0f..29d321e 100644
--- a/app/commands/spi/get_following.go
+++ b/app/commands/get_following.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	. "github.com/reiver/greatape/components/constants"
diff --git a/app/commands/spi/get_inbox.go b/app/commands/get_inbox.go
similarity index 99%
rename from app/commands/spi/get_inbox.go
rename to app/commands/get_inbox.go
index 266f785..b31b1e2 100644
--- a/app/commands/spi/get_inbox.go
+++ b/app/commands/get_inbox.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	"time"
diff --git a/app/commands/spi/get_outbox.go b/app/commands/get_outbox.go
similarity index 99%
rename from app/commands/spi/get_outbox.go
rename to app/commands/get_outbox.go
index a8f9302..b118336 100644
--- a/app/commands/spi/get_outbox.go
+++ b/app/commands/get_outbox.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	"time"
diff --git a/app/commands/spi/get_packages.go b/app/commands/get_packages.go
similarity index 93%
rename from app/commands/spi/get_packages.go
rename to app/commands/get_packages.go
index 07fe267..90a18f4 100644
--- a/app/commands/spi/get_packages.go
+++ b/app/commands/get_packages.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	_ "embed"
diff --git a/app/commands/spi/get_profile_by_user.go b/app/commands/get_profile_by_user.go
similarity index 95%
rename from app/commands/spi/get_profile_by_user.go
rename to app/commands/get_profile_by_user.go
index 41b994d..0a98f1b 100644
--- a/app/commands/spi/get_profile_by_user.go
+++ b/app/commands/get_profile_by_user.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import . "github.com/reiver/greatape/components/contracts"
 
diff --git a/app/commands/spi/login.go b/app/commands/login.go
similarity index 98%
rename from app/commands/spi/login.go
rename to app/commands/login.go
index 68a1e8a..a0fc3d2 100644
--- a/app/commands/spi/login.go
+++ b/app/commands/login.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	. "github.com/reiver/greatape/components/constants"
diff --git a/app/commands/spi/logout.go b/app/commands/logout.go
similarity index 90%
rename from app/commands/spi/logout.go
rename to app/commands/logout.go
index a7b8c63..57fe1b2 100644
--- a/app/commands/spi/logout.go
+++ b/app/commands/logout.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import . "github.com/reiver/greatape/components/contracts"
 
diff --git a/app/commands/spi/post_to_inbox.go b/app/commands/post_to_inbox.go
similarity index 99%
rename from app/commands/spi/post_to_inbox.go
rename to app/commands/post_to_inbox.go
index e902eff..874dc02 100644
--- a/app/commands/spi/post_to_inbox.go
+++ b/app/commands/post_to_inbox.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	"encoding/json"
diff --git a/app/commands/spi/post_to_outbox.go b/app/commands/post_to_outbox.go
similarity index 99%
rename from app/commands/spi/post_to_outbox.go
rename to app/commands/post_to_outbox.go
index 5e7f44d..a8e5863 100644
--- a/app/commands/spi/post_to_outbox.go
+++ b/app/commands/post_to_outbox.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	"encoding/json"
diff --git a/app/commands/spi/signup.go b/app/commands/signup.go
similarity index 99%
rename from app/commands/spi/signup.go
rename to app/commands/signup.go
index d3038f2..3df3f6d 100644
--- a/app/commands/spi/signup.go
+++ b/app/commands/signup.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	. "github.com/reiver/greatape/components/constants"
diff --git a/app/commands/spi/update_profile_by_user.go b/app/commands/update_profile_by_user.go
similarity index 98%
rename from app/commands/spi/update_profile_by_user.go
rename to app/commands/update_profile_by_user.go
index cb2ebe5..12066f6 100644
--- a/app/commands/spi/update_profile_by_user.go
+++ b/app/commands/update_profile_by_user.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import . "github.com/reiver/greatape/components/contracts"
 
diff --git a/app/commands/spi/verify.go b/app/commands/verify.go
similarity index 98%
rename from app/commands/spi/verify.go
rename to app/commands/verify.go
index 8367c13..70f1cc5 100644
--- a/app/commands/spi/verify.go
+++ b/app/commands/verify.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	. "github.com/reiver/greatape/components/constants"
diff --git a/app/commands/spi/webfinger.go b/app/commands/webfinger.go
similarity index 98%
rename from app/commands/spi/webfinger.go
rename to app/commands/webfinger.go
index 8ba2acb..b04fe14 100644
--- a/app/commands/spi/webfinger.go
+++ b/app/commands/webfinger.go
@@ -1,4 +1,4 @@
-package spi
+package commands
 
 import (
 	"strings"
diff --git a/components/core/spi_manager.go b/components/core/spi_manager.go
index 06df6e7..36dc9bb 100644
--- a/components/core/spi_manager.go
+++ b/components/core/spi_manager.go
@@ -1,7 +1,7 @@
 package core
 
 import (
-	commands "github.com/reiver/greatape/app/commands/spi"
+	"github.com/reiver/greatape/app/commands"
 	"github.com/reiver/greatape/app/validators"
 	. "github.com/reiver/greatape/components/constants"
 	. "github.com/reiver/greatape/components/contracts"