diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..e69de29
diff --git a/server/.env.local.sample b/ponder/.env.local.sample
similarity index 100%
rename from server/.env.local.sample
rename to ponder/.env.local.sample
diff --git a/server/.eslintrc.json b/ponder/.eslintrc.json
similarity index 100%
rename from server/.eslintrc.json
rename to ponder/.eslintrc.json
diff --git a/server/.github/dependabot.yml b/ponder/.github/dependabot.yml
similarity index 100%
rename from server/.github/dependabot.yml
rename to ponder/.github/dependabot.yml
diff --git a/server/.github/workflows/release.yml b/ponder/.github/workflows/release.yml
similarity index 100%
rename from server/.github/workflows/release.yml
rename to ponder/.github/workflows/release.yml
diff --git a/server/.gitignore b/ponder/.gitignore
similarity index 100%
rename from server/.gitignore
rename to ponder/.gitignore
diff --git a/server/Dockerfile b/ponder/Dockerfile
similarity index 100%
rename from server/Dockerfile
rename to ponder/Dockerfile
diff --git a/server/README.md b/ponder/README.md
similarity index 100%
rename from server/README.md
rename to ponder/README.md
diff --git a/server/abis/IMessagePort.ts b/ponder/abis/IMessagePort.ts
similarity index 100%
rename from server/abis/IMessagePort.ts
rename to ponder/abis/IMessagePort.ts
diff --git a/server/abis/ORMP.ts b/ponder/abis/ORMP.ts
similarity index 100%
rename from server/abis/ORMP.ts
rename to ponder/abis/ORMP.ts
diff --git a/server/abis/SignaturePub.ts b/ponder/abis/SignaturePub.ts
similarity index 100%
rename from server/abis/SignaturePub.ts
rename to ponder/abis/SignaturePub.ts
diff --git a/server/package.json b/ponder/package.json
similarity index 100%
rename from server/package.json
rename to ponder/package.json
diff --git a/server/ponder-env.d.ts b/ponder/ponder-env.d.ts
similarity index 100%
rename from server/ponder-env.d.ts
rename to ponder/ponder-env.d.ts
diff --git a/server/ponder.config.ts b/ponder/ponder.config.ts
similarity index 100%
rename from server/ponder.config.ts
rename to ponder/ponder.config.ts
diff --git a/server/ponder.schema.ormp.ts b/ponder/ponder.schema.ormp.ts
similarity index 100%
rename from server/ponder.schema.ormp.ts
rename to ponder/ponder.schema.ormp.ts
diff --git a/server/ponder.schema.ts b/ponder/ponder.schema.ts
similarity index 100%
rename from server/ponder.schema.ts
rename to ponder/ponder.schema.ts
diff --git a/server/src/index.ts b/ponder/src/index.ts
similarity index 100%
rename from server/src/index.ts
rename to ponder/src/index.ts
diff --git a/server/src/msgport_events_handlers.ts b/ponder/src/msgport_events_handlers.ts
similarity index 100%
rename from server/src/msgport_events_handlers.ts
rename to ponder/src/msgport_events_handlers.ts
diff --git a/server/src/ormp_events_handlers.ts b/ponder/src/ormp_events_handlers.ts
similarity index 100%
rename from server/src/ormp_events_handlers.ts
rename to ponder/src/ormp_events_handlers.ts
diff --git a/server/tsconfig.json b/ponder/tsconfig.json
similarity index 100%
rename from server/tsconfig.json
rename to ponder/tsconfig.json
diff --git a/server/yarn.lock b/ponder/yarn.lock
similarity index 100%
rename from server/yarn.lock
rename to ponder/yarn.lock
diff --git a/messages-indexer/.env.sample b/scanner/.env.sample
similarity index 100%
rename from messages-indexer/.env.sample
rename to scanner/.env.sample
diff --git a/messages-indexer/.gitignore b/scanner/.gitignore
similarity index 100%
rename from messages-indexer/.gitignore
rename to scanner/.gitignore
diff --git a/messages-indexer/Dockerfile b/scanner/Dockerfile
similarity index 100%
rename from messages-indexer/Dockerfile
rename to scanner/Dockerfile
diff --git a/messages-indexer/README.md b/scanner/README.md
similarity index 100%
rename from messages-indexer/README.md
rename to scanner/README.md
diff --git a/messages-indexer/package.json b/scanner/package.json
similarity index 100%
rename from messages-indexer/package.json
rename to scanner/package.json
diff --git a/messages-indexer/src/constants.js b/scanner/src/constants.js
similarity index 100%
rename from messages-indexer/src/constants.js
rename to scanner/src/constants.js
diff --git a/messages-indexer/src/db/db.js b/scanner/src/db/db.js
similarity index 100%
rename from messages-indexer/src/db/db.js
rename to scanner/src/db/db.js
diff --git a/messages-indexer/src/db/message.js b/scanner/src/db/message.js
similarity index 100%
rename from messages-indexer/src/db/message.js
rename to scanner/src/db/message.js
diff --git a/messages-indexer/src/db/message_recv.js b/scanner/src/db/message_recv.js
similarity index 100%
rename from messages-indexer/src/db/message_recv.js
rename to scanner/src/db/message_recv.js
diff --git a/messages-indexer/src/db/message_sent.js b/scanner/src/db/message_sent.js
similarity index 100%
rename from messages-indexer/src/db/message_sent.js
rename to scanner/src/db/message_sent.js
diff --git a/messages-indexer/src/db/ormp/message_accepted.js b/scanner/src/db/ormp/message_accepted.js
similarity index 100%
rename from messages-indexer/src/db/ormp/message_accepted.js
rename to scanner/src/db/ormp/message_accepted.js
diff --git a/messages-indexer/src/db/ormp/signature_submittion.js b/scanner/src/db/ormp/signature_submittion.js
similarity index 100%
rename from messages-indexer/src/db/ormp/signature_submittion.js
rename to scanner/src/db/ormp/signature_submittion.js
diff --git a/messages-indexer/src/db/prepare_tables.js b/scanner/src/db/prepare_tables.js
similarity index 100%
rename from messages-indexer/src/db/prepare_tables.js
rename to scanner/src/db/prepare_tables.js
diff --git a/messages-indexer/src/db/transaction.js b/scanner/src/db/transaction.js
similarity index 100%
rename from messages-indexer/src/db/transaction.js
rename to scanner/src/db/transaction.js
diff --git a/messages-indexer/src/index.js b/scanner/src/index.js
similarity index 100%
rename from messages-indexer/src/index.js
rename to scanner/src/index.js
diff --git a/messages-indexer/src/sync_messages.js b/scanner/src/sync_messages.js
similarity index 100%
rename from messages-indexer/src/sync_messages.js
rename to scanner/src/sync_messages.js
diff --git a/messages-indexer/src/sync_messages/get_new_messages.js b/scanner/src/sync_messages/get_new_messages.js
similarity index 100%
rename from messages-indexer/src/sync_messages/get_new_messages.js
rename to scanner/src/sync_messages/get_new_messages.js
diff --git a/messages-indexer/src/sync_messages/set_dispatch_result.js b/scanner/src/sync_messages/set_dispatch_result.js
similarity index 100%
rename from messages-indexer/src/sync_messages/set_dispatch_result.js
rename to scanner/src/sync_messages/set_dispatch_result.js
diff --git a/messages-indexer/src/sync_messages/set_ormp_info.js b/scanner/src/sync_messages/set_ormp_info.js
similarity index 100%
rename from messages-indexer/src/sync_messages/set_ormp_info.js
rename to scanner/src/sync_messages/set_ormp_info.js
diff --git a/messages-indexer/src/sync_messages/set_ormp_signers.js b/scanner/src/sync_messages/set_ormp_signers.js
similarity index 100%
rename from messages-indexer/src/sync_messages/set_ormp_signers.js
rename to scanner/src/sync_messages/set_ormp_signers.js
diff --git a/messages-indexer/src/utils.js b/scanner/src/utils.js
similarity index 100%
rename from messages-indexer/src/utils.js
rename to scanner/src/utils.js
diff --git a/messages-indexer/yarn.lock b/scanner/yarn.lock
similarity index 100%
rename from messages-indexer/yarn.lock
rename to scanner/yarn.lock