diff --git a/collect.py b/collect.py
index cdd8ea3..2c7b05c 100644
--- a/collect.py
+++ b/collect.py
@@ -55,11 +55,9 @@ import time
 from datetime import datetime, timezone
 from pathlib import Path
 
-import log_config
-import network
-import we_connect
-from data_model import ALL_DOMAINS, collect_snapshot
-from storage_helpers import auto_out_path, load_store, save_store
+from server import log_config, network, we_connect
+from server.data_model import ALL_DOMAINS, collect_snapshot
+from server.storage_helpers import auto_out_path, load_store, save_store
 
 log = logging.getLogger(__name__)
 
diff --git a/server/__init__.py b/server/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/data_model.py b/server/data_model.py
similarity index 100%
rename from data_model.py
rename to server/data_model.py
diff --git a/log_config.py b/server/log_config.py
similarity index 100%
rename from log_config.py
rename to server/log_config.py
diff --git a/network.py b/server/network.py
similarity index 100%
rename from network.py
rename to server/network.py
diff --git a/storage_helpers.py b/server/storage_helpers.py
similarity index 100%
rename from storage_helpers.py
rename to server/storage_helpers.py
diff --git a/we_connect.py b/server/we_connect.py
similarity index 100%
rename from we_connect.py
rename to server/we_connect.py