diff --git a/email-server/auth.py b/email_server/auth.py
similarity index 100%
rename from email-server/auth.py
rename to email_server/auth.py
diff --git a/email-server/cli_tools.py b/email_server/cli_tools.py
similarity index 100%
rename from email-server/cli_tools.py
rename to email_server/cli_tools.py
diff --git a/email-server/config.py b/email_server/config.py
similarity index 65%
rename from email-server/config.py
rename to email_server/config.py
index 1d8bcc4..2930122 100644
--- a/email-server/config.py
+++ b/email_server/config.py
@@ -8,7 +8,7 @@ SMTP_TLS_PORT = 40587
 HOSTNAME = 'localhost'
 
 # Database settings
-DATABASE_URL = 'sqlite:///email-server/server_data/smtp_server.db'
+DATABASE_URL = 'sqlite:///email_server/server_data/smtp_server.db'
 
 # Logging settings
 LOG_LEVEL = 'INFO'
@@ -17,8 +17,8 @@ LOG_LEVEL = 'INFO'
 RELAY_TIMEOUT = 10
 
 # TLS settings
-TLS_CERT_FILE = 'email-server/ssl_certs/server.crt'
-TLS_KEY_FILE = 'email-server/ssl_certs/server.key'
+TLS_CERT_FILE = 'email_server/ssl_certs/server.crt'
+TLS_KEY_FILE = 'email_server/ssl_certs/server.key'
 
 # DKIM settings
 DKIM_SELECTOR = 'default'
diff --git a/email-server/dkim_manager.py b/email_server/dkim_manager.py
similarity index 100%
rename from email-server/dkim_manager.py
rename to email_server/dkim_manager.py
diff --git a/email-server/email_relay.py b/email_server/email_relay.py
similarity index 100%
rename from email-server/email_relay.py
rename to email_server/email_relay.py
diff --git a/email-server/main.py b/email_server/main.py
similarity index 100%
rename from email-server/main.py
rename to email_server/main.py
diff --git a/email-server/models.py b/email_server/models.py
similarity index 100%
rename from email-server/models.py
rename to email_server/models.py
diff --git a/email-server/smtp_handler.py b/email_server/smtp_handler.py
similarity index 100%
rename from email-server/smtp_handler.py
rename to email_server/smtp_handler.py
diff --git a/email-server/tls_utils.py b/email_server/tls_utils.py
similarity index 100%
rename from email-server/tls_utils.py
rename to email_server/tls_utils.py
diff --git a/tests/run_tests_manually.md b/tests/run_tests_manually.md
index ee469a0..c5ff3a5 100644
--- a/tests/run_tests_manually.md
+++ b/tests/run_tests_manually.md
@@ -1,10 +1,10 @@
 ## setup domain and account for sending email:
 ```bash
-python email-server/cli_tools.py add-domain example.com
-python email-server/cli_tools.py add-user test@example.com testpass123 example.com
-python email-server/cli_tools.py add-ip 127.0.0.1 example.com 
-python email-server/cli_tools.py add-ip 10.100.111.1 example.com 
-python email-server/cli_tools.py generate-dkim example.com
+python email_server/cli_tools.py add-domain example.com
+python email_server/cli_tools.py add-user test@example.com testpass123 example.com
+python email_server/cli_tools.py add-ip 127.0.0.1 example.com 
+python email_server/cli_tools.py add-ip 10.100.111.1 example.com 
+python email_server/cli_tools.py generate-dkim example.com
 ```
 
 ## Check db logs
diff --git a/tests/test_debug_db.py b/tests/test_debug_db.py
index 394fb90..f028cd0 100644
--- a/tests/test_debug_db.py
+++ b/tests/test_debug_db.py
@@ -34,7 +34,7 @@ except Exception as e:
 
 # Test SQLAlchemy models
 try:
-    from models import Session, Domain, User, WhitelistedIP, create_tables
+    from email_server.models import Session, Domain, User, WhitelistedIP, create_tables
     print("Models imported successfully")
     
     # Create session