diff --git a/docs/Running-this-software.md b/docs/Running-this-software.md
index 80cc46c..8911eea 100644
--- a/docs/Running-this-software.md
+++ b/docs/Running-this-software.md
@@ -391,7 +391,7 @@ this application directly from the source:
 
 ```
 cd <eddn files>/src
-python EDDN_Gateway.py --config <full path to config.json>
+python -m eddn.Gateway --config <full path to config.json>
 ```
 
 Check the `systemd/eddn_<environment>_config` files for the location of
diff --git a/src/EDDN_Bouncer.py b/src/eddn/Bouncer.py
similarity index 100%
rename from src/EDDN_Bouncer.py
rename to src/eddn/Bouncer.py
diff --git a/src/EDDN_Gateway.py b/src/eddn/Gateway.py
similarity index 100%
rename from src/EDDN_Gateway.py
rename to src/eddn/Gateway.py
diff --git a/src/EDDN_Monitor.py b/src/eddn/Monitor.py
similarity index 100%
rename from src/EDDN_Monitor.py
rename to src/eddn/Monitor.py
diff --git a/src/EDDN_Relay.py b/src/eddn/Relay.py
similarity index 100%
rename from src/EDDN_Relay.py
rename to src/eddn/Relay.py