diff --git a/cmd/root.go b/cmd/root.go
index 7e1f72b..4f7d3ba 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/axllent/mailpit/config"
 	"github.com/axllent/mailpit/server"
-	"github.com/axllent/mailpit/smtpd"
+	"github.com/axllent/mailpit/server/smtpd"
 	"github.com/axllent/mailpit/storage"
 	"github.com/axllent/mailpit/utils/logger"
 	"github.com/spf13/cobra"
diff --git a/smtpd/smtpd.go b/server/smtpd/smtpd.go
similarity index 100%
rename from smtpd/smtpd.go
rename to server/smtpd/smtpd.go