diff --git a/auth.py b/email-server/auth.py
similarity index 100%
rename from auth.py
rename to email-server/auth.py
diff --git a/cli_tools.py b/email-server/cli_tools.py
similarity index 100%
rename from cli_tools.py
rename to email-server/cli_tools.py
diff --git a/config.py b/email-server/config.py
similarity index 65%
rename from config.py
rename to email-server/config.py
index 0693714..1d8bcc4 100644
--- a/config.py
+++ b/email-server/config.py
@@ -8,7 +8,7 @@ SMTP_TLS_PORT = 40587
 HOSTNAME = 'localhost'
 
 # Database settings
-DATABASE_URL = 'sqlite:///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 = 'server.crt'
-TLS_KEY_FILE = '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/dkim_manager.py b/email-server/dkim_manager.py
similarity index 100%
rename from dkim_manager.py
rename to email-server/dkim_manager.py
diff --git a/email_relay.py b/email-server/email_relay.py
similarity index 100%
rename from email_relay.py
rename to email-server/email_relay.py
diff --git a/main.py b/email-server/main.py
similarity index 100%
rename from main.py
rename to email-server/main.py
diff --git a/models.py b/email-server/models.py
similarity index 100%
rename from models.py
rename to email-server/models.py
diff --git a/smtp_handler.py b/email-server/smtp_handler.py
similarity index 100%
rename from smtp_handler.py
rename to email-server/smtp_handler.py
diff --git a/tls_utils.py b/email-server/tls_utils.py
similarity index 100%
rename from tls_utils.py
rename to email-server/tls_utils.py
diff --git a/tests/general_cli_usage.md b/tests/general_cli_usage.md
index 47f75bf..00265a5 100644
--- a/tests/general_cli_usage.md
+++ b/tests/general_cli_usage.md
@@ -49,9 +49,6 @@ python cli_tools.py add-ip 10.0.0.50 mycompany.org        # Internal server
 python cli_tools.py add-ip 203.0.113.10 example.com       # External trusted IP
 ```
 
-# Add entire local network (if your server supports CIDR - may need modification)
-`python cli_tools.py add-ip 192.168.1.0 example.com`        # Network range
-
 # ========================================
 # DKIM KEY MANAGEMENT
 # ========================================
diff --git a/tests/run_tests_manually.md b/tests/run_tests_manually.md
index 7e61e63..ee469a0 100644
--- a/tests/run_tests_manually.md
+++ b/tests/run_tests_manually.md
@@ -1,3 +1,11 @@
+## 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
+```
 
 ## Check db logs
 `sqlite3 smtp_server.db "SELECT message_id, rcpt_tos, status FROM email_logs;"`