diff --git a/bbstools.py b/modules/bbstools.py
similarity index 100%
rename from bbstools.py
rename to modules/bbstools.py
diff --git a/bbstools_test.py b/modules/bbstools_test.py
similarity index 95%
rename from bbstools_test.py
rename to modules/bbstools_test.py
index 4c06e2a..6e125a3 100644
--- a/bbstools_test.py
+++ b/modules/bbstools_test.py
@@ -1,6 +1,6 @@
 import unittest
 from unittest import mock
-from bbstools import *
+from modules.bbstools import *
 
 class TestBBSListMessages(unittest.TestCase):
     def test_bbs_list_messages(self):
diff --git a/locationdata.py b/modules/locationdata.py
similarity index 100%
rename from locationdata.py
rename to modules/locationdata.py
diff --git a/locationdata_test.py b/modules/locationdata_test.py
similarity index 100%
rename from locationdata_test.py
rename to modules/locationdata_test.py
diff --git a/solarconditions.py b/modules/solarconditions.py
similarity index 100%
rename from solarconditions.py
rename to modules/solarconditions.py