diff --git a/handlers/context.go b/stack/context.go
similarity index 99%
rename from handlers/context.go
rename to stack/context.go
index baf750d09e..cd1b893026 100644
--- a/handlers/context.go
+++ b/stack/context.go
@@ -1,4 +1,4 @@
-package handlers
+package stack
 
 import (
 	"bytes"
diff --git a/handlers/util.go b/stack/helpers.go
similarity index 97%
rename from handlers/util.go
rename to stack/helpers.go
index 51089257a3..14fd26557c 100644
--- a/handlers/util.go
+++ b/stack/helpers.go
@@ -1,4 +1,4 @@
-package handlers
+package stack
 
 import (
 	"github.com/tendermint/basecoin"
diff --git a/handlers/middleware.go b/stack/middleware.go
similarity index 99%
rename from handlers/middleware.go
rename to stack/middleware.go
index bf46efd396..0747b849d9 100644
--- a/handlers/middleware.go
+++ b/stack/middleware.go
@@ -1,4 +1,4 @@
-package handlers
+package stack
 
 import (
 	"github.com/tendermint/basecoin"