diff --git a/setup.py b/setup.py
index 59c2d698..266ea987 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ from typing import Dict, Iterable, List, Optional, Sequence, Set, Tuple, Union
 
 
 # This is a bit jank. We need cx-Freeze to be able to run anything from this script, so install it
-requirement = 'cx-Freeze==7.2.0'
+requirement = 'cx-Freeze==8.0.0'
 try:
     import pkg_resources
     try:
diff --git a/test/general/test_packages.py b/test/general/test_packages.py
new file mode 100644
index 00000000..32c7bdf4
--- /dev/null
+++ b/test/general/test_packages.py
@@ -0,0 +1,14 @@
+import unittest
+import os
+
+
+class TestPackages(unittest.TestCase):
+    def test_packages_have_init(self):
+        """Test that all world folders containing .py files also have a __init__.py file,
+        to indicate full package rather than namespace package."""
+        import Utils
+
+        worlds_path = Utils.local_path("worlds")
+        for dirpath, dirnames, filenames in os.walk(worlds_path):
+            with self.subTest(directory=dirpath):
+                self.assertEqual("__init__.py" in filenames, any(file.endswith(".py") for file in filenames))
diff --git a/worlds/civ_6/data/__init__.py b/worlds/civ_6/data/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/cv64/data/__init__.py b/worlds/cv64/data/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/cvcotm/data/__init__.py b/worlds/cvcotm/data/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/ffmq/data/__init__.py b/worlds/ffmq/data/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/kh2/Names/__init__.py b/worlds/kh2/Names/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/ladx/LADXR/__init__.py b/worlds/ladx/LADXR/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/ladx/LADXR/locations/__init__.py b/worlds/ladx/LADXR/locations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/ladx/LADXR/mapgen/locations/__init__.py b/worlds/ladx/LADXR/mapgen/locations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/ladx/LADXR/mapgen/roomtype/__init__.py b/worlds/ladx/LADXR/mapgen/roomtype/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/ladx/LADXR/patches/__init__.py b/worlds/ladx/LADXR/patches/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/landstalker/data/__init__.py b/worlds/landstalker/data/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/mlss/Names/__init__.py b/worlds/mlss/Names/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/mmbn3/Names/__init__.py b/worlds/mmbn3/Names/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/osrs/LogicCSV/__init__.py b/worlds/osrs/LogicCSV/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/smw/Names/__init__.py b/worlds/smw/Names/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/tww/randomizers/__init__.py b/worlds/tww/randomizers/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/worlds/witness/data/settings/__init__.py b/worlds/witness/data/settings/__init__.py
new file mode 100644
index 00000000..e69de29b