diff --git a/src/pg_rad/dataloader.py b/src/pg_rad/dataloader/dataloader.py
similarity index 100%
rename from src/pg_rad/dataloader.py
rename to src/pg_rad/dataloader/dataloader.py
diff --git a/src/pg_rad/exceptions.py b/src/pg_rad/exceptions/exceptions.py
similarity index 100%
rename from src/pg_rad/exceptions.py
rename to src/pg_rad/exceptions/exceptions.py
diff --git a/src/pg_rad/isotope.py b/src/pg_rad/isotopes/isotope.py
similarity index 100%
rename from src/pg_rad/isotope.py
rename to src/pg_rad/isotopes/isotope.py
diff --git a/src/pg_rad/landscape.py b/src/pg_rad/landscape/landscape.py
similarity index 99%
rename from src/pg_rad/landscape.py
rename to src/pg_rad/landscape/landscape.py
index a3b3b83..fec1dfe 100644
--- a/src/pg_rad/landscape.py
+++ b/src/pg_rad/landscape/landscape.py
@@ -5,7 +5,7 @@ from matplotlib.patches import Circle
 import numpy as np
 
 from pg_rad.path import Path
-from pg_rad.sources import PointSource
+from pg_rad.objects import PointSource
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/pg_rad/logger.py b/src/pg_rad/logging/logger.py
similarity index 100%
rename from src/pg_rad/logger.py
rename to src/pg_rad/logging/logger.py
diff --git a/src/pg_rad/objects.py b/src/pg_rad/objects/objects.py
similarity index 100%
rename from src/pg_rad/objects.py
rename to src/pg_rad/objects/objects.py
diff --git a/src/pg_rad/sources.py b/src/pg_rad/objects/sources.py
similarity index 97%
rename from src/pg_rad/sources.py
rename to src/pg_rad/objects/sources.py
index 7d2d317..af57890 100644
--- a/src/pg_rad/sources.py
+++ b/src/pg_rad/objects/sources.py
@@ -1,7 +1,7 @@
 import logging
 
 from pg_rad.objects import Object
-from pg_rad.isotope import Isotope
+from pg_rad.isotopes import Isotope
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/pg_rad/path.py b/src/pg_rad/path/path.py
similarity index 100%
rename from src/pg_rad/path.py
rename to src/pg_rad/path/path.py