diff --git a/db/deploy/moonstreamdb.service b/db/deploy/moonstreamdb.service
deleted file mode 100644
index 17357726..00000000
--- a/db/deploy/moonstreamdb.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=moonstreamdb-service
-After=network.target
-
-[Service]
-User=ubuntu
-Group=www-data
-WorkingDirectory=/home/ubuntu/moonstream/db/server
-EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
-ExecStart=/home/ubuntu/moonstream/db/server/moonstreamdb -host 127.0.0.1 -port "${MOONSTREAM_DB_SERVER_PORT}"
-SyslogIdentifier=moonstreamdb
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/db/.dockerignore b/moonstreamdb/.dockerignore
similarity index 100%
rename from db/.dockerignore
rename to moonstreamdb/.dockerignore
diff --git a/db/.gitignore b/moonstreamdb/.gitignore
similarity index 100%
rename from db/.gitignore
rename to moonstreamdb/.gitignore
diff --git a/db/Dockerfile b/moonstreamdb/Dockerfile
similarity index 100%
rename from db/Dockerfile
rename to moonstreamdb/Dockerfile
diff --git a/db/README.md b/moonstreamdb/README.md
similarity index 100%
rename from db/README.md
rename to moonstreamdb/README.md
diff --git a/db/alembic.sh b/moonstreamdb/alembic.sh
similarity index 100%
rename from db/alembic.sh
rename to moonstreamdb/alembic.sh
diff --git a/db/alembic/README b/moonstreamdb/alembic/README
similarity index 100%
rename from db/alembic/README
rename to moonstreamdb/alembic/README
diff --git a/db/alembic/env.py b/moonstreamdb/alembic/env.py
similarity index 100%
rename from db/alembic/env.py
rename to moonstreamdb/alembic/env.py
diff --git a/db/alembic/script.py.mako b/moonstreamdb/alembic/script.py.mako
similarity index 100%
rename from db/alembic/script.py.mako
rename to moonstreamdb/alembic/script.py.mako
diff --git a/db/alembic/versions/0b46c8e17bf2_fields_for_eip_1559.py b/moonstreamdb/alembic/versions/0b46c8e17bf2_fields_for_eip_1559.py
similarity index 100%
rename from db/alembic/versions/0b46c8e17bf2_fields_for_eip_1559.py
rename to moonstreamdb/alembic/versions/0b46c8e17bf2_fields_for_eip_1559.py
diff --git a/db/alembic/versions/11233cf42d62_mumbai_model.py b/moonstreamdb/alembic/versions/11233cf42d62_mumbai_model.py
similarity index 100%
rename from db/alembic/versions/11233cf42d62_mumbai_model.py
rename to moonstreamdb/alembic/versions/11233cf42d62_mumbai_model.py
diff --git a/db/alembic/versions/21cced47077c_inital_migration.py b/moonstreamdb/alembic/versions/21cced47077c_inital_migration.py
similarity index 100%
rename from db/alembic/versions/21cced47077c_inital_migration.py
rename to moonstreamdb/alembic/versions/21cced47077c_inital_migration.py
diff --git a/db/alembic/versions/240476c67b9f_drop_ethereum_addresses_and_address_id.py b/moonstreamdb/alembic/versions/240476c67b9f_drop_ethereum_addresses_and_address_id.py
similarity index 100%
rename from db/alembic/versions/240476c67b9f_drop_ethereum_addresses_and_address_id.py
rename to moonstreamdb/alembic/versions/240476c67b9f_drop_ethereum_addresses_and_address_id.py
diff --git a/db/alembic/versions/2fa541f6f6fc_xdai_model.py b/moonstreamdb/alembic/versions/2fa541f6f6fc_xdai_model.py
similarity index 100%
rename from db/alembic/versions/2fa541f6f6fc_xdai_model.py
rename to moonstreamdb/alembic/versions/2fa541f6f6fc_xdai_model.py
diff --git a/db/alembic/versions/3d55105b0603_drop_pending_tx_table.py b/moonstreamdb/alembic/versions/3d55105b0603_drop_pending_tx_table.py
similarity index 100%
rename from db/alembic/versions/3d55105b0603_drop_pending_tx_table.py
rename to moonstreamdb/alembic/versions/3d55105b0603_drop_pending_tx_table.py
diff --git a/db/alembic/versions/40871a7807f6_labels_for_addresses.py b/moonstreamdb/alembic/versions/40871a7807f6_labels_for_addresses.py
similarity index 100%
rename from db/alembic/versions/40871a7807f6_labels_for_addresses.py
rename to moonstreamdb/alembic/versions/40871a7807f6_labels_for_addresses.py
diff --git a/db/alembic/versions/42ca451a9c33_fix_indexes.py b/moonstreamdb/alembic/versions/42ca451a9c33_fix_indexes.py
similarity index 100%
rename from db/alembic/versions/42ca451a9c33_fix_indexes.py
rename to moonstreamdb/alembic/versions/42ca451a9c33_fix_indexes.py
diff --git a/db/alembic/versions/571f33ad7587_ethereum_smart_contracts.py b/moonstreamdb/alembic/versions/571f33ad7587_ethereum_smart_contracts.py
similarity index 100%
rename from db/alembic/versions/571f33ad7587_ethereum_smart_contracts.py
rename to moonstreamdb/alembic/versions/571f33ad7587_ethereum_smart_contracts.py
diff --git a/db/alembic/versions/5f5b8f19570f_added_index_for_address_type_and_name_.py b/moonstreamdb/alembic/versions/5f5b8f19570f_added_index_for_address_type_and_name_.py
similarity index 100%
rename from db/alembic/versions/5f5b8f19570f_added_index_for_address_type_and_name_.py
rename to moonstreamdb/alembic/versions/5f5b8f19570f_added_index_for_address_type_and_name_.py
diff --git a/db/alembic/versions/72f1ad512b2e_support_labels_on_transactions.py b/moonstreamdb/alembic/versions/72f1ad512b2e_support_labels_on_transactions.py
similarity index 100%
rename from db/alembic/versions/72f1ad512b2e_support_labels_on_transactions.py
rename to moonstreamdb/alembic/versions/72f1ad512b2e_support_labels_on_transactions.py
diff --git a/db/alembic/versions/c413d5265f76_add_wyrm_chain.py b/moonstreamdb/alembic/versions/c413d5265f76_add_wyrm_chain.py
similarity index 100%
rename from db/alembic/versions/c413d5265f76_add_wyrm_chain.py
rename to moonstreamdb/alembic/versions/c413d5265f76_add_wyrm_chain.py
diff --git a/db/alembic/versions/d6ed4b1b43d5_drop_foreign_key_constraint_on_tx_hash_.py b/moonstreamdb/alembic/versions/d6ed4b1b43d5_drop_foreign_key_constraint_on_tx_hash_.py
similarity index 100%
rename from db/alembic/versions/d6ed4b1b43d5_drop_foreign_key_constraint_on_tx_hash_.py
rename to moonstreamdb/alembic/versions/d6ed4b1b43d5_drop_foreign_key_constraint_on_tx_hash_.py
diff --git a/db/alembic/versions/ea8185bd24c7_unique_const_for_addr.py b/moonstreamdb/alembic/versions/ea8185bd24c7_unique_const_for_addr.py
similarity index 100%
rename from db/alembic/versions/ea8185bd24c7_unique_const_for_addr.py
rename to moonstreamdb/alembic/versions/ea8185bd24c7_unique_const_for_addr.py
diff --git a/db/alembic/versions/ecb7817db377_add_opensea_state_table_and_add_index_.py b/moonstreamdb/alembic/versions/ecb7817db377_add_opensea_state_table_and_add_index_.py
similarity index 100%
rename from db/alembic/versions/ecb7817db377_add_opensea_state_table_and_add_index_.py
rename to moonstreamdb/alembic/versions/ecb7817db377_add_opensea_state_table_and_add_index_.py
diff --git a/db/alembic/versions/f1e8cf50a3ff_add_log_index_block_number_timestamp_.py b/moonstreamdb/alembic/versions/f1e8cf50a3ff_add_log_index_block_number_timestamp_.py
similarity index 100%
rename from db/alembic/versions/f1e8cf50a3ff_add_log_index_block_number_timestamp_.py
rename to moonstreamdb/alembic/versions/f1e8cf50a3ff_add_log_index_block_number_timestamp_.py
diff --git a/db/alembic/versions/f991fc7493c8_polygon_models.py b/moonstreamdb/alembic/versions/f991fc7493c8_polygon_models.py
similarity index 100%
rename from db/alembic/versions/f991fc7493c8_polygon_models.py
rename to moonstreamdb/alembic/versions/f991fc7493c8_polygon_models.py
diff --git a/db/configs/alembic.sample.ini b/moonstreamdb/configs/alembic.sample.ini
similarity index 100%
rename from db/configs/alembic.sample.ini
rename to moonstreamdb/configs/alembic.sample.ini
diff --git a/db/configs/docker_generate_env.bash b/moonstreamdb/configs/docker_generate_env.bash
similarity index 100%
rename from db/configs/docker_generate_env.bash
rename to moonstreamdb/configs/docker_generate_env.bash
diff --git a/db/configs/sample.env b/moonstreamdb/configs/sample.env
similarity index 100%
rename from db/configs/sample.env
rename to moonstreamdb/configs/sample.env
diff --git a/db/deploy/deploy.bash b/moonstreamdb/deploy/deploy.bash
similarity index 96%
rename from db/deploy/deploy.bash
rename to moonstreamdb/deploy/deploy.bash
index a35e87b4..cbfb9c69 100755
--- a/db/deploy/deploy.bash
+++ b/moonstreamdb/deploy/deploy.bash
@@ -4,7 +4,7 @@
 
 # Main
 APP_DIR="${APP_DIR:-/home/ubuntu/moonstream}"
-APP_DB_SERVER_DIR="${APP_DIR}/db/server"
+APP_DB_SERVER_DIR="${APP_DIR}/moonstreamdb/server"
 SECRETS_DIR="${SECRETS_DIR:-/home/ubuntu/moonstream-secrets}"
 SCRIPT_DIR="$(realpath $(dirname $0))"
 SERVICE_FILE="${SCRIPT_DIR}/moonstreamdb.service"
diff --git a/moonstreamdb/deploy/moonstreamdb.service b/moonstreamdb/deploy/moonstreamdb.service
new file mode 100644
index 00000000..db07de96
--- /dev/null
+++ b/moonstreamdb/deploy/moonstreamdb.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Moonstream DB status service
+After=network.target
+
+[Service]
+User=ubuntu
+Group=www-data
+WorkingDirectory=/home/ubuntu/moonstream/moonstreamdb/server
+EnvironmentFile=/home/ubuntu/moonstream-secrets/app.env
+ExecStart=/home/ubuntu/moonstream/moonstreamdb/server/moonstreamdb -host 127.0.0.1 -port "${MOONSTREAM_DB_SERVER_PORT}"
+SyslogIdentifier=moonstreamdb
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/db/migrate.sh b/moonstreamdb/migrate.sh
similarity index 100%
rename from db/migrate.sh
rename to moonstreamdb/migrate.sh
diff --git a/db/moonstreamdb/__init__.py b/moonstreamdb/moonstreamdb/__init__.py
similarity index 100%
rename from db/moonstreamdb/__init__.py
rename to moonstreamdb/moonstreamdb/__init__.py
diff --git a/db/moonstreamdb/blockchain.py b/moonstreamdb/moonstreamdb/blockchain.py
similarity index 100%
rename from db/moonstreamdb/blockchain.py
rename to moonstreamdb/moonstreamdb/blockchain.py
diff --git a/db/moonstreamdb/cli.py b/moonstreamdb/moonstreamdb/cli.py
similarity index 100%
rename from db/moonstreamdb/cli.py
rename to moonstreamdb/moonstreamdb/cli.py
diff --git a/db/moonstreamdb/db.py b/moonstreamdb/moonstreamdb/db.py
similarity index 100%
rename from db/moonstreamdb/db.py
rename to moonstreamdb/moonstreamdb/db.py
diff --git a/db/moonstreamdb/models.py b/moonstreamdb/moonstreamdb/models.py
similarity index 100%
rename from db/moonstreamdb/models.py
rename to moonstreamdb/moonstreamdb/models.py
diff --git a/db/moonstreamdb/networks.py b/moonstreamdb/moonstreamdb/networks.py
similarity index 100%
rename from db/moonstreamdb/networks.py
rename to moonstreamdb/moonstreamdb/networks.py
diff --git a/db/moonstreamdb/version.py b/moonstreamdb/moonstreamdb/version.py
similarity index 100%
rename from db/moonstreamdb/version.py
rename to moonstreamdb/moonstreamdb/version.py
diff --git a/db/mypy.ini b/moonstreamdb/mypy.ini
similarity index 100%
rename from db/mypy.ini
rename to moonstreamdb/mypy.ini
diff --git a/db/scm.nix b/moonstreamdb/scm.nix
similarity index 100%
rename from db/scm.nix
rename to moonstreamdb/scm.nix
diff --git a/db/scripts/f1e8cf50a3ff_add_log_index_block_number_timestamp_test.py b/moonstreamdb/scripts/f1e8cf50a3ff_add_log_index_block_number_timestamp_test.py
similarity index 100%
rename from db/scripts/f1e8cf50a3ff_add_log_index_block_number_timestamp_test.py
rename to moonstreamdb/scripts/f1e8cf50a3ff_add_log_index_block_number_timestamp_test.py
diff --git a/db/server/cmd/data.go b/moonstreamdb/server/cmd/data.go
similarity index 100%
rename from db/server/cmd/data.go
rename to moonstreamdb/server/cmd/data.go
diff --git a/db/server/cmd/db.go b/moonstreamdb/server/cmd/db.go
similarity index 100%
rename from db/server/cmd/db.go
rename to moonstreamdb/server/cmd/db.go
diff --git a/db/server/cmd/middlewares.go b/moonstreamdb/server/cmd/middlewares.go
similarity index 100%
rename from db/server/cmd/middlewares.go
rename to moonstreamdb/server/cmd/middlewares.go
diff --git a/db/server/cmd/routes.go b/moonstreamdb/server/cmd/routes.go
similarity index 100%
rename from db/server/cmd/routes.go
rename to moonstreamdb/server/cmd/routes.go
diff --git a/db/server/cmd/server.go b/moonstreamdb/server/cmd/server.go
similarity index 100%
rename from db/server/cmd/server.go
rename to moonstreamdb/server/cmd/server.go
diff --git a/db/server/configs/settings.go b/moonstreamdb/server/configs/settings.go
similarity index 100%
rename from db/server/configs/settings.go
rename to moonstreamdb/server/configs/settings.go
diff --git a/db/server/dev.sh b/moonstreamdb/server/dev.sh
similarity index 100%
rename from db/server/dev.sh
rename to moonstreamdb/server/dev.sh
diff --git a/db/server/go.mod b/moonstreamdb/server/go.mod
similarity index 100%
rename from db/server/go.mod
rename to moonstreamdb/server/go.mod
diff --git a/db/server/go.sum b/moonstreamdb/server/go.sum
similarity index 100%
rename from db/server/go.sum
rename to moonstreamdb/server/go.sum
diff --git a/db/server/main.go b/moonstreamdb/server/main.go
similarity index 100%
rename from db/server/main.go
rename to moonstreamdb/server/main.go
diff --git a/db/server/sample.env b/moonstreamdb/server/sample.env
similarity index 100%
rename from db/server/sample.env
rename to moonstreamdb/server/sample.env
diff --git a/db/setup.py b/moonstreamdb/setup.py
similarity index 100%
rename from db/setup.py
rename to moonstreamdb/setup.py
diff --git a/db/sync_conf.yml b/moonstreamdb/sync_conf.yml
similarity index 100%
rename from db/sync_conf.yml
rename to moonstreamdb/sync_conf.yml