diff --git a/main.py b/main.py
index 652cfce..e1c1442 100644
--- a/main.py
+++ b/main.py
@@ -5,15 +5,13 @@ Entry point for running Pelican or Glory device simulators.
 """
 
 import argparse
-import logging
 import sys
 
-from glory import GlorySimulator
+from loguru import logger
 
 # Import simulators
-from pelican import PelicanSimulator
-
-LOG_LEVEL = logging.DEBUG
+from source.glory import GlorySimulator
+from source.pelican import PelicanSimulator
 
 
 def main():
@@ -69,24 +67,26 @@ Examples:
 
     args = parser.parse_args()
 
-    # Setup centralized logger
-    logging.basicConfig(
-        level=LOG_LEVEL,
-        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+    # Configure loguru logger
+    logger.remove()  # Remove default handler
+    logger.add(
+        sys.stderr,
+        format=(
+            "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | "
+            "<level>{level: <8}</level> | "
+            "<level>{message}</level> "
+            "<cyan>({name}</cyan>:<cyan>{function}</cyan>:<cyan>{line})</cyan>"
+        ),
+        level="DEBUG",
     )
-    logger = logging.getLogger(f"{args.simulator}_simulator")
 
     # Run the appropriate simulator
     try:
         if args.simulator == "pelican":
-            simulator = PelicanSimulator(
-                logger=logger, port=args.port, baudrate=args.baudrate
-            )
+            simulator = PelicanSimulator(port=args.port, baudrate=args.baudrate)
             simulator.run()
         elif args.simulator == "glory":
-            simulator = GlorySimulator(
-                logger=logger, port=args.port, baudrate=args.baudrate
-            )
+            simulator = GlorySimulator(port=args.port, baudrate=args.baudrate)
             simulator.run()
     except KeyboardInterrupt:
         logger.info("Simulator stopped by user")
diff --git a/glory.py b/source/glory.py
similarity index 100%
rename from glory.py
rename to source/glory.py
diff --git a/pelican.py b/source/pelican.py
similarity index 100%
rename from pelican.py
rename to source/pelican.py