diff --git a/cmd/dwelling-home/main.go b/cmd/dwelling-home/main.go
index a107037..4c9ed32 100644
--- a/cmd/dwelling-home/main.go
+++ b/cmd/dwelling-home/main.go
@@ -14,7 +14,7 @@ import (
 
 	"git.arav.su/Arav/dwelling-home/internal/http"
 	mfsqlite "git.arav.su/Arav/dwelling-home/pkg/mindflow/database/sqlite"
-	gbsqlite "git.arav.su/Arav/justguestbook/database/sqlite"
+	gb "git.arav.su/Arav/justguestbook"
 )
 
 var version string
@@ -53,7 +53,7 @@ func main() {
 		}
 	}
 
-	guestbookDB, err := gbsqlite.New(path.Join(*databasesPath, "guestbook.sqlite"))
+	guestbookDB, err := gb.NewSQLiteDB(path.Join(*databasesPath, "guestbook.sqlite"))
 	if err != nil {
 		log.Fatalln(err)
 	}
diff --git a/internal/http/api_handlers.go b/internal/http/api_handlers.go
index 1c2bc73..1070c46 100644
--- a/internal/http/api_handlers.go
+++ b/internal/http/api_handlers.go
@@ -12,7 +12,7 @@ import (
 	"git.arav.su/Arav/justcaptcha/pkg/captcha"
 	"git.arav.su/Arav/justcaptcha/pkg/captcha/inmemdb"
 	"git.arav.su/Arav/justcaptcha/pkg/dwcaptcha"
-	"git.arav.su/Arav/justguestbook/guestbook"
+	"git.arav.su/Arav/justguestbook"
 )
 
 // Guestbook API ///////////////////////////////////////////////////////////////
@@ -20,15 +20,15 @@ import (
 type GuestbookApiHandlers struct {
 	Owner    string
 	PageSize int64
-	db       guestbook.Guestbook
+	db       justguestbook.Guestbook
 }
 
-func NewGuestbookApiHandlers(owner string, pageSz int64, db guestbook.Guestbook) *GuestbookApiHandlers {
+func NewGuestbookApiHandlers(owner string, pageSz int64, db justguestbook.Guestbook) *GuestbookApiHandlers {
 	return &GuestbookApiHandlers{Owner: owner, PageSize: pageSz, db: db}
 }
 
 func (h *GuestbookApiHandlers) New(w http.ResponseWriter, r *http.Request) {
-	var entry *guestbook.Entry
+	var entry *justguestbook.Entry
 	var err error
 
 	if strings.Contains(r.Header.Get("Content-Type"), "application/x-www-form-urlencoded") {
@@ -47,7 +47,7 @@ func (h *GuestbookApiHandlers) New(w http.ResponseWriter, r *http.Request) {
 		message = strings.ReplaceAll(message, "\n\r", "\n")
 		message = strings.ReplaceAll(message, "\r", "\n")
 
-		entry, err = guestbook.NewEntry(r.FormValue("name"), message,
+		entry, err = justguestbook.NewEntry(r.FormValue("name"), message,
 			r.FormValue("website"), r.FormValue("hide_website") != "")
 		if err != nil {
 			InternalError(err.Error(), "Here's your message:"+r.FormValue("message"), w)
@@ -64,7 +64,7 @@ func (h *GuestbookApiHandlers) New(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *GuestbookApiHandlers) Edit(w http.ResponseWriter, r *http.Request) {
-	var entry *guestbook.Entry
+	var entry *justguestbook.Entry
 	var err error
 
 	if strings.Contains(r.Header.Get("Content-Type"), "application/x-www-form-urlencoded") {
@@ -78,7 +78,7 @@ func (h *GuestbookApiHandlers) Edit(w http.ResponseWriter, r *http.Request) {
 		message = strings.ReplaceAll(message, "\n\r", "\n")
 		message = strings.ReplaceAll(message, "\r", "\n")
 
-		entry, err = guestbook.NewEntry(r.FormValue("name"), message,
+		entry, err = justguestbook.NewEntry(r.FormValue("name"), message,
 			r.FormValue("website"), r.FormValue("hide_website") != "")
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -104,7 +104,7 @@ func (h *GuestbookApiHandlers) Delete(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *GuestbookApiHandlers) Reply(w http.ResponseWriter, r *http.Request) {
-	var reply *guestbook.Reply
+	var reply *justguestbook.Reply
 	var err error
 
 	if strings.Contains(r.Header.Get("Content-Type"), "application/x-www-form-urlencoded") {
@@ -116,7 +116,7 @@ func (h *GuestbookApiHandlers) Reply(w http.ResponseWriter, r *http.Request) {
 		message = strings.ReplaceAll(message, "\n\r", "\n")
 		message = strings.ReplaceAll(message, "\r", "\n")
 
-		reply, err = guestbook.NewReply(id, message)
+		reply, err = justguestbook.NewReply(id, message)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
@@ -130,7 +130,7 @@ func (h *GuestbookApiHandlers) Reply(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *GuestbookApiHandlers) EditReply(w http.ResponseWriter, r *http.Request) {
-	var reply *guestbook.Reply
+	var reply *justguestbook.Reply
 	var err error
 
 	if strings.Contains(r.Header.Get("Content-Type"), "application/x-www-form-urlencoded") {
@@ -142,7 +142,7 @@ func (h *GuestbookApiHandlers) EditReply(w http.ResponseWriter, r *http.Request)
 		message = strings.ReplaceAll(message, "\n\r", "\n")
 		message = strings.ReplaceAll(message, "\r", "\n")
 
-		reply, err = guestbook.NewReply(id, message)
+		reply, err = justguestbook.NewReply(id, message)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
diff --git a/internal/http/handlers.go b/internal/http/handlers.go
index 001aef7..b42d6a5 100644
--- a/internal/http/handlers.go
+++ b/internal/http/handlers.go
@@ -13,11 +13,11 @@ import (
 	"git.arav.su/Arav/dwelling-home/web"
 	"git.arav.su/Arav/justcaptcha/pkg/captcha/inmemdb"
 	"git.arav.su/Arav/justcaptcha/pkg/dwcaptcha"
-	"git.arav.su/Arav/justguestbook/guestbook"
+	"git.arav.su/Arav/justguestbook"
 )
 
 type Handlers struct {
-	guestbookDB       guestbook.Guestbook
+	guestbookDB       justguestbook.Guestbook
 	mindflowDB        mindflow.Mindflow
 	captchaExpire     time.Duration
 	guestbookOwner    string
@@ -25,7 +25,7 @@ type Handlers struct {
 }
 
 func NewHandlers(captchaExpire time.Duration, gbOwner string, gbPageSize int64,
-	gdb guestbook.Guestbook, mdb mindflow.Mindflow) *Handlers {
+	gdb justguestbook.Guestbook, mdb mindflow.Mindflow) *Handlers {
 	return &Handlers{
 		guestbookDB:       gdb,
 		mindflowDB:        mdb,