diff --git a/test/general/TestReachability.py b/test/general/TestReachability.py
index 3f81b76a..193f2d49 100644
--- a/test/general/TestReachability.py
+++ b/test/general/TestReachability.py
@@ -2,7 +2,6 @@ import unittest
 
 from BaseClasses import CollectionState
 from worlds.AutoWorld import AutoWorldRegister
-
 from . import setup_solo_multiworld
 
 
@@ -34,25 +33,23 @@ class TestBase(unittest.TestCase):
 
     def testDefaultAllStateCanReachEverything(self):
         for game_name, world_type in AutoWorldRegister.world_types.items():
-            # Final Fantasy logic is controlled by finalfantasyrandomizer.com
-            if game_name not in {"Ori and the Blind Forest"}:  # TODO: fix Ori Logic
-                unreachable_regions = self.default_settings_unreachable_regions.get(game_name, set())
-                with self.subTest("Game", game=game_name):
-                    world = setup_solo_multiworld(world_type)
-                    excluded = world.exclude_locations[1].value
-                    state = world.get_all_state(False)
-                    for location in world.get_locations():
-                        if location.name not in excluded:
-                            with self.subTest("Location should be reached", location=location):
-                                self.assertTrue(location.can_reach(state), f"{location.name} unreachable")
+            unreachable_regions = self.default_settings_unreachable_regions.get(game_name, set())
+            with self.subTest("Game", game=game_name):
+                world = setup_solo_multiworld(world_type)
+                excluded = world.exclude_locations[1].value
+                state = world.get_all_state(False)
+                for location in world.get_locations():
+                    if location.name not in excluded:
+                        with self.subTest("Location should be reached", location=location):
+                            self.assertTrue(location.can_reach(state), f"{location.name} unreachable")
 
-                    for region in world.get_regions():
-                        if region.name not in unreachable_regions:
-                            with self.subTest("Region should be reached", region=region):
-                                self.assertTrue(region.can_reach(state))
+                for region in world.get_regions():
+                    if region.name not in unreachable_regions:
+                        with self.subTest("Region should be reached", region=region):
+                            self.assertTrue(region.can_reach(state))
 
-                    with self.subTest("Completion Condition"):
-                        self.assertTrue(world.can_beat_game(state))
+                with self.subTest("Completion Condition"):
+                    self.assertTrue(world.can_beat_game(state))
 
     def testDefaultEmptyStateCanReachSomething(self):
         for game_name, world_type in AutoWorldRegister.world_types.items():
diff --git a/worlds_disabled/README.md b/worlds_disabled/README.md
new file mode 100644
index 00000000..b891bc71
--- /dev/null
+++ b/worlds_disabled/README.md
@@ -0,0 +1,5 @@
+## Folder Purpose
+
+This folder is for already merged worlds that are unmaintained and currently broken. If you are interested in fixing and
+stepping up as maintainer for any of these worlds, please review the [world maintainer](/docs/world%20maintainer.md)
+documentation.
diff --git a/worlds/oribf/Items.py b/worlds_disabled/oribf/Items.py
similarity index 100%
rename from worlds/oribf/Items.py
rename to worlds_disabled/oribf/Items.py
diff --git a/worlds/oribf/Locations.py b/worlds_disabled/oribf/Locations.py
similarity index 100%
rename from worlds/oribf/Locations.py
rename to worlds_disabled/oribf/Locations.py
diff --git a/worlds/oribf/Options.py b/worlds_disabled/oribf/Options.py
similarity index 100%
rename from worlds/oribf/Options.py
rename to worlds_disabled/oribf/Options.py
diff --git a/worlds/oribf/Regions.py b/worlds_disabled/oribf/Regions.py
similarity index 100%
rename from worlds/oribf/Regions.py
rename to worlds_disabled/oribf/Regions.py
diff --git a/worlds/oribf/Rules.py b/worlds_disabled/oribf/Rules.py
similarity index 100%
rename from worlds/oribf/Rules.py
rename to worlds_disabled/oribf/Rules.py
diff --git a/worlds/oribf/RulesData.py b/worlds_disabled/oribf/RulesData.py
similarity index 100%
rename from worlds/oribf/RulesData.py
rename to worlds_disabled/oribf/RulesData.py
diff --git a/worlds/oribf/Types.py b/worlds_disabled/oribf/Types.py
similarity index 100%
rename from worlds/oribf/Types.py
rename to worlds_disabled/oribf/Types.py
diff --git a/worlds/oribf/__init__.py b/worlds_disabled/oribf/__init__.py
similarity index 100%
rename from worlds/oribf/__init__.py
rename to worlds_disabled/oribf/__init__.py