diff --git a/Makefile b/Makefile
index 6ae3fbc..fbf42fa 100644
--- a/Makefile
+++ b/Makefile
@@ -11,13 +11,13 @@ postgres:
 	docker start postgres || docker run --name postgres -p 5432:5432 -e POSTGRES_USER=root -e POSTGRES_PASSWORD=secret -d postgres:15-alpine
 
 migratenew:
-	migrate create -ext sql -dir db/migration -seq init_schema
+	migrate create -ext sql -dir bff/db/migration -seq init_schema
 
 migrateup:
-	migrate -path db/migration -database $(DB_URL) -verbose up
+	migrate -path bff/db/migration -database $(DB_URL) -verbose up
 
 migratedown:
-	migrate -path db/migration -database $(DB_URL) -verbose down
+	migrate -path bff/db/migration -database $(DB_URL) -verbose down
 
 createdb:
 	docker exec -it postgres createdb --username=root --owner=root df
@@ -32,15 +32,15 @@ sqlcinit:
 	sqlc init
 
 test:
-	go test -v -cover -short -count=1 ./...
+	cd bff && go test -v -cover -short -count=1 ./... && cd ..
 
 coverage:
-	go test -coverprofile=coverage.out ./... && go tool cover -html=coverage.out
+	cd bff && go test -coverprofile=coverage.out ./... && go tool cover -html=coverage.out && cd ..
 
 server:
-	go run main.go
+	cd bff && go run main.go && cd ..
 
 mock:
-	mockgen -package mockdb -destination db/mock/store.go github.com/itsscb/df/db/sqlc Store
+	mockgen -package mockdb -destination db/mock/store.go github.com/itsscb/df/bff/db/sqlc Store
 
 .PHONY: postgres migratenew createdb dropdb migrateup migratedown sqlc sqlcinit test server, initialize
diff --git a/api/account.go b/bff/api/account.go
similarity index 98%
rename from api/account.go
rename to bff/api/account.go
index c8af2ee..a86a6d5 100644
--- a/api/account.go
+++ b/bff/api/account.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	db "github.com/itsscb/df/db/sqlc"
-	"github.com/itsscb/df/token"
+	db "github.com/itsscb/df/bff/db/sqlc"
+	"github.com/itsscb/df/bff/token"
 	"golang.org/x/exp/slog"
 )
 
diff --git a/api/account_test.go b/bff/api/account_test.go
similarity index 99%
rename from api/account_test.go
rename to bff/api/account_test.go
index 7a216ad..b37a8fe 100644
--- a/api/account_test.go
+++ b/bff/api/account_test.go
@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	mockdb "github.com/itsscb/df/db/mock"
-	db "github.com/itsscb/df/db/sqlc"
-	"github.com/itsscb/df/token"
-	"github.com/itsscb/df/util"
+	mockdb "github.com/itsscb/df/bff/db/mock"
+	db "github.com/itsscb/df/bff/db/sqlc"
+	"github.com/itsscb/df/bff/token"
+	"github.com/itsscb/df/bff/util"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )
diff --git a/api/logger.go b/bff/api/logger.go
similarity index 100%
rename from api/logger.go
rename to bff/api/logger.go
diff --git a/api/main_test.go b/bff/api/main_test.go
similarity index 93%
rename from api/main_test.go
rename to bff/api/main_test.go
index e198485..070f91c 100644
--- a/api/main_test.go
+++ b/bff/api/main_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 )
 
 var config util.Config
diff --git a/api/middleware.go b/bff/api/middleware.go
similarity index 97%
rename from api/middleware.go
rename to bff/api/middleware.go
index cbdb506..5f81445 100644
--- a/api/middleware.go
+++ b/bff/api/middleware.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/itsscb/df/token"
+	"github.com/itsscb/df/bff/token"
 )
 
 const (
diff --git a/api/middleware_test.go b/bff/api/middleware_test.go
similarity index 97%
rename from api/middleware_test.go
rename to bff/api/middleware_test.go
index 27adde0..ad28e7f 100644
--- a/api/middleware_test.go
+++ b/bff/api/middleware_test.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	mockdb "github.com/itsscb/df/db/mock"
-	"github.com/itsscb/df/token"
+	mockdb "github.com/itsscb/df/bff/db/mock"
+	"github.com/itsscb/df/bff/token"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )
diff --git a/api/server.go b/bff/api/server.go
similarity index 94%
rename from api/server.go
rename to bff/api/server.go
index d5cc031..9a09d5c 100644
--- a/api/server.go
+++ b/bff/api/server.go
@@ -6,9 +6,9 @@ import (
 	"os"
 
 	"github.com/gin-gonic/gin"
-	db "github.com/itsscb/df/db/sqlc"
-	"github.com/itsscb/df/token"
-	"github.com/itsscb/df/util"
+	db "github.com/itsscb/df/bff/db/sqlc"
+	"github.com/itsscb/df/bff/token"
+	"github.com/itsscb/df/bff/util"
 )
 
 // Server serves HTTP requests for df service
diff --git a/api/session.go b/bff/api/session.go
similarity index 97%
rename from api/session.go
rename to bff/api/session.go
index 1f08ca2..805cefc 100644
--- a/api/session.go
+++ b/bff/api/session.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
-	db "github.com/itsscb/df/db/sqlc"
-	"github.com/itsscb/df/util"
+	db "github.com/itsscb/df/bff/db/sqlc"
+	"github.com/itsscb/df/bff/util"
 )
 
 type loginAccountRequest struct {
diff --git a/api/token.go b/bff/api/token.go
similarity index 100%
rename from api/token.go
rename to bff/api/token.go
diff --git a/db/migration/000001_init_schema.down.sql b/bff/db/migration/000001_init_schema.down.sql
similarity index 100%
rename from db/migration/000001_init_schema.down.sql
rename to bff/db/migration/000001_init_schema.down.sql
diff --git a/db/migration/000001_init_schema.up.sql b/bff/db/migration/000001_init_schema.up.sql
similarity index 100%
rename from db/migration/000001_init_schema.up.sql
rename to bff/db/migration/000001_init_schema.up.sql
diff --git a/db/mock/store.go b/bff/db/mock/store.go
similarity index 99%
rename from db/mock/store.go
rename to bff/db/mock/store.go
index ba85165..9c82abf 100644
--- a/db/mock/store.go
+++ b/bff/db/mock/store.go
@@ -1,9 +1,9 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/itsscb/df/db/sqlc (interfaces: Store)
+// Source: github.com/itsscb/df/bff/db/sqlc (interfaces: Store)
 //
 // Generated by this command:
 //
-//	mockgen -package mockdb -destination db/mock/store.go github.com/itsscb/df/db/sqlc Store
+//	mockgen -package mockdb -destination db/mock/store.go github.com/itsscb/df/bff/db/sqlc Store
 //
 // Package mockdb is a generated GoMock package.
 package mockdb
@@ -13,7 +13,7 @@ import (
 	reflect "reflect"
 
 	uuid "github.com/google/uuid"
-	db "github.com/itsscb/df/db/sqlc"
+	db "github.com/itsscb/df/bff/db/sqlc"
 	gomock "go.uber.org/mock/gomock"
 )
 
diff --git a/db/query/account.sql b/bff/db/query/account.sql
similarity index 100%
rename from db/query/account.sql
rename to bff/db/query/account.sql
diff --git a/db/query/document.sql b/bff/db/query/document.sql
similarity index 100%
rename from db/query/document.sql
rename to bff/db/query/document.sql
diff --git a/db/query/mail.sql b/bff/db/query/mail.sql
similarity index 100%
rename from db/query/mail.sql
rename to bff/db/query/mail.sql
diff --git a/db/query/payment.sql b/bff/db/query/payment.sql
similarity index 100%
rename from db/query/payment.sql
rename to bff/db/query/payment.sql
diff --git a/db/query/person.sql b/bff/db/query/person.sql
similarity index 100%
rename from db/query/person.sql
rename to bff/db/query/person.sql
diff --git a/db/query/provider.sql b/bff/db/query/provider.sql
similarity index 100%
rename from db/query/provider.sql
rename to bff/db/query/provider.sql
diff --git a/db/query/return.sql b/bff/db/query/return.sql
similarity index 100%
rename from db/query/return.sql
rename to bff/db/query/return.sql
diff --git a/db/query/returnsLog.sql b/bff/db/query/returnsLog.sql
similarity index 100%
rename from db/query/returnsLog.sql
rename to bff/db/query/returnsLog.sql
diff --git a/db/query/session.sql b/bff/db/query/session.sql
similarity index 100%
rename from db/query/session.sql
rename to bff/db/query/session.sql
diff --git a/db/sqlc/account.sql.go b/bff/db/sqlc/account.sql.go
similarity index 100%
rename from db/sqlc/account.sql.go
rename to bff/db/sqlc/account.sql.go
diff --git a/db/sqlc/account_test.go b/bff/db/sqlc/account_test.go
similarity index 99%
rename from db/sqlc/account_test.go
rename to bff/db/sqlc/account_test.go
index 4c88937..6d41a84 100644
--- a/db/sqlc/account_test.go
+++ b/bff/db/sqlc/account_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/db/sqlc/db.go b/bff/db/sqlc/db.go
similarity index 100%
rename from db/sqlc/db.go
rename to bff/db/sqlc/db.go
diff --git a/db/sqlc/document.sql.go b/bff/db/sqlc/document.sql.go
similarity index 100%
rename from db/sqlc/document.sql.go
rename to bff/db/sqlc/document.sql.go
diff --git a/db/sqlc/document_test.go b/bff/db/sqlc/document_test.go
similarity index 99%
rename from db/sqlc/document_test.go
rename to bff/db/sqlc/document_test.go
index c23b918..45f7a22 100644
--- a/db/sqlc/document_test.go
+++ b/bff/db/sqlc/document_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/db/sqlc/mail.sql.go b/bff/db/sqlc/mail.sql.go
similarity index 100%
rename from db/sqlc/mail.sql.go
rename to bff/db/sqlc/mail.sql.go
diff --git a/db/sqlc/mail_test.go b/bff/db/sqlc/mail_test.go
similarity index 98%
rename from db/sqlc/mail_test.go
rename to bff/db/sqlc/mail_test.go
index ffb2672..a8571a0 100644
--- a/db/sqlc/mail_test.go
+++ b/bff/db/sqlc/mail_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/db/sqlc/main_test.go b/bff/db/sqlc/main_test.go
similarity index 92%
rename from db/sqlc/main_test.go
rename to bff/db/sqlc/main_test.go
index 3dca1e2..24fd4c8 100644
--- a/db/sqlc/main_test.go
+++ b/bff/db/sqlc/main_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 	_ "github.com/lib/pq"
 )
 
diff --git a/db/sqlc/models.go b/bff/db/sqlc/models.go
similarity index 100%
rename from db/sqlc/models.go
rename to bff/db/sqlc/models.go
diff --git a/db/sqlc/payment.sql.go b/bff/db/sqlc/payment.sql.go
similarity index 100%
rename from db/sqlc/payment.sql.go
rename to bff/db/sqlc/payment.sql.go
diff --git a/db/sqlc/payment_test.go b/bff/db/sqlc/payment_test.go
similarity index 99%
rename from db/sqlc/payment_test.go
rename to bff/db/sqlc/payment_test.go
index ec14caa..afa8124 100644
--- a/db/sqlc/payment_test.go
+++ b/bff/db/sqlc/payment_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/db/sqlc/person.sql.go b/bff/db/sqlc/person.sql.go
similarity index 100%
rename from db/sqlc/person.sql.go
rename to bff/db/sqlc/person.sql.go
diff --git a/db/sqlc/person_test.go b/bff/db/sqlc/person_test.go
similarity index 98%
rename from db/sqlc/person_test.go
rename to bff/db/sqlc/person_test.go
index 2316764..9e999f4 100644
--- a/db/sqlc/person_test.go
+++ b/bff/db/sqlc/person_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/db/sqlc/provider.sql.go b/bff/db/sqlc/provider.sql.go
similarity index 100%
rename from db/sqlc/provider.sql.go
rename to bff/db/sqlc/provider.sql.go
diff --git a/db/sqlc/provider_test.go b/bff/db/sqlc/provider_test.go
similarity index 98%
rename from db/sqlc/provider_test.go
rename to bff/db/sqlc/provider_test.go
index b6063e6..05bd12c 100644
--- a/db/sqlc/provider_test.go
+++ b/bff/db/sqlc/provider_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/db/sqlc/querier.go b/bff/db/sqlc/querier.go
similarity index 100%
rename from db/sqlc/querier.go
rename to bff/db/sqlc/querier.go
diff --git a/db/sqlc/return.sql.go b/bff/db/sqlc/return.sql.go
similarity index 100%
rename from db/sqlc/return.sql.go
rename to bff/db/sqlc/return.sql.go
diff --git a/db/sqlc/return_test.go b/bff/db/sqlc/return_test.go
similarity index 98%
rename from db/sqlc/return_test.go
rename to bff/db/sqlc/return_test.go
index 050f9d4..019caf1 100644
--- a/db/sqlc/return_test.go
+++ b/bff/db/sqlc/return_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/db/sqlc/returnsLog.sql.go b/bff/db/sqlc/returnsLog.sql.go
similarity index 100%
rename from db/sqlc/returnsLog.sql.go
rename to bff/db/sqlc/returnsLog.sql.go
diff --git a/db/sqlc/returnsLog_test.go b/bff/db/sqlc/returnsLog_test.go
similarity index 98%
rename from db/sqlc/returnsLog_test.go
rename to bff/db/sqlc/returnsLog_test.go
index a2356aa..30beeee 100644
--- a/db/sqlc/returnsLog_test.go
+++ b/bff/db/sqlc/returnsLog_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/db/sqlc/session.sql.go b/bff/db/sqlc/session.sql.go
similarity index 100%
rename from db/sqlc/session.sql.go
rename to bff/db/sqlc/session.sql.go
diff --git a/db/sqlc/store.go b/bff/db/sqlc/store.go
similarity index 100%
rename from db/sqlc/store.go
rename to bff/db/sqlc/store.go
diff --git a/db/sqlc/tx_create_account.go b/bff/db/sqlc/tx_create_account.go
similarity index 97%
rename from db/sqlc/tx_create_account.go
rename to bff/db/sqlc/tx_create_account.go
index e3f6791..867f67c 100644
--- a/db/sqlc/tx_create_account.go
+++ b/bff/db/sqlc/tx_create_account.go
@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"time"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 )
 
 type CreateAccountTxParams struct {
diff --git a/db/sqlc/tx_update_account.go b/bff/db/sqlc/tx_update_account.go
similarity index 97%
rename from db/sqlc/tx_update_account.go
rename to bff/db/sqlc/tx_update_account.go
index 82ef979..4c3766e 100644
--- a/db/sqlc/tx_update_account.go
+++ b/bff/db/sqlc/tx_update_account.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"database/sql"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 )
 
 type UpdateAccountTxParams struct {
diff --git a/db/sqlc/tx_update_account_privacy.go b/bff/db/sqlc/tx_update_account_privacy.go
similarity index 100%
rename from db/sqlc/tx_update_account_privacy.go
rename to bff/db/sqlc/tx_update_account_privacy.go
diff --git a/development_privatekey.asc b/bff/development_privatekey.asc
similarity index 100%
rename from development_privatekey.asc
rename to bff/development_privatekey.asc
diff --git a/development_publickey.gpg b/bff/development_publickey.gpg
similarity index 100%
rename from development_publickey.gpg
rename to bff/development_publickey.gpg
diff --git a/go.mod b/bff/go.mod
similarity index 100%
rename from go.mod
rename to bff/go.mod
diff --git a/go.sum b/bff/go.sum
similarity index 100%
rename from go.sum
rename to bff/go.sum
diff --git a/main.go b/bff/main.go
similarity index 78%
rename from main.go
rename to bff/main.go
index 7f2f854..3131ab7 100644
--- a/main.go
+++ b/bff/main.go
@@ -4,14 +4,14 @@ import (
 	"database/sql"
 	"log"
 
-	"github.com/itsscb/df/api"
-	db "github.com/itsscb/df/db/sqlc"
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/api"
+	db "github.com/itsscb/df/bff/db/sqlc"
+	"github.com/itsscb/df/bff/util"
 	_ "github.com/lib/pq"
 )
 
 func main() {
-	config, err := util.LoadConfig(".")
+	config, err := util.LoadConfig("./..")
 	if err != nil {
 		log.Fatal("cannot load config:", err)
 	}
diff --git a/sqlc.yaml b/bff/sqlc.yaml
similarity index 100%
rename from sqlc.yaml
rename to bff/sqlc.yaml
diff --git a/token/main_test.go b/bff/token/main_test.go
similarity index 100%
rename from token/main_test.go
rename to bff/token/main_test.go
diff --git a/token/maker.go b/bff/token/maker.go
similarity index 100%
rename from token/maker.go
rename to bff/token/maker.go
diff --git a/token/paseto_generate_keypair.go b/bff/token/paseto_generate_keypair.go
similarity index 100%
rename from token/paseto_generate_keypair.go
rename to bff/token/paseto_generate_keypair.go
diff --git a/token/paseto_maker.go b/bff/token/paseto_maker.go
similarity index 100%
rename from token/paseto_maker.go
rename to bff/token/paseto_maker.go
diff --git a/token/paseto_maker_test.go b/bff/token/paseto_maker_test.go
similarity index 97%
rename from token/paseto_maker_test.go
rename to bff/token/paseto_maker_test.go
index 3c53aa4..2c54a22 100644
--- a/token/paseto_maker_test.go
+++ b/bff/token/paseto_maker_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/itsscb/df/util"
+	"github.com/itsscb/df/bff/util"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/token/payload.go b/bff/token/payload.go
similarity index 100%
rename from token/payload.go
rename to bff/token/payload.go
diff --git a/util/config.go b/bff/util/config.go
similarity index 100%
rename from util/config.go
rename to bff/util/config.go
diff --git a/util/password.go b/bff/util/password.go
similarity index 100%
rename from util/password.go
rename to bff/util/password.go
diff --git a/util/password_test.go b/bff/util/password_test.go
similarity index 100%
rename from util/password_test.go
rename to bff/util/password_test.go
diff --git a/util/random.go b/bff/util/random.go
similarity index 100%
rename from util/random.go
rename to bff/util/random.go