diff --git a/smtpd/filemsg.go b/filestore/fmessage.go
similarity index 99%
rename from smtpd/filemsg.go
rename to filestore/fmessage.go
index 9030dbe..54da127 100644
--- a/smtpd/filemsg.go
+++ b/filestore/fmessage.go
@@ -1,4 +1,4 @@
-package smtpd
+package filestore
 
 import (
 	"bufio"
diff --git a/smtpd/filestore.go b/filestore/fstore.go
similarity index 99%
rename from smtpd/filestore.go
rename to filestore/fstore.go
index 4bef294..4ac7bc1 100644
--- a/smtpd/filestore.go
+++ b/filestore/fstore.go
@@ -1,4 +1,4 @@
-package smtpd
+package filestore
 
 import (
 	"bufio"
diff --git a/smtpd/filestore_test.go b/filestore/fstore_test.go
similarity index 99%
rename from smtpd/filestore_test.go
rename to filestore/fstore_test.go
index a27e5ca..9cac985 100644
--- a/smtpd/filestore_test.go
+++ b/filestore/fstore_test.go
@@ -1,4 +1,4 @@
-package smtpd
+package filestore
 
 import (
 	"bytes"
@@ -470,8 +470,8 @@ func TestGetLatestMessage(t *testing.T) {
 	mb, err := ds.MailboxFor(mbName)
 	assert.Nil(t, err)
 	msg, err := mb.GetMessage("latest")
+	assert.Nil(t, msg)
 	assert.Error(t, err)
-	fmt.Println(msg)
 
 	// Deliver test message
 	deliverMessage(ds, mbName, "test", time.Now())
diff --git a/inbucket.go b/inbucket.go
index 7593000..83c39f4 100644
--- a/inbucket.go
+++ b/inbucket.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/jhillyerd/inbucket/config"
+	"github.com/jhillyerd/inbucket/filestore"
 	"github.com/jhillyerd/inbucket/httpd"
 	"github.com/jhillyerd/inbucket/log"
 	"github.com/jhillyerd/inbucket/msghub"
@@ -115,7 +116,7 @@ func main() {
 	msgHub := msghub.New(rootCtx, config.GetWebConfig().MonitorHistory)
 
 	// Grab our datastore
-	ds := smtpd.DefaultFileDataStore()
+	ds := filestore.DefaultFileDataStore()
 
 	// Start HTTP server
 	httpd.Initialize(config.GetWebConfig(), shutdownChan, ds, msgHub)