diff --git a/pkg/database/sqlite/database.go b/database/sqlite/database.go
similarity index 99%
rename from pkg/database/sqlite/database.go
rename to database/sqlite/database.go
index ff21f04..c1a6d35 100644
--- a/pkg/database/sqlite/database.go
+++ b/database/sqlite/database.go
@@ -5,7 +5,7 @@ import (
 	_ "embed"
 	"fmt"
 
-	"git.arav.top/Arav/justguestbook/pkg/guestbook"
+	"git.arav.top/Arav/justguestbook/guestbook"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/pkg/errors"
 )
diff --git a/pkg/database/sqlite/database_test.go b/database/sqlite/database_test.go
similarity index 96%
rename from pkg/database/sqlite/database_test.go
rename to database/sqlite/database_test.go
index a3f69a7..ebbc5e4 100644
--- a/pkg/database/sqlite/database_test.go
+++ b/database/sqlite/database_test.go
@@ -3,8 +3,8 @@ package sqlite_test
 import (
 	"testing"
 
-	"git.arav.top/Arav/justguestbook/pkg/database/sqlite"
-	"git.arav.top/Arav/justguestbook/pkg/guestbook"
+	"git.arav.top/Arav/justguestbook/database/sqlite"
+	"git.arav.top/Arav/justguestbook/guestbook"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/database/sqlite/queries/entryCount.sql b/database/sqlite/queries/entryCount.sql
similarity index 100%
rename from pkg/database/sqlite/queries/entryCount.sql
rename to database/sqlite/queries/entryCount.sql
diff --git a/pkg/database/sqlite/queries/entryDelete.sql b/database/sqlite/queries/entryDelete.sql
similarity index 100%
rename from pkg/database/sqlite/queries/entryDelete.sql
rename to database/sqlite/queries/entryDelete.sql
diff --git a/pkg/database/sqlite/queries/entryGetAll.sql b/database/sqlite/queries/entryGetAll.sql
similarity index 100%
rename from pkg/database/sqlite/queries/entryGetAll.sql
rename to database/sqlite/queries/entryGetAll.sql
diff --git a/pkg/database/sqlite/queries/entryNew.sql b/database/sqlite/queries/entryNew.sql
similarity index 100%
rename from pkg/database/sqlite/queries/entryNew.sql
rename to database/sqlite/queries/entryNew.sql
diff --git a/pkg/database/sqlite/queries/entryUpdate.sql b/database/sqlite/queries/entryUpdate.sql
similarity index 100%
rename from pkg/database/sqlite/queries/entryUpdate.sql
rename to database/sqlite/queries/entryUpdate.sql
diff --git a/pkg/database/sqlite/queries/replyDelete.sql b/database/sqlite/queries/replyDelete.sql
similarity index 100%
rename from pkg/database/sqlite/queries/replyDelete.sql
rename to database/sqlite/queries/replyDelete.sql
diff --git a/pkg/database/sqlite/queries/replyNew.sql b/database/sqlite/queries/replyNew.sql
similarity index 100%
rename from pkg/database/sqlite/queries/replyNew.sql
rename to database/sqlite/queries/replyNew.sql
diff --git a/pkg/database/sqlite/queries/replyUpdate.sql b/database/sqlite/queries/replyUpdate.sql
similarity index 100%
rename from pkg/database/sqlite/queries/replyUpdate.sql
rename to database/sqlite/queries/replyUpdate.sql
diff --git a/pkg/database/sqlite/queries/schema.sql b/database/sqlite/queries/schema.sql
similarity index 100%
rename from pkg/database/sqlite/queries/schema.sql
rename to database/sqlite/queries/schema.sql
diff --git a/pkg/guestbook/database.go b/guestbook/database.go
similarity index 100%
rename from pkg/guestbook/database.go
rename to guestbook/database.go
diff --git a/pkg/guestbook/entry.go b/guestbook/entry.go
similarity index 100%
rename from pkg/guestbook/entry.go
rename to guestbook/entry.go
diff --git a/pkg/guestbook/reply.go b/guestbook/reply.go
similarity index 100%
rename from pkg/guestbook/reply.go
rename to guestbook/reply.go