diff --git a/bb.edn b/bb.edn
index 2a5887e..c934f18 100644
--- a/bb.edn
+++ b/bb.edn
@@ -2,12 +2,12 @@
  :pods  {org.babashka/go-sqlite3 {:version "0.3.13"}}
  :tasks
  {test  {:doc  "Run all tests"
-         :task (do (require 'db-test 'server-test 'protocol-test)
-                   (let [{:keys [fail error]} (clojure.test/run-tests 'db-test 'server-test 'protocol-test)]
+         :task (do (require 'bitten.db-test 'bitten.server-test 'bitten.storage.protocol-test)
+                   (let [{:keys [fail error]} (clojure.test/run-tests 'bitten.db-test 'bitten.server-test 'bitten.storage.protocol-test)]
                      (System/exit (+ fail error))))}
 
   start {:doc      "Start the Bitten server (PORT and DB_PATH env vars optional)"
-         :requires ([server :as server] [sqlite :as sqlite] [storage :as storage])
+         :requires ([bitten.server :as server] [bitten.storage.sqlite :as sqlite] [bitten.storage.storage :as storage])
          :task     (let [port    (parse-long (or (System/getenv "PORT") "5432"))
                          db-path (or (System/getenv "DB_PATH") "bitten.db")
                          backend (sqlite/->SqliteBackend db-path)]
diff --git a/src/db.clj b/src/bitten/db.clj
similarity index 98%
rename from src/db.clj
rename to src/bitten/db.clj
index ad8b59f..4bb8171 100644
--- a/src/db.clj
+++ b/src/bitten/db.clj
@@ -1,5 +1,5 @@
-(ns db
-  (:require [storage]))
+(ns bitten.db
+  (:require [bitten.storage.core :as storage]))
 
 (def ->eav      (juxt :entity :attribute :value))
 (def ->full-eav (juxt :entity :attribute :value :valid-time :tx-time :tx-id :retracted))
diff --git a/src/server.clj b/src/bitten/server.clj
similarity index 95%
rename from src/server.clj
rename to src/bitten/server.clj
index d5268cb..3df42dc 100644
--- a/src/server.clj
+++ b/src/bitten/server.clj
@@ -1,7 +1,6 @@
-(ns server
-  (:require [storage]
-            [db]
-            [protocol]))
+(ns bitten.server
+  (:require [bitten.db :as db]
+            [bitten.storage.protocol :as protocol]))
 
 (defn- buffered-reader [input-stream]
   (-> input-stream java.io.InputStreamReader. java.io.BufferedReader.))
diff --git a/src/storage.clj b/src/bitten/storage/core.clj
similarity index 59%
rename from src/storage.clj
rename to src/bitten/storage/core.clj
index 8bacbb1..5efb7c3 100644
--- a/src/storage.clj
+++ b/src/bitten/storage/core.clj
@@ -1,6 +1,6 @@
-(ns storage)
+(ns bitten.storage.core)
 
 (defprotocol IStorage
   (migrate!      [backend])
   (insert-facts! [backend facts])
-  (query-as-of   [backend opts]))
+  (query-as-of   [backend opts]))
\ No newline at end of file
diff --git a/src/protocol.clj b/src/bitten/storage/protocol.clj
similarity index 88%
rename from src/protocol.clj
rename to src/bitten/storage/protocol.clj
index 7c0ebcd..f3ebc25 100644
--- a/src/protocol.clj
+++ b/src/bitten/storage/protocol.clj
@@ -1,4 +1,4 @@
-(ns protocol)
+(ns bitten.storage.protocol)
 
 (defn parse-request [line]
   (try
diff --git a/src/sqlite.clj b/src/bitten/storage/sqlite.clj
similarity index 97%
rename from src/sqlite.clj
rename to src/bitten/storage/sqlite.clj
index e6ad15f..9f85d41 100644
--- a/src/sqlite.clj
+++ b/src/bitten/storage/sqlite.clj
@@ -1,7 +1,7 @@
-(ns sqlite
+(ns bitten.storage.sqlite
   (:require [babashka.pods :as pods]
             [clojure.string :as str]
-            [storage]))
+            [bitten.storage.core :as storage]))
 
 (pods/load-pod 'org.babashka/go-sqlite3 "0.3.13")
 (require '[pod.babashka.go-sqlite3 :as sqlite-pod])
diff --git a/test/db_test.clj b/test/bitten/db_test.clj
similarity index 98%
rename from test/db_test.clj
rename to test/bitten/db_test.clj
index b3b0d17..507a934 100644
--- a/test/db_test.clj
+++ b/test/bitten/db_test.clj
@@ -1,10 +1,10 @@
-(ns db-test
+(ns bitten.db-test
   (:require [clojure.test :refer [deftest is use-fixtures]]
             [babashka.pods :as pods]
             [babashka.fs :as fs]
-            [db :as db]
-            [storage :as storage]
-            [sqlite :as sqlite-backend]))
+            [bitten.db :as db]
+            [bitten.storage.core :as storage]
+            [bitten.storage.sqlite :as sqlite-backend]))
 
 (pods/load-pod 'org.babashka/go-sqlite3 "0.3.13")
 (require '[pod.babashka.go-sqlite3 :as sql-pod])
diff --git a/test/server_test.clj b/test/bitten/server_test.clj
similarity index 95%
rename from test/server_test.clj
rename to test/bitten/server_test.clj
index d816d2c..0c667c1 100644
--- a/test/server_test.clj
+++ b/test/bitten/server_test.clj
@@ -1,11 +1,11 @@
-(ns server-test
+(ns bitten.server-test
   (:require [clojure.test :refer [deftest is]]
             [babashka.pods :as pods]
             [babashka.fs :as fs]
-            [server :as server]
-            [storage :as storage]
-            [sqlite :as sqlite-backend]
-            [db :as db]))
+            [bitten.server :as server]
+            [bitten.storage.core :as storage]
+            [bitten.storage.sqlite :as sqlite-backend]
+            [bitten.db :as db]))
 
 (pods/load-pod 'org.babashka/go-sqlite3 "0.3.13")
 
diff --git a/test/protocol_test.clj b/test/bitten/storage/protocol_test.clj
similarity index 93%
rename from test/protocol_test.clj
rename to test/bitten/storage/protocol_test.clj
index 757d48b..dbc79e0 100644
--- a/test/protocol_test.clj
+++ b/test/bitten/storage/protocol_test.clj
@@ -1,7 +1,7 @@
-(ns protocol-test
+(ns bitten.storage.protocol-test
   (:require [clojure.edn :as edn]
             [clojure.test :refer [deftest is]]
-            [protocol :as protocol]))
+            [bitten.storage.protocol :as protocol]))
 
 ;; parse-request ;;