diff --git a/events/__init__.py b/events/__init__.py
index c6d7081..ffd5749 100644
--- a/events/__init__.py
+++ b/events/__init__.py
@@ -1,4 +1,4 @@
-from mech_factory.components import Area, AreaStatus, ItemStatus, OuterAmor, Zone
+from mech_factory.component_storage import Area, AreaStatus, ItemStatus, OuterAmor, Zone
 
 
 class StrikeEvent:
diff --git a/hangar/mech.py b/hangar/mech.py
index b2843ee..f9c6e8e 100644
--- a/hangar/mech.py
+++ b/hangar/mech.py
@@ -1,5 +1,5 @@
 from events import CriticalStrikeEvent, StrikeEvent
-from mech_factory.components import InnerStructure, Item, ZoneNames
+from mech_factory.component_storage import InnerStructure, Item, ZoneNames
 
 
 class Mech(object):
diff --git a/mech_factory/__init__.py b/mech_factory/__init__.py
index 3a8e19e..dead883 100755
--- a/mech_factory/__init__.py
+++ b/mech_factory/__init__.py
@@ -1,6 +1,6 @@
 from hangar.mech import Mech
-from mech_factory.components import InnerStructure, Area, AreaNames, OuterAmor, ZoneNames
-from mech_factory.components.items import Activator, Cockpit, Gyroskope, Joint, Reaktor, Sensors, Sustainment
+from mech_factory.component_storage import InnerStructure, Area, AreaNames, OuterAmor, ZoneNames
+from mech_factory.component_storage.items import Activator, Cockpit, Gyroskope, Joint, Reaktor, Sensors, Sustainment
 from mech_factory.reader import ComponentReader
 
 
diff --git a/mech_factory/components/__init__.py b/mech_factory/component_storage/__init__.py
similarity index 96%
rename from mech_factory/components/__init__.py
rename to mech_factory/component_storage/__init__.py
index a6683b8..1b214fd 100755
--- a/mech_factory/components/__init__.py
+++ b/mech_factory/component_storage/__init__.py
@@ -1,6 +1,6 @@
 import enum
 
-from mech_factory.components.items import Gyroskope, Item, ItemStatus
+from mech_factory.component_storage.items import Gyroskope, Item, ItemStatus
 
 
 class ZoneNames(enum.Enum):
diff --git a/mech_factory/components/items.py b/mech_factory/component_storage/items.py
similarity index 100%
rename from mech_factory/components/items.py
rename to mech_factory/component_storage/items.py
diff --git a/tests/test_mech/__init__.py b/tests/test_mech/__init__.py
index c689273..5e89f07 100644
--- a/tests/test_mech/__init__.py
+++ b/tests/test_mech/__init__.py
@@ -1,7 +1,7 @@
 import unittest
 
 from mech_factory import MechFabrik
-from mech_factory.components import AreaNames, ZoneNames
+from mech_factory.component_storage import AreaNames, ZoneNames
 
 INNER_ARMOR = {
         AreaNames.HEAD:         3,
diff --git a/tests/test_mech_bau.py b/tests/test_mech_bau.py
index b985a0d..e1fe1d5 100755
--- a/tests/test_mech_bau.py
+++ b/tests/test_mech_bau.py
@@ -2,8 +2,8 @@ import unittest
 
 from hangar.mech import Mech
 from mech_factory import MechFabrik
-from mech_factory.components import InnerStructure, AreaNames, Area, OuterAmor, Zone, ZoneNames
-from mech_factory.components.items import Cockpit, Gyroskope, Item, ItemTypes, Reaktor
+from mech_factory.component_storage import InnerStructure, AreaNames, Area, OuterAmor, Zone, ZoneNames
+from mech_factory.component_storage.items import Cockpit, Gyroskope, Item, ItemTypes, Reaktor
 from test_mech import AbstractTestMechAmor, INNER_ARMOR, OUTER_ARMOR
 
 
diff --git a/tests/test_mech_process.py b/tests/test_mech_process.py
index 669a554..92a61a1 100755
--- a/tests/test_mech_process.py
+++ b/tests/test_mech_process.py
@@ -1,7 +1,7 @@
 from events import CriticalStrikeEvent, StrikeEvent
-from mech_factory.components.items import BigItem, DurableItem, Item, ItemStatus, ItemTypes
+from mech_factory.component_storage.items import BigItem, DurableItem, Item, ItemStatus, ItemTypes
 from test_mech import AbstractTestMechAmor, INNER_ARMOR, NEXT_OUTER_ZONE, OUTER_ARMOR
-from mech_factory.components import Area, AreaStatus, OuterAmor, ZoneNames
+from mech_factory.component_storage import Area, AreaStatus, OuterAmor, ZoneNames
 
 
 class TestMechAmor(AbstractTestMechAmor):