diff --git a/eos/db/gamedata/attribute.py b/eos/db/gamedata/attribute.py
index e09e0865b..ac2f73978 100644
--- a/eos/db/gamedata/attribute.py
+++ b/eos/db/gamedata/attribute.py
@@ -22,7 +22,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Attribute, Icon, AttributeInfo, Unit
+from eos.gamedata import Attribute, AttributeInfo, Unit, Icon
 
 typeattributes_table = Table("dgmtypeattribs", gamedata_meta,
                              Column("value", Float),
diff --git a/eos/db/gamedata/category.py b/eos/db/gamedata/category.py
index d33cce130..884f93666 100644
--- a/eos/db/gamedata/category.py
+++ b/eos/db/gamedata/category.py
@@ -21,7 +21,7 @@ from sqlalchemy import Column, String, Integer, ForeignKey, Boolean, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Category, Icon
+from eos.gamedata import Category, Icon
 
 categories_table = Table("invcategories", gamedata_meta,
                          Column("categoryID", Integer, primary_key=True),
diff --git a/eos/db/gamedata/effect.py b/eos/db/gamedata/effect.py
index 001d05162..d766b29eb 100644
--- a/eos/db/gamedata/effect.py
+++ b/eos/db/gamedata/effect.py
@@ -22,7 +22,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import mapper, synonym, relation, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Effect, EffectInfo
+from eos.gamedata import Effect, EffectInfo
 
 typeeffects_table = Table("dgmtypeeffects", gamedata_meta,
                           Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
diff --git a/eos/db/gamedata/group.py b/eos/db/gamedata/group.py
index cbf0a34d8..cd6763923 100644
--- a/eos/db/gamedata/group.py
+++ b/eos/db/gamedata/group.py
@@ -21,7 +21,7 @@ from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Group, Icon, Category
+from eos.gamedata import Category, Group, Icon
 
 groups_table = Table("invgroups", gamedata_meta,
                      Column("groupID", Integer, primary_key=True),
diff --git a/eos/db/gamedata/icon.py b/eos/db/gamedata/icon.py
index d0315b28f..396c5c582 100644
--- a/eos/db/gamedata/icon.py
+++ b/eos/db/gamedata/icon.py
@@ -21,7 +21,7 @@ from sqlalchemy import Column, String, Integer, Table
 from sqlalchemy.orm import mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Icon
+from eos.gamedata import Icon
 
 icons_table = Table("icons", gamedata_meta,
                     Column("iconID", Integer, primary_key=True),
diff --git a/eos/db/gamedata/item.py b/eos/db/gamedata/item.py
index f0100e761..1eaa15c95 100644
--- a/eos/db/gamedata/item.py
+++ b/eos/db/gamedata/item.py
@@ -23,7 +23,7 @@ from sqlalchemy.orm import relation, mapper, synonym, deferred
 from sqlalchemy.orm.collections import attribute_mapped_collection
 
 from eos.db import gamedata_meta
-from eos.types import Icon, Attribute, Item, Effect, MetaType, Group, Traits
+from eos.gamedata import Attribute, Effect, Group, Icon, Item, MetaType, Traits
 
 items_table = Table("invtypes", gamedata_meta,
                     Column("typeID", Integer, primary_key=True),
diff --git a/eos/db/gamedata/marketGroup.py b/eos/db/gamedata/marketGroup.py
index b5b631ea3..c107c486d 100644
--- a/eos/db/gamedata/marketGroup.py
+++ b/eos/db/gamedata/marketGroup.py
@@ -21,7 +21,7 @@ from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Item, MarketGroup, Icon
+from eos.gamedata import Icon, Item, MarketGroup
 
 marketgroups_table = Table("invmarketgroups", gamedata_meta,
                            Column("marketGroupID", Integer, primary_key=True),
diff --git a/eos/db/gamedata/metaData.py b/eos/db/gamedata/metaData.py
index bb23e9315..d42f46a6f 100644
--- a/eos/db/gamedata/metaData.py
+++ b/eos/db/gamedata/metaData.py
@@ -21,7 +21,7 @@ from sqlalchemy import Column, Table, String
 from sqlalchemy.orm import mapper
 
 from eos.db import gamedata_meta
-from eos.types import MetaData
+from eos.gamedata import MetaData
 
 metadata_table = Table("metadata", gamedata_meta,
                        Column("field_name", String, primary_key=True),
diff --git a/eos/db/gamedata/metaGroup.py b/eos/db/gamedata/metaGroup.py
index e5ed5c399..713e8a2c4 100644
--- a/eos/db/gamedata/metaGroup.py
+++ b/eos/db/gamedata/metaGroup.py
@@ -23,7 +23,7 @@ from sqlalchemy.orm import relation, mapper, synonym
 
 from eos.db import gamedata_meta
 from eos.db.gamedata.item import items_table
-from eos.types import MetaGroup, Item, MetaType
+from eos.gamedata import Item, MetaGroup, MetaType
 
 metagroups_table = Table("invmetagroups", gamedata_meta,
                          Column("metaGroupID", Integer, primary_key=True),
diff --git a/eos/db/gamedata/queries.py b/eos/db/gamedata/queries.py
index d449dd062..c49267050 100644
--- a/eos/db/gamedata/queries.py
+++ b/eos/db/gamedata/queries.py
@@ -21,13 +21,10 @@ from sqlalchemy.orm import join, exc
 from sqlalchemy.sql import and_, or_, select
 
 import eos.config
-# TODO: Unsure which item the code below needs :(
-# from eos.gamedata import Item
-from eos.gamedata import Attribute
 from eos.db import gamedata_session
 from eos.db.gamedata.metaGroup import metatypes_table, items_table
 from eos.db.util import processEager, processWhere
-from eos.types import Item, Category, Group, MarketGroup, AttributeInfo, MetaData, MetaGroup, AlphaClone
+from eos.gamedata import AlphaClone, Attribute, Category, Group, Item, MarketGroup, MetaGroup, AttributeInfo, MetaData
 
 configVal = getattr(eos.config, "gamedataCache", None)
 if configVal is True:
diff --git a/eos/db/gamedata/traits.py b/eos/db/gamedata/traits.py
index 1dbc4d43d..d70c6ca58 100644
--- a/eos/db/gamedata/traits.py
+++ b/eos/db/gamedata/traits.py
@@ -2,7 +2,7 @@ from sqlalchemy import Column, Table, Integer, String, ForeignKey
 from sqlalchemy.orm import mapper
 
 from eos.db import gamedata_meta
-from eos.types import Traits
+from eos.gamedata import Traits
 
 traits_table = Table("invtraits", gamedata_meta,
                      Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
diff --git a/eos/db/gamedata/unit.py b/eos/db/gamedata/unit.py
index 55594eb90..5c6556ef1 100644
--- a/eos/db/gamedata/unit.py
+++ b/eos/db/gamedata/unit.py
@@ -21,7 +21,7 @@ from sqlalchemy import Column, Table, Integer, String
 from sqlalchemy.orm import mapper, synonym
 
 from eos.db import gamedata_meta
-from eos.types import Unit
+from eos.gamedata import Unit
 
 groups_table = Table("dgmunits", gamedata_meta,
                      Column("unitID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/booster.py b/eos/db/saveddata/booster.py
index 9b8272540..11ef16506 100644
--- a/eos/db/saveddata/booster.py
+++ b/eos/db/saveddata/booster.py
@@ -22,7 +22,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import mapper, relation
 
 from eos.db import saveddata_meta
-from eos.types import Booster
+from eos.saveddata.booster import Booster
 
 boosters_table = Table("boosters", saveddata_meta,
                        Column("ID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/cargo.py b/eos/db/saveddata/cargo.py
index d4b829777..a0222ac3b 100644
--- a/eos/db/saveddata/cargo.py
+++ b/eos/db/saveddata/cargo.py
@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Cargo
+from eos.saveddata.cargo import Cargo
 
 cargo_table = Table("cargo", saveddata_meta,
                     Column("ID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/character.py b/eos/db/saveddata/character.py
index aa9a99c74..aaa8a3829 100644
--- a/eos/db/saveddata/character.py
+++ b/eos/db/saveddata/character.py
@@ -23,7 +23,9 @@ from sqlalchemy.orm import relation, mapper
 from eos.db import saveddata_meta
 from eos.db.saveddata.implant import charImplants_table
 from eos.effectHandlerHelpers import HandledImplantBoosterList
-from eos.types import Character, User, Skill, Implant
+from eos.saveddata.implant import Implant
+from eos.saveddata.user import User
+from eos.saveddata.character import Character, Skill
 
 characters_table = Table("characters", saveddata_meta,
                          Column("ID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/crest.py b/eos/db/saveddata/crest.py
index 2cbeeb44a..c5cbcbb05 100644
--- a/eos/db/saveddata/crest.py
+++ b/eos/db/saveddata/crest.py
@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, String
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import CrestChar
+from eos.saveddata.crestchar import CrestChar
 
 crest_table = Table("crest", saveddata_meta,
                     Column("ID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/damagePattern.py b/eos/db/saveddata/damagePattern.py
index a9e59f228..d31c66ea6 100644
--- a/eos/db/saveddata/damagePattern.py
+++ b/eos/db/saveddata/damagePattern.py
@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, String
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import DamagePattern
+from eos.saveddata.damagePattern import DamagePattern
 
 damagePatterns_table = Table("damagePatterns", saveddata_meta,
                              Column("ID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/drone.py b/eos/db/saveddata/drone.py
index 7163c06ff..6a5ffa8bb 100644
--- a/eos/db/saveddata/drone.py
+++ b/eos/db/saveddata/drone.py
@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Drone
+from eos.saveddata.drone import Drone
 
 drones_table = Table("drones", saveddata_meta,
                      Column("groupID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/fighter.py b/eos/db/saveddata/fighter.py
index 179edab11..bd7d8fd54 100644
--- a/eos/db/saveddata/fighter.py
+++ b/eos/db/saveddata/fighter.py
@@ -21,8 +21,9 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
 from sqlalchemy.orm import mapper, relation
 
 from eos.db import saveddata_meta
-from eos.types import Fighter, Fit
-from eos.types import FighterAbility
+from eos.saveddata.fighterAbility import FighterAbility
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.fit import Fit
 
 fighters_table = Table("fighters", saveddata_meta,
                        Column("groupID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/fit.py b/eos/db/saveddata/fit.py
index c698a4ec7..b3082d372 100644
--- a/eos/db/saveddata/fit.py
+++ b/eos/db/saveddata/fit.py
@@ -32,8 +32,17 @@ from eos.db.saveddata.implant import fitImplants_table
 from eos.db.saveddata.module import modules_table
 from eos.effectHandlerHelpers import HandledModuleList, HandledImplantBoosterList, HandledProjectedModList, \
     HandledDroneCargoList, HandledProjectedDroneList
-from eos.types import Fit as es_Fit, Module, User, Booster, Drone, Fighter, Cargo, Implant, Character, DamagePattern, \
-    TargetResists, ImplantLocation
+from eos.saveddata.implant import Implant
+from eos.saveddata.character import Character
+from eos.saveddata.user import User
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.fit import Fit as es_Fit, ImplantLocation
+from eos.saveddata.drone import Drone
+from eos.saveddata.booster import Booster
+from eos.saveddata.module import Module
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.damagePattern import DamagePattern
+from eos.saveddata.targetResists import TargetResists
 
 fits_table = Table("fits", saveddata_meta,
                    Column("ID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/implant.py b/eos/db/saveddata/implant.py
index 21145698f..c5bfc4cc5 100644
--- a/eos/db/saveddata/implant.py
+++ b/eos/db/saveddata/implant.py
@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Implant
+from eos.saveddata.implant import Implant
 
 implants_table = Table("implants", saveddata_meta,
                        Column("ID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/implantSet.py b/eos/db/saveddata/implantSet.py
index 042e986f6..955accc07 100644
--- a/eos/db/saveddata/implantSet.py
+++ b/eos/db/saveddata/implantSet.py
@@ -23,7 +23,8 @@ from sqlalchemy.orm import relation, mapper
 from eos.db import saveddata_meta
 from eos.db.saveddata.implant import implantsSetMap_table
 from eos.effectHandlerHelpers import HandledImplantBoosterList
-from eos.types import Implant, ImplantSet
+from eos.saveddata.implant import Implant
+from eos.saveddata.implantSet import ImplantSet
 
 implant_set_table = Table("implantSets", saveddata_meta,
                           Column("ID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/miscData.py b/eos/db/saveddata/miscData.py
index ac4c85b2d..2f6ceedeb 100644
--- a/eos/db/saveddata/miscData.py
+++ b/eos/db/saveddata/miscData.py
@@ -21,7 +21,7 @@ from sqlalchemy import Column, Table, String
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import MiscData
+from eos.saveddata.miscData import MiscData
 
 miscdata_table = Table("miscdata", saveddata_meta,
                        Column("fieldName", String, primary_key=True),
diff --git a/eos/db/saveddata/module.py b/eos/db/saveddata/module.py
index d6c2b068c..c5533d4ed 100644
--- a/eos/db/saveddata/module.py
+++ b/eos/db/saveddata/module.py
@@ -21,7 +21,8 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, CheckConstraint, Bool
 from sqlalchemy.orm import relation, mapper
 
 from eos.db import saveddata_meta
-from eos.types import Module, Fit
+from eos.saveddata.module import Module
+from eos.saveddata.fit import Fit
 
 modules_table = Table("modules", saveddata_meta,
                       Column("ID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/override.py b/eos/db/saveddata/override.py
index e260cd3df..2ca622966 100644
--- a/eos/db/saveddata/override.py
+++ b/eos/db/saveddata/override.py
@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, Float
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Override
+from eos.saveddata.override import Override
 
 overrides_table = Table("overrides", saveddata_meta,
                         Column("itemID", Integer, primary_key=True, index=True),
diff --git a/eos/db/saveddata/price.py b/eos/db/saveddata/price.py
index 021d341e8..2135d20cf 100644
--- a/eos/db/saveddata/price.py
+++ b/eos/db/saveddata/price.py
@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Float, Integer
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Price
+from eos.saveddata.price import Price
 
 prices_table = Table("prices", saveddata_meta,
                      Column("typeID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/queries.py b/eos/db/saveddata/queries.py
index 484ea7a45..58beb4448 100644
--- a/eos/db/saveddata/queries.py
+++ b/eos/db/saveddata/queries.py
@@ -22,8 +22,17 @@ from sqlalchemy.sql import and_
 from eos.db import saveddata_session, sd_lock
 from eos.db.saveddata.fit import projectedFits_table
 from eos.db.util import processEager, processWhere
+from eos.saveddata.price import Price
+from eos.saveddata.user import User
+from eos.saveddata.crestchar import CrestChar
+from eos.saveddata.damagePattern import DamagePattern
+from eos.saveddata.targetResists import TargetResists
+from eos.saveddata.character import Character
+from eos.saveddata.implantSet import ImplantSet
+from eos.saveddata.fit import Fit
+from eos.saveddata.miscData import MiscData
+from eos.saveddata.override import Override
 
-from eos.types import *
 import eos.config
 
 configVal = getattr(eos.config, "saveddataCache", None)
diff --git a/eos/db/saveddata/skill.py b/eos/db/saveddata/skill.py
index 1c488a2cd..5b279e0d3 100644
--- a/eos/db/saveddata/skill.py
+++ b/eos/db/saveddata/skill.py
@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Skill
+from eos.saveddata.character import Skill
 
 skills_table = Table("characterSkills", saveddata_meta,
                      Column("characterID", ForeignKey("characters.ID"), primary_key=True, index=True),
diff --git a/eos/db/saveddata/targetResists.py b/eos/db/saveddata/targetResists.py
index 88c1ca104..e8f125c5c 100644
--- a/eos/db/saveddata/targetResists.py
+++ b/eos/db/saveddata/targetResists.py
@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, Float, ForeignKey, String
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import TargetResists
+from eos.saveddata.targetResists import TargetResists
 
 targetResists_table = Table("targetResists", saveddata_meta,
                             Column("ID", Integer, primary_key=True),
diff --git a/eos/db/saveddata/user.py b/eos/db/saveddata/user.py
index f7ec10629..b4d20fa7f 100644
--- a/eos/db/saveddata/user.py
+++ b/eos/db/saveddata/user.py
@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, String, Boolean
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import User
+from eos.saveddata.user import User
 
 users_table = Table("users", saveddata_meta,
                     Column("ID", Integer, primary_key=True),
diff --git a/eos/effectHandlerHelpers.py b/eos/effectHandlerHelpers.py
index b0a61be69..7c5e87d39 100644
--- a/eos/effectHandlerHelpers.py
+++ b/eos/effectHandlerHelpers.py
@@ -19,6 +19,8 @@
 
 # from sqlalchemy.orm.attributes import flag_modified
 import logging
+# TODO: This can't point to es_Module, cyclical import loop
+# from eos.saveddata.module import Module as es_Module, State as es_State
 
 import eos.db
 
@@ -140,8 +142,11 @@ class HandledModuleList(HandledList):
             return
 
         # fix for #529, where a module may be in incorrect state after CCP changes mechanics of module
+        # TODO: This can't point to es_module, cyclical import loop
+        '''
         if not mod.isValidState(mod.state):
-            mod.state = eos.types.State.ONLINE
+            mod.state = es_State.ONLINE
+            '''
 
     def insert(self, index, mod):
         mod.position = index
@@ -162,9 +167,13 @@ class HandledModuleList(HandledList):
     def toDummy(self, index):
         mod = self[index]
         if not mod.isEmpty:
-            dummy = eos.types.Module.buildEmpty(mod.slot)
+            pass
+            # TODO: This can't point to es_Module, cyclical import loop
+            '''
+            dummy = es_Module.buildEmpty(mod.slot)
             dummy.position = index
             self[index] = dummy
+            '''
 
     def toModule(self, index, mod):
         mod.position = index
diff --git a/eos/effects/energydestabilizationnew.py b/eos/effects/energydestabilizationnew.py
index 52a6b40ee..7a45fe8b7 100644
--- a/eos/effects/energydestabilizationnew.py
+++ b/eos/effects/energydestabilizationnew.py
@@ -1,5 +1,5 @@
 # Not used by any item
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 
diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py
index e4c22c3fa..bdaaa2d3a 100644
--- a/eos/effects/energyneutralizerfalloff.py
+++ b/eos/effects/energyneutralizerfalloff.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Energy Neutralizer (51 of 51)
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 
diff --git a/eos/effects/entityenergyneutralizerfalloff.py b/eos/effects/entityenergyneutralizerfalloff.py
index a02abca12..f5aa5ead1 100644
--- a/eos/effects/entityenergyneutralizerfalloff.py
+++ b/eos/effects/entityenergyneutralizerfalloff.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Drones from group: Energy Neutralizer Drone (3 of 3)
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 
diff --git a/eos/effects/structureenergyneutralizerfalloff.py b/eos/effects/structureenergyneutralizerfalloff.py
index e383f523b..02ee9b4f8 100644
--- a/eos/effects/structureenergyneutralizerfalloff.py
+++ b/eos/effects/structureenergyneutralizerfalloff.py
@@ -1,5 +1,5 @@
 # Not used by any item
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 
diff --git a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
index 4bf33ce41..4103b3f42 100644
--- a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
@@ -1,5 +1,5 @@
 # Not used by any item
-from eos.types import State
+from eos.saveddata.module import State
 
 # Not used by any item
 runTime = "early"
diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/warpscrambleblockmwdwithnpceffect.py
index c220fb4fd..1e417b710 100644
--- a/eos/effects/warpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/warpscrambleblockmwdwithnpceffect.py
@@ -3,7 +3,7 @@
 # Used by:
 # Modules named like: Warp Scrambler (26 of 26)
 
-from eos.types import State
+from eos.saveddata.module import State
 
 runTime = "early"
 type = "projected", "active"
diff --git a/eos/graph/fitDps.py b/eos/graph/fitDps.py
index 04ef910a5..d13b742fe 100644
--- a/eos/graph/fitDps.py
+++ b/eos/graph/fitDps.py
@@ -20,7 +20,7 @@
 from math import log, sin, radians, exp
 
 from eos.graph import Graph
-from eos.types import Hardpoint, State
+from eos.saveddata.module import State, Hardpoint
 
 
 class FitDpsGraph(Graph):
diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py
index cd5e278fd..142166041 100644
--- a/eos/saveddata/character.py
+++ b/eos/saveddata/character.py
@@ -25,7 +25,6 @@ from sqlalchemy.orm import validates, reconstructor
 
 import eos
 import eos.db
-import eos.types
 from eos.effectHandlerHelpers import HandledItem, HandledImplantBoosterList
 
 logger = logging.getLogger(__name__)
diff --git a/eos/saveddata/citadel.py b/eos/saveddata/citadel.py
index 1c3c22884..6e1654028 100644
--- a/eos/saveddata/citadel.py
+++ b/eos/saveddata/citadel.py
@@ -19,7 +19,7 @@
 
 import logging
 
-from eos.types import Ship
+from eos.saveddata.ship import Ship
 
 logger = logging.getLogger(__name__)
 
diff --git a/eos/saveddata/fighter.py b/eos/saveddata/fighter.py
index 94e7e93c6..1e3e5f137 100644
--- a/eos/saveddata/fighter.py
+++ b/eos/saveddata/fighter.py
@@ -24,7 +24,8 @@ from sqlalchemy.orm import validates, reconstructor
 import eos.db
 from eos.effectHandlerHelpers import HandledItem, HandledCharge
 from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, ChargeAttrShortcut
-from eos.types import FighterAbility, Slot
+from eos.saveddata.fighterAbility import FighterAbility
+from eos.saveddata.module import Slot
 
 logger = logging.getLogger(__name__)
 
diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index 26bac09ea..38a807b8d 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -30,8 +30,10 @@ from eos import capSim
 from eos.effectHandlerHelpers import *
 from eos.effectHandlerHelpers import HandledModuleList, HandledDroneCargoList, HandledImplantBoosterList, HandledProjectedDroneList, HandledProjectedModList
 from eos.enum import Enum
-from eos.saveddata.module import State, Hardpoint
-from eos.types import Ship, Character, Slot, Module, Citadel
+from eos.saveddata.ship import Ship
+from eos.saveddata.character import Character
+from eos.saveddata.citadel import Citadel
+from eos.saveddata.module import Module, State, Slot, Hardpoint
 from utils.timer import Timer
 import logging
 
diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index d04065233..81e270cb2 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -26,7 +26,7 @@ from eos.effectHandlerHelpers import HandledItem, HandledCharge
 from eos.enum import Enum
 from eos.mathUtils import floorFloat
 from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, ChargeAttrShortcut
-from eos.types import Citadel
+from eos.saveddata.citadel import Citadel
 
 logger = logging.getLogger(__name__)
 
diff --git a/eos/types.py b/eos/types.py
deleted file mode 100644
index e6663689f..000000000
--- a/eos/types.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# ===============================================================================
-# Copyright (C) 2010 Diego Duclos
-#
-# This file is part of eos.
-#
-# eos is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# eos is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with eos.  If not, see <http://www.gnu.org/licenses/>.
-# ===============================================================================
-
-from eos.gamedata import Attribute, Category, Effect, Group, Icon, Item, MarketGroup, \
-    MetaGroup, AttributeInfo, Unit, EffectInfo, MetaType, MetaData, Traits, AlphaClone, \
-    AlphaCloneSkill
-from eos.saveddata.price import Price
-from eos.saveddata.user import User
-from eos.saveddata.crestchar import CrestChar
-from eos.saveddata.damagePattern import DamagePattern
-from eos.saveddata.targetResists import TargetResists
-from eos.saveddata.character import Character, Skill
-from eos.saveddata.ship import Ship
-from eos.saveddata.citadel import Citadel
-from eos.saveddata.module import Module, State, Slot, Hardpoint, Rack
-from eos.saveddata.drone import Drone
-from eos.saveddata.fighterAbility import FighterAbility
-from eos.saveddata.fighter import Fighter
-from eos.saveddata.cargo import Cargo
-from eos.saveddata.implant import Implant
-from eos.saveddata.implantSet import ImplantSet
-# Legacy booster side effect code, disabling as not currently implemented
-# from eos.saveddata.booster import SideEffect
-from eos.saveddata.booster import Booster
-from eos.saveddata.fit import Fit, ImplantLocation
-from eos.saveddata.mode import Mode
-from eos.saveddata.miscData import MiscData
-from eos.saveddata.override import Override
-
-import eos.db
diff --git a/gui/builtinContextMenus/amount.py b/gui/builtinContextMenus/amount.py
index a4984a635..54662f58d 100644
--- a/gui/builtinContextMenus/amount.py
+++ b/gui/builtinContextMenus/amount.py
@@ -1,5 +1,5 @@
 from gui.contextMenu import ContextMenu
-import eos.types
+from eos.saveddata.fit import Fit as es_Fit
 import gui.mainFrame
 import gui.globalEvents as GE
 import wx
@@ -60,7 +60,7 @@ class AmountChanger(wx.Dialog):
 
         if isinstance(self.thing, es_Cargo):
             sFit.addCargo(fitID, self.thing.item.ID, int(float(self.input.GetLineText(0))), replace=True)
-        elif isinstance(self.thing, eos.types.Fit):
+        elif isinstance(self.thing, es_Fit):
             sFit.changeAmount(fitID, self.thing, int(float(self.input.GetLineText(0))))
         elif isinstance(self.thing, es_Fighter):
             sFit.changeActiveFighters(fitID, self.thing, int(float(self.input.GetLineText(0))))
diff --git a/gui/builtinContextMenus/changeAffectingSkills.py b/gui/builtinContextMenus/changeAffectingSkills.py
index 79b7bd3bd..cc2d99055 100644
--- a/gui/builtinContextMenus/changeAffectingSkills.py
+++ b/gui/builtinContextMenus/changeAffectingSkills.py
@@ -3,7 +3,7 @@ from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import wx
 from gui.bitmapLoader import BitmapLoader
-from eos.types import Skill
+from eos.saveddata.character import Skill
 import gui.globalEvents as GE
 from service.fit import Fit
 from service.character import Character
diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py
index e69aac4cd..ba7b7cfc1 100644
--- a/gui/builtinContextMenus/moduleAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleAmmoPicker.py
@@ -4,7 +4,7 @@ import wx
 
 from service.fit import Fit
 from service.market import Market
-from eos.types import Hardpoint
+from eos.saveddata.module import Hardpoint
 import gui.mainFrame
 import gui.globalEvents as GE
 from gui.contextMenu import ContextMenu
diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py
index 39bb0b62a..05c187661 100644
--- a/gui/builtinStatsViews/resourcesViewFull.py
+++ b/gui/builtinStatsViews/resourcesViewFull.py
@@ -24,7 +24,7 @@ from gui import pygauge as PG
 import gui.mainFrame
 import gui.chromeTabs
 
-from eos.types import Hardpoint
+from eos.saveddata.module import Hardpoint
 
 from gui.utils.numberFormatter import formatAmount
 
diff --git a/gui/builtinViewColumns/abilities.py b/gui/builtinViewColumns/abilities.py
index e42a2eed3..5198743b0 100644
--- a/gui/builtinViewColumns/abilities.py
+++ b/gui/builtinViewColumns/abilities.py
@@ -19,7 +19,7 @@
 
 
 import wx
-from eos.types import Fighter
+from eos.saveddata.fighter import Fighter
 from gui.viewColumn import ViewColumn
 import gui.mainFrame
 
diff --git a/gui/builtinViewColumns/ammo.py b/gui/builtinViewColumns/ammo.py
index 4cd6a0ba7..14bb4e3ba 100644
--- a/gui/builtinViewColumns/ammo.py
+++ b/gui/builtinViewColumns/ammo.py
@@ -18,7 +18,7 @@
 # =============================================================================
 
 import wx
-from eos.types import Fighter
+from eos.saveddata.fighter import Fighter
 from gui.viewColumn import ViewColumn
 from gui.bitmapLoader import BitmapLoader
 
diff --git a/gui/builtinViewColumns/ammoIcon.py b/gui/builtinViewColumns/ammoIcon.py
index f4f6f7af1..8c532dd32 100644
--- a/gui/builtinViewColumns/ammoIcon.py
+++ b/gui/builtinViewColumns/ammoIcon.py
@@ -19,7 +19,7 @@
 
 from gui.viewColumn import ViewColumn
 import wx
-from eos.types import Module
+from eos.saveddata.module import Module
 
 
 class AmmoIcon(ViewColumn):
diff --git a/gui/builtinViewColumns/baseIcon.py b/gui/builtinViewColumns/baseIcon.py
index 7f9b16296..32eca9c61 100644
--- a/gui/builtinViewColumns/baseIcon.py
+++ b/gui/builtinViewColumns/baseIcon.py
@@ -1,5 +1,8 @@
 import wx
-from eos.types import Drone, Fit, Module, Slot, Rack, Implant
+from eos.saveddata.implant import Implant
+from eos.saveddata.drone import Drone
+from eos.saveddata.module import Module, Slot, Rack
+from eos.saveddata.fit import Fit
 from gui.viewColumn import ViewColumn
 
 
diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py
index 973219b2c..38f400ee4 100644
--- a/gui/builtinViewColumns/baseName.py
+++ b/gui/builtinViewColumns/baseName.py
@@ -19,7 +19,11 @@
 # =============================================================================
 
 import wx
-from eos.types import Drone, Cargo, Module, Slot, Rack, Implant, Fighter
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.implant import Implant
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.module import Module, Slot, Rack
 from service.fit import Fit
 from gui.viewColumn import ViewColumn
 import gui.mainFrame
diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py
index 692911400..b6a65c58d 100644
--- a/gui/builtinViewColumns/capacitorUse.py
+++ b/gui/builtinViewColumns/capacitorUse.py
@@ -19,7 +19,7 @@
 
 import wx
 
-from eos.types import Mode
+from eos.saveddata.mode import Mode
 from service.attribute import Attribute
 from gui.utils.numberFormatter import formatAmount
 from gui.viewColumn import ViewColumn
diff --git a/gui/builtinViewColumns/maxRange.py b/gui/builtinViewColumns/maxRange.py
index ea26d4d67..95fd3d931 100644
--- a/gui/builtinViewColumns/maxRange.py
+++ b/gui/builtinViewColumns/maxRange.py
@@ -19,7 +19,7 @@
 
 import wx
 
-from eos.types import Mode
+from eos.saveddata.mode import Mode
 from service.attribute import Attribute
 from gui.viewColumn import ViewColumn
 from gui.bitmapLoader import BitmapLoader
diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py
index 68ad87e1e..c916c54c1 100644
--- a/gui/builtinViewColumns/price.py
+++ b/gui/builtinViewColumns/price.py
@@ -19,7 +19,8 @@
 
 import wx
 
-from eos.types import Drone, Cargo
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.drone import Drone
 from service.market import Market
 from gui.viewColumn import ViewColumn
 from gui.bitmapLoader import BitmapLoader
diff --git a/gui/builtinViewColumns/state.py b/gui/builtinViewColumns/state.py
index 920562087..0a139eca3 100644
--- a/gui/builtinViewColumns/state.py
+++ b/gui/builtinViewColumns/state.py
@@ -20,8 +20,10 @@
 
 import wx
 
-from eos.types import Drone, Module, Rack, Fit, Implant
-from eos.types import State as State_
+from eos.saveddata.fit import Fit
+from eos.saveddata.implant import Implant
+from eos.saveddata.drone import Drone
+from eos.saveddata.module import Module, State as State_, Rack
 from gui.viewColumn import ViewColumn
 
 import gui.mainFrame
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index 3260ab116..fc59fac13 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -25,7 +25,8 @@ import gui.display as d
 from gui.contextMenu import ContextMenu
 import gui.shipBrowser
 import gui.multiSwitch
-from eos.types import Slot, Rack, Module, Mode
+from eos.saveddata.mode import Mode
+from eos.saveddata.module import Module, Slot, Rack
 from gui.builtinViewColumns.state import State
 from gui.bitmapLoader import BitmapLoader
 import gui.builtinViews.emptyView
diff --git a/gui/crestFittings.py b/gui/crestFittings.py
index 6b62f3d5e..13aafb0d3 100644
--- a/gui/crestFittings.py
+++ b/gui/crestFittings.py
@@ -7,7 +7,7 @@ import requests
 from service.port import Port
 from service.fit import Fit
 
-from eos.types import Cargo
+from eos.saveddata.cargo import Cargo
 from eos.db import getItem
 
 import gui.display as d
diff --git a/gui/fighterView.py b/gui/fighterView.py
index 083901460..59e2e8ae2 100644
--- a/gui/fighterView.py
+++ b/gui/fighterView.py
@@ -24,7 +24,7 @@ import gui.marketBrowser as mb
 import gui.mainFrame
 import gui.display as d
 from gui.builtinViewColumns.state import State
-from eos.types import Slot
+from eos.saveddata.module import Slot
 from gui.contextMenu import ContextMenu
 from service.fit import Fit
 from service.market import Market
diff --git a/gui/implantView.py b/gui/implantView.py
index 3de27f1bc..88211f381 100644
--- a/gui/implantView.py
+++ b/gui/implantView.py
@@ -24,7 +24,7 @@ import gui.mainFrame
 from gui.builtinViewColumns.state import State
 from gui.contextMenu import ContextMenu
 import globalEvents as GE
-from eos.types import ImplantLocation
+from eos.saveddata.fit import ImplantLocation
 from service.fit import Fit
 from service.market import Market
 
diff --git a/gui/itemStats.py b/gui/itemStats.py
index 97adfb32d..9942ba41e 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -28,7 +28,16 @@ import wx.html
 import wx.lib.mixins.listctrl as listmix
 
 import config
-from eos.types import Fit, Ship, Citadel, Module, Skill, Booster, Implant, Drone, Mode, Fighter
+from eos.saveddata.mode import Mode
+from eos.saveddata.character import Skill
+from eos.saveddata.implant import Implant
+from eos.saveddata.booster import Booster
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.module import Module
+from eos.saveddata.ship import Ship
+from eos.saveddata.citadel import Citadel
+from eos.saveddata.fit import Fit
 from service.market import Market
 from service.attribute import Attribute
 import gui.mainFrame
diff --git a/service/crest.py b/service/crest.py
index 74c74d311..6ce59040e 100644
--- a/service/crest.py
+++ b/service/crest.py
@@ -8,7 +8,7 @@ import time
 
 import eos.db
 from eos.enum import Enum
-from eos.types import CrestChar
+from eos.saveddata.crestchar import CrestChar
 import gui.globalEvents as GE
 from service.settings import CRESTSettings
 from service.server import StoppableHTTPServer, AuthHandler
diff --git a/service/fit.py b/service/fit.py
index c8c97baf5..5a345c4c7 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -29,9 +29,9 @@ from eos.saveddata.damagePattern import DamagePattern as es_DamagePattern
 from eos.saveddata.drone import Drone as es_Drone
 from eos.saveddata.fighter import Fighter as es_Fighter
 from eos.saveddata.implant import Implant as es_Implant
-from eos.saveddata.module import Module as es_Module
 from eos.saveddata.ship import Ship as es_Ship
-from eos.types import State, Slot, Fit as FitType
+from eos.saveddata.module import Module as es_Module, State, Slot
+from eos.saveddata.fit import Fit as FitType
 from service.character import Character
 from service.damagePattern import DamagePattern
 from service.market import Market
diff --git a/service/market.py b/service/market.py
index 6edb3d432..d4519bdb3 100644
--- a/service/market.py
+++ b/service/market.py
@@ -31,11 +31,9 @@ from service import conversions
 from service.settings import SettingsProvider
 from service.price import Price
 
-# TODO: Convert eos.types over to eos.gamedata
-# from eos.gamedata import Category as e_Category, Group as e_Group, Item as e_Item
-
-from eos.types import MarketGroup as types_MarketGroup, MetaGroup as types_MetaGroup, MetaType as types_MetaType, \
-    Category as types_Category, Item as types_Item, Group as types_Group, Price as types_Price
+from eos.gamedata import Category as types_Category, Group as types_Group, Item as types_Item, MarketGroup as types_MarketGroup, \
+    MetaGroup as types_MetaGroup, MetaType as types_MetaType
+from eos.saveddata.price import Price as types_Price
 
 try:
     from collections import OrderedDict
diff --git a/service/port.py b/service/port.py
index c64293c1b..efc9f1c14 100644
--- a/service/port.py
+++ b/service/port.py
@@ -34,9 +34,17 @@ from eos import db
 from service.fit import Fit as svcFit
 
 import wx
-from service.market import Market
 
-from eos.types import State, Slot, Module, Cargo, Ship, Drone, Implant, Booster, Citadel, Fighter, Fit
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.implant import Implant
+from eos.saveddata.booster import Booster
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.module import Module, State, Slot
+from eos.saveddata.ship import Ship
+from eos.saveddata.citadel import Citadel
+from eos.saveddata.fit import Fit
+from service.market import Market
 
 if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)):
     from service.crest import Crest