diff --git a/gui/fitCommands/calc/cargo/__init__.py b/gui/fitCommands/calc/cargo/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/gui/fitCommands/calc/fitAddCargo.py b/gui/fitCommands/calc/cargo/add.py
similarity index 95%
rename from gui/fitCommands/calc/fitAddCargo.py
rename to gui/fitCommands/calc/cargo/add.py
index 91c1a5705..71a973ad0 100644
--- a/gui/fitCommands/calc/fitAddCargo.py
+++ b/gui/fitCommands/calc/cargo/add.py
@@ -35,6 +35,6 @@ class FitAddCargoCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing addition of cargo {} to fit {}'.format(self.cargoInfo, self.fitID))
-        from .fitRemoveCargo import FitRemoveCargoCommand
+        from .remove import FitRemoveCargoCommand
         cmd = FitRemoveCargoCommand(fitID=self.fitID, cargoInfo=self.cargoInfo)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitChangeCargoAmount.py b/gui/fitCommands/calc/cargo/changeAmount.py
similarity index 100%
rename from gui/fitCommands/calc/fitChangeCargoAmount.py
rename to gui/fitCommands/calc/cargo/changeAmount.py
diff --git a/gui/fitCommands/calc/fitRemoveCargo.py b/gui/fitCommands/calc/cargo/remove.py
similarity index 94%
rename from gui/fitCommands/calc/fitRemoveCargo.py
rename to gui/fitCommands/calc/cargo/remove.py
index a5df34fca..d457f6fda 100644
--- a/gui/fitCommands/calc/fitRemoveCargo.py
+++ b/gui/fitCommands/calc/cargo/remove.py
@@ -32,6 +32,6 @@ class FitRemoveCargoCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing removal of cargo {} to fit {}'.format(self.cargoInfo, self.fitID))
-        from gui.fitCommands.calc.fitAddCargo import FitAddCargoCommand
+        from .add import FitAddCargoCommand
         cmd = FitAddCargoCommand(fitID=self.fitID, cargoInfo=CargoInfo(itemID=self.cargoInfo.itemID, amount=self.savedRemovedAmount))
         return cmd.Do()
diff --git a/gui/fitCommands/calc/commandFit/__init__.py b/gui/fitCommands/calc/commandFit/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/gui/fitCommands/calc/fitAddCommand.py b/gui/fitCommands/calc/commandFit/add.py
similarity index 97%
rename from gui/fitCommands/calc/fitAddCommand.py
rename to gui/fitCommands/calc/commandFit/add.py
index 4137d62f8..2388f2e18 100644
--- a/gui/fitCommands/calc/fitAddCommand.py
+++ b/gui/fitCommands/calc/commandFit/add.py
@@ -54,6 +54,6 @@ class FitAddCommandCommand(wx.Command):
         commandFit = Fit.getInstance().getFit(self.commandFitID)
         if commandFit is None:
             return True
-        from .fitRemoveCommand import FitRemoveCommandCommand
+        from .remove import FitRemoveCommandCommand
         cmd = FitRemoveCommandCommand(fitID=self.fitID, commandFitID=self.commandFitID)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitRemoveCommand.py b/gui/fitCommands/calc/commandFit/remove.py
similarity index 96%
rename from gui/fitCommands/calc/fitRemoveCommand.py
rename to gui/fitCommands/calc/commandFit/remove.py
index 75c5d6b6c..1d45c11de 100644
--- a/gui/fitCommands/calc/fitRemoveCommand.py
+++ b/gui/fitCommands/calc/commandFit/remove.py
@@ -38,6 +38,6 @@ class FitRemoveCommandCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing removal of command fit {} for fit {}'.format(self.commandFitID, self.fitID))
-        from .fitAddCommand import FitAddCommandCommand
+        from .add import FitAddCommandCommand
         cmd = FitAddCommandCommand(fitID=self.fitID, commandFitID=self.commandFitID, state=self.savedState)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitToggleCommandFit.py b/gui/fitCommands/calc/commandFit/toggleState.py
similarity index 100%
rename from gui/fitCommands/calc/fitToggleCommandFit.py
rename to gui/fitCommands/calc/commandFit/toggleState.py
diff --git a/gui/fitCommands/calc/drone/__init__.py b/gui/fitCommands/calc/drone/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/gui/fitCommands/calc/fitAddDrone.py b/gui/fitCommands/calc/drone/localAdd.py
similarity index 97%
rename from gui/fitCommands/calc/fitAddDrone.py
rename to gui/fitCommands/calc/drone/localAdd.py
index 29e893ca4..76201ca4d 100644
--- a/gui/fitCommands/calc/fitAddDrone.py
+++ b/gui/fitCommands/calc/drone/localAdd.py
@@ -62,6 +62,6 @@ class FitAddDroneCommand(wx.Command):
             drone.amount = self.savedDroneInfo.amount
             drone.amountActive = self.savedDroneInfo.amountActive
             return True
-        from .fitRemoveDrone import FitRemoveDroneCommand
+        from .localRemove import FitRemoveDroneCommand
         cmd = FitRemoveDroneCommand(fitID=self.fitID, position=self.savedPosition, amount=self.droneInfo.amount)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitChangeDroneAmount.py b/gui/fitCommands/calc/drone/localChangeAmount.py
similarity index 100%
rename from gui/fitCommands/calc/fitChangeDroneAmount.py
rename to gui/fitCommands/calc/drone/localChangeAmount.py
diff --git a/gui/fitCommands/calc/fitRemoveDrone.py b/gui/fitCommands/calc/drone/localRemove.py
similarity index 100%
rename from gui/fitCommands/calc/fitRemoveDrone.py
rename to gui/fitCommands/calc/drone/localRemove.py
diff --git a/gui/fitCommands/calc/fitToggleDrone.py b/gui/fitCommands/calc/drone/localToggleState.py
similarity index 100%
rename from gui/fitCommands/calc/fitToggleDrone.py
rename to gui/fitCommands/calc/drone/localToggleState.py
diff --git a/gui/fitCommands/calc/fitAddProjectedDrone.py b/gui/fitCommands/calc/drone/projectedAdd.py
similarity index 97%
rename from gui/fitCommands/calc/fitAddProjectedDrone.py
rename to gui/fitCommands/calc/drone/projectedAdd.py
index bfb4a7af3..abd45a107 100644
--- a/gui/fitCommands/calc/fitAddProjectedDrone.py
+++ b/gui/fitCommands/calc/drone/projectedAdd.py
@@ -61,6 +61,6 @@ class FitAddProjectedDroneCommand(wx.Command):
             drone.amountActive = self.savedDroneInfo.amountActive
             return True
         # Removing new stack
-        from .fitRemoveProjectedDrone import FitRemoveProjectedDroneCommand
+        from .projectedRemove import FitRemoveProjectedDroneCommand
         cmd = FitRemoveProjectedDroneCommand(fitID=self.fitID, droneInfo=self.droneInfo)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitChangeProjectedDroneAmount.py b/gui/fitCommands/calc/drone/projectedChangeAmount.py
similarity index 100%
rename from gui/fitCommands/calc/fitChangeProjectedDroneAmount.py
rename to gui/fitCommands/calc/drone/projectedChangeAmount.py
diff --git a/gui/fitCommands/calc/fitRemoveProjectedDrone.py b/gui/fitCommands/calc/drone/projectedRemove.py
similarity index 96%
rename from gui/fitCommands/calc/fitRemoveProjectedDrone.py
rename to gui/fitCommands/calc/drone/projectedRemove.py
index db7ba6648..020f25284 100644
--- a/gui/fitCommands/calc/fitRemoveProjectedDrone.py
+++ b/gui/fitCommands/calc/drone/projectedRemove.py
@@ -45,6 +45,6 @@ class FitRemoveProjectedDroneCommand(wx.Command):
             drone.amountActive = self.savedDroneInfo.amountActive
             return True
         # Make new stack
-        from .fitAddProjectedDrone import FitAddProjectedDroneCommand
+        from .projectedAdd import FitAddProjectedDroneCommand
         cmd = FitAddProjectedDroneCommand(fitID=self.fitID, droneInfo=self.savedDroneInfo)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitToggleProjectedDrone.py b/gui/fitCommands/calc/drone/projectedToggleState.py
similarity index 89%
rename from gui/fitCommands/calc/fitToggleProjectedDrone.py
rename to gui/fitCommands/calc/drone/projectedToggleState.py
index a1548c619..fb942e8d5 100644
--- a/gui/fitCommands/calc/fitToggleProjectedDrone.py
+++ b/gui/fitCommands/calc/drone/projectedToggleState.py
@@ -8,7 +8,7 @@ from service.fit import Fit
 pyfalog = Logger(__name__)
 
 
-class FitToggleProjectedDroneCommand(wx.Command):
+class FitToggleProjectedDroneStateCommand(wx.Command):
 
     def __init__(self, fitID, itemID, forceAmountActive=None):
         wx.Command.__init__(self, True, 'Toggle Projected Drone State')
@@ -42,5 +42,5 @@ class FitToggleProjectedDroneCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing toggling of projected drone {} state for fit {}'.format(self.itemID, self.fitID))
-        cmd = FitToggleProjectedDroneCommand(fitID=self.fitID, itemID=self.itemID, forceAmountActive=self.savedAmountActive)
+        cmd = FitToggleProjectedDroneStateCommand(fitID=self.fitID, itemID=self.itemID, forceAmountActive=self.savedAmountActive)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fighter/__init__.py b/gui/fitCommands/calc/fighter/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/gui/fitCommands/calc/fitToggleFighterAbility.py b/gui/fitCommands/calc/fighter/abilityToggle.py
similarity index 100%
rename from gui/fitCommands/calc/fitToggleFighterAbility.py
rename to gui/fitCommands/calc/fighter/abilityToggle.py
diff --git a/gui/fitCommands/calc/fitAddFighter.py b/gui/fitCommands/calc/fighter/localAdd.py
similarity index 97%
rename from gui/fitCommands/calc/fitAddFighter.py
rename to gui/fitCommands/calc/fighter/localAdd.py
index 055d9416f..759646c6b 100644
--- a/gui/fitCommands/calc/fitAddFighter.py
+++ b/gui/fitCommands/calc/fighter/localAdd.py
@@ -58,7 +58,7 @@ class FitAddFighterCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing addition of fighter {} to fit {}'.format(self.fighterInfo, self.fitID))
-        from .fitRemoveFighter import FitRemoveFighterCommand
+        from .localRemove import FitRemoveFighterCommand
         cmd = FitRemoveFighterCommand(fitID=self.fitID, position=self.position)
         cmd.Do()
         return True
diff --git a/gui/fitCommands/calc/fitChangeFighterAmount.py b/gui/fitCommands/calc/fighter/localChangeAmount.py
similarity index 100%
rename from gui/fitCommands/calc/fitChangeFighterAmount.py
rename to gui/fitCommands/calc/fighter/localChangeAmount.py
diff --git a/gui/fitCommands/calc/fitRemoveFighter.py b/gui/fitCommands/calc/fighter/localRemove.py
similarity index 93%
rename from gui/fitCommands/calc/fitRemoveFighter.py
rename to gui/fitCommands/calc/fighter/localRemove.py
index 8eac0dc65..5aae65939 100644
--- a/gui/fitCommands/calc/fitRemoveFighter.py
+++ b/gui/fitCommands/calc/fighter/localRemove.py
@@ -28,6 +28,6 @@ class FitRemoveFighterCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing removal of fighter at position {} from fit {}'.format(self.position, self.fitID))
-        from gui.fitCommands.calc.fitAddFighter import FitAddFighterCommand
+        from .localAdd import FitAddFighterCommand
         cmd = FitAddFighterCommand(fitID=self.fitID, fighterInfo=self.savedFighterInfo, position=self.position)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitToggleFighter.py b/gui/fitCommands/calc/fighter/localToggleState.py
similarity index 100%
rename from gui/fitCommands/calc/fitToggleFighter.py
rename to gui/fitCommands/calc/fighter/localToggleState.py
diff --git a/gui/fitCommands/calc/fitAddProjectedFighter.py b/gui/fitCommands/calc/fighter/projectedAdd.py
similarity index 94%
rename from gui/fitCommands/calc/fitAddProjectedFighter.py
rename to gui/fitCommands/calc/fighter/projectedAdd.py
index dc812ab44..2596615be 100644
--- a/gui/fitCommands/calc/fitAddProjectedFighter.py
+++ b/gui/fitCommands/calc/fighter/projectedAdd.py
@@ -41,6 +41,6 @@ class FitAddProjectedFighterCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing addition of projected fighter {} onto: {}'.format(self.fighterInfo, self.fitID))
-        from .fitRemoveProjectedFighter import FitRemoveProjectedFighterCommand
+        from .projectedRemove import FitRemoveProjectedFighterCommand
         cmd = FitRemoveProjectedFighterCommand(fitID=self.fitID, position=self.position)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitChangeProjectedFighterAmount.py b/gui/fitCommands/calc/fighter/projectedChangeAmount.py
similarity index 100%
rename from gui/fitCommands/calc/fitChangeProjectedFighterAmount.py
rename to gui/fitCommands/calc/fighter/projectedChangeAmount.py
diff --git a/gui/fitCommands/calc/fitRemoveProjectedFighter.py b/gui/fitCommands/calc/fighter/projectedRemove.py
similarity index 93%
rename from gui/fitCommands/calc/fitRemoveProjectedFighter.py
rename to gui/fitCommands/calc/fighter/projectedRemove.py
index 349619263..07950d051 100644
--- a/gui/fitCommands/calc/fitRemoveProjectedFighter.py
+++ b/gui/fitCommands/calc/fighter/projectedRemove.py
@@ -28,6 +28,6 @@ class FitRemoveProjectedFighterCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing removal of projected fighter at position {} from fit {}'.format(self.position, self.fitID))
-        from .fitAddProjectedFighter import FitAddProjectedFighterCommand
+        from .projectedAdd import FitAddProjectedFighterCommand
         cmd = FitAddProjectedFighterCommand(fitID=self.fitID, fighterInfo=self.savedFighterInfo)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitToggleProjectedFighter.py b/gui/fitCommands/calc/fighter/projectedToggleState.py
similarity index 100%
rename from gui/fitCommands/calc/fitToggleProjectedFighter.py
rename to gui/fitCommands/calc/fighter/projectedToggleState.py
diff --git a/gui/fitCommands/calc/implant/add.py b/gui/fitCommands/calc/implant/add.py
index fa440bb9d..49b7483a2 100644
--- a/gui/fitCommands/calc/implant/add.py
+++ b/gui/fitCommands/calc/implant/add.py
@@ -58,6 +58,6 @@ class FitAddImplantCommand(wx.Command):
         if self.oldImplantInfo and self.oldPosition:
             cmd = FitAddImplantCommand(fitID=self.fitID, implantInfo=self.oldImplantInfo, position=self.oldPosition)
             return cmd.Do()
-        from .fitRemoveImplant import FitRemoveImplantCommand
+        from .remove import FitRemoveImplantCommand
         cmd = FitRemoveImplantCommand(fitID=self.fitID, position=self.newPosition)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitRebaseItem.py b/gui/fitCommands/calc/itemRebase.py
similarity index 100%
rename from gui/fitCommands/calc/fitRebaseItem.py
rename to gui/fitCommands/calc/itemRebase.py
diff --git a/gui/fitCommands/calc/module/__init__.py b/gui/fitCommands/calc/module/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/gui/fitCommands/calc/fitChangeModuleCharges.py b/gui/fitCommands/calc/module/changeCharges.py
similarity index 100%
rename from gui/fitCommands/calc/fitChangeModuleCharges.py
rename to gui/fitCommands/calc/module/changeCharges.py
diff --git a/gui/fitCommands/calc/fitChangeModuleSpoolup.py b/gui/fitCommands/calc/module/changeSpool.py
similarity index 91%
rename from gui/fitCommands/calc/fitChangeModuleSpoolup.py
rename to gui/fitCommands/calc/module/changeSpool.py
index 216fcfa92..33d8757fa 100644
--- a/gui/fitCommands/calc/fitChangeModuleSpoolup.py
+++ b/gui/fitCommands/calc/module/changeSpool.py
@@ -8,10 +8,10 @@ from service.fit import Fit
 pyfalog = Logger(__name__)
 
 
-class FitChangeModuleSpoolupCommand(wx.Command):
+class FitChangeModuleSpoolCommand(wx.Command):
 
     def __init__(self, fitID, position, spoolType, spoolAmount, projected=False):
-        wx.Command.__init__(self, True, 'Change Module Spoolup')
+        wx.Command.__init__(self, True, 'Change Module Spool')
         self.fitID = fitID
         self.position = position
         self.spoolType = spoolType
@@ -39,7 +39,7 @@ class FitChangeModuleSpoolupCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing change of module spoolup at position {} to {} type {} amount on fit {}'.format(self.position, self.spoolType, self.spoolAmount, self.fitID))
-        cmd = FitChangeModuleSpoolupCommand(
+        cmd = FitChangeModuleSpoolCommand(
             fitID=self.fitID,
             position=self.position,
             spoolType=self.savedSpoolType,
diff --git a/gui/fitCommands/calc/fitAddModule.py b/gui/fitCommands/calc/module/localAdd.py
similarity index 94%
rename from gui/fitCommands/calc/fitAddModule.py
rename to gui/fitCommands/calc/module/localAdd.py
index 2ec073853..ee103aa5b 100644
--- a/gui/fitCommands/calc/fitAddModule.py
+++ b/gui/fitCommands/calc/module/localAdd.py
@@ -32,7 +32,7 @@ class FitAddModuleCommand(wx.Command):
         if newMod.item.category.name == 'Subsystem':
             for oldMod in fit.modules:
                 if oldMod.getModifiedItemAttr('subSystemSlot') == newMod.getModifiedItemAttr('subSystemSlot') and newMod.slot == oldMod.slot:
-                    from .fitReplaceModule import FitReplaceModuleCommand
+                    from .localReplace import FitReplaceModuleCommand
                     self.subsystemCmd = FitReplaceModuleCommand(fitID=self.fitID, position=oldMod.modPosition, newModInfo=self.newModInfo)
                     return self.subsystemCmd.Do()
 
@@ -57,7 +57,7 @@ class FitAddModuleCommand(wx.Command):
         # We added a subsystem module, which actually ran the replace command. Run the undo for that guy instead
         if self.subsystemCmd is not None:
             return self.subsystemCmd.Undo()
-        from .fitRemoveModule import FitRemoveModuleCommand
+        from .localRemove import FitRemoveModuleCommand
         if self.savedPosition is None:
             return False
         cmd = FitRemoveModuleCommand(fitID=self.fitID, positions=[self.savedPosition])
diff --git a/gui/fitCommands/calc/fitChangeModuleStates.py b/gui/fitCommands/calc/module/localChangeStates.py
similarity index 96%
rename from gui/fitCommands/calc/fitChangeModuleStates.py
rename to gui/fitCommands/calc/module/localChangeStates.py
index 791311e46..4941d388f 100644
--- a/gui/fitCommands/calc/fitChangeModuleStates.py
+++ b/gui/fitCommands/calc/module/localChangeStates.py
@@ -42,8 +42,6 @@ class FitChangeModuleStatesCommand(wx.Command):
                 if proposedState != mod.state:
                     pyfalog.debug('Toggle {} state: {} for fit ID: {}'.format(mod, proposedState, self.fitID))
                 mod.state = proposedState
-
-        # if we haven't change the state (eg, overheat -> overheat), simply fail the command
         if not changed:
             return False
         eos.db.commit()
diff --git a/gui/fitCommands/calc/fitCloneModule.py b/gui/fitCommands/calc/module/localClone.py
similarity index 96%
rename from gui/fitCommands/calc/fitCloneModule.py
rename to gui/fitCommands/calc/module/localClone.py
index 0f19b674b..0261671e5 100644
--- a/gui/fitCommands/calc/fitCloneModule.py
+++ b/gui/fitCommands/calc/module/localClone.py
@@ -43,6 +43,6 @@ class FitCloneModuleCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing cloning from position {} to position {} for fit ID {}'.format(self.srcPosition, self.dstPosition, self.fitID))
-        from .fitRemoveModule import FitRemoveModuleCommand
+        from .localRemove import FitRemoveModuleCommand
         cmd = FitRemoveModuleCommand(fitID=self.fitID, positions=[self.dstPosition])
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitRemoveModule.py b/gui/fitCommands/calc/module/localRemove.py
similarity index 94%
rename from gui/fitCommands/calc/fitRemoveModule.py
rename to gui/fitCommands/calc/module/localRemove.py
index 960a7014e..6ce2e2918 100644
--- a/gui/fitCommands/calc/fitRemoveModule.py
+++ b/gui/fitCommands/calc/module/localRemove.py
@@ -37,7 +37,7 @@ class FitRemoveModuleCommand(wx.Command):
     def Undo(self):
         pyfalog.debug('Undoing removal of modules {} on fit {}'.format(self.savedModInfos, self.fitID))
         results = []
-        from gui.fitCommands.calc.fitReplaceModule import FitReplaceModuleCommand
+        from .localReplace import FitReplaceModuleCommand
         for position, modInfo in self.savedModInfos.items():
             cmd = FitReplaceModuleCommand(fitID=self.fitID, position=position, newModInfo=modInfo)
             results.append(cmd.Do())
diff --git a/gui/fitCommands/calc/fitReplaceModule.py b/gui/fitCommands/calc/module/localReplace.py
similarity index 96%
rename from gui/fitCommands/calc/fitReplaceModule.py
rename to gui/fitCommands/calc/module/localReplace.py
index 60c48e740..c71bad116 100644
--- a/gui/fitCommands/calc/fitReplaceModule.py
+++ b/gui/fitCommands/calc/module/localReplace.py
@@ -52,7 +52,7 @@ class FitReplaceModuleCommand(wx.Command):
         pyfalog.debug('Undoing replacement of module at position {} to {} on fit {}'.format(self.newModInfo, self.position, self.fitID))
         # Remove if there was no module
         if self.oldModInfo is None:
-            from gui.fitCommands.calc.fitRemoveModule import FitRemoveModuleCommand
+            from .localRemove import FitRemoveModuleCommand
             cmd = FitRemoveModuleCommand(fitID=self.fitID, positions=[self.position])
             return cmd.Do()
         # Replace if there was
diff --git a/gui/fitCommands/calc/fitSwapModule.py b/gui/fitCommands/calc/module/localSwap.py
similarity index 100%
rename from gui/fitCommands/calc/fitSwapModule.py
rename to gui/fitCommands/calc/module/localSwap.py
diff --git a/gui/fitCommands/calc/fitAddProjectedModule.py b/gui/fitCommands/calc/module/projectedAdd.py
similarity index 95%
rename from gui/fitCommands/calc/fitAddProjectedModule.py
rename to gui/fitCommands/calc/module/projectedAdd.py
index 401335387..93c2a4f95 100644
--- a/gui/fitCommands/calc/fitAddProjectedModule.py
+++ b/gui/fitCommands/calc/module/projectedAdd.py
@@ -54,6 +54,6 @@ class FitAddProjectedModuleCommand(wx.Command):
         if self.oldPosition is not None and self.oldModInfo is not None:
             cmd = FitAddProjectedModuleCommand(fitID=self.fitID, modInfo=self.oldModInfo, position=self.oldPosition)
             return cmd.Do()
-        from gui.fitCommands.calc.fitRemoveProjectedModule import FitRemoveProjectedModuleCommand
+        from .projectedRemove import FitRemoveProjectedModuleCommand
         cmd = FitRemoveProjectedModuleCommand(self.fitID, self.newPosition)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitChangeProjectedModuleState.py b/gui/fitCommands/calc/module/projectedChangeState.py
similarity index 100%
rename from gui/fitCommands/calc/fitChangeProjectedModuleState.py
rename to gui/fitCommands/calc/module/projectedChangeState.py
diff --git a/gui/fitCommands/calc/fitRemoveProjectedModule.py b/gui/fitCommands/calc/module/projectedRemove.py
similarity index 91%
rename from gui/fitCommands/calc/fitRemoveProjectedModule.py
rename to gui/fitCommands/calc/module/projectedRemove.py
index 6908c4fe5..b31543228 100644
--- a/gui/fitCommands/calc/fitRemoveProjectedModule.py
+++ b/gui/fitCommands/calc/module/projectedRemove.py
@@ -28,6 +28,6 @@ class FitRemoveProjectedModuleCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing removal of projected module {} on fit {}'.format(self.savedModInfo, self.fitID))
-        from gui.fitCommands.calc.fitAddProjectedModule import FitAddProjectedModuleCommand
+        from .projectedAdd import FitAddProjectedModuleCommand
         cmd = FitAddProjectedModuleCommand(fitID=self.fitID, modInfo=self.savedModInfo, position=self.position)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/projectedFit/__init__.py b/gui/fitCommands/calc/projectedFit/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/gui/fitCommands/calc/fitAddProjectedFit.py b/gui/fitCommands/calc/projectedFit/add.py
similarity index 96%
rename from gui/fitCommands/calc/fitAddProjectedFit.py
rename to gui/fitCommands/calc/projectedFit/add.py
index 85312c8b4..0595f45bc 100644
--- a/gui/fitCommands/calc/fitAddProjectedFit.py
+++ b/gui/fitCommands/calc/projectedFit/add.py
@@ -54,6 +54,6 @@ class FitAddProjectedFitCommand(wx.Command):
         projectedFit = Fit.getInstance().getFit(self.projectedFitID)
         if projectedFit is None:
             return True
-        from .fitRemoveProjectedFit import FitRemoveProjectedFitCommand
+        from .remove import FitRemoveProjectedFitCommand
         cmd = FitRemoveProjectedFitCommand(fitID=self.fitID, projectedFitID=self.projectedFitID)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitChangeProjectedFitAmount.py b/gui/fitCommands/calc/projectedFit/changeAmount.py
similarity index 100%
rename from gui/fitCommands/calc/fitChangeProjectedFitAmount.py
rename to gui/fitCommands/calc/projectedFit/changeAmount.py
diff --git a/gui/fitCommands/calc/fitRemoveProjectedFit.py b/gui/fitCommands/calc/projectedFit/remove.py
similarity index 95%
rename from gui/fitCommands/calc/fitRemoveProjectedFit.py
rename to gui/fitCommands/calc/projectedFit/remove.py
index c7212ccd6..63d89a502 100644
--- a/gui/fitCommands/calc/fitRemoveProjectedFit.py
+++ b/gui/fitCommands/calc/projectedFit/remove.py
@@ -38,6 +38,6 @@ class FitRemoveProjectedFitCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing removal of projected fit {} for fit {}'.format(self.projectedFitID, self.fitID))
-        from .fitAddProjectedFit import FitAddProjectedFitCommand
+        from .add import FitAddProjectedFitCommand
         cmd = FitAddProjectedFitCommand(fitID=self.fitID, projectedFitID=self.projectedFitID, state=self.savedState)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitToggleProjectedFit.py b/gui/fitCommands/calc/projectedFit/toggleState.py
similarity index 100%
rename from gui/fitCommands/calc/fitToggleProjectedFit.py
rename to gui/fitCommands/calc/projectedFit/toggleState.py
diff --git a/gui/fitCommands/calc/fitChangeMode.py b/gui/fitCommands/calc/shipModeChange.py
similarity index 88%
rename from gui/fitCommands/calc/fitChangeMode.py
rename to gui/fitCommands/calc/shipModeChange.py
index d815f79d6..0cf009416 100644
--- a/gui/fitCommands/calc/fitChangeMode.py
+++ b/gui/fitCommands/calc/shipModeChange.py
@@ -10,7 +10,7 @@ from service.market import Market
 pyfalog = Logger(__name__)
 
 
-class FitChangeModeCommand(wx.Command):
+class FitChangeShipModeCommand(wx.Command):
 
     def __init__(self, fitID, itemID):
         wx.Command.__init__(self, True, 'Set Mode')
@@ -30,5 +30,5 @@ class FitChangeModeCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing changing mode to {} for fit {}'.format(self.itemID, self.fitID))
-        cmd = FitChangeModeCommand(self.fitID, self.savedItemID)
+        cmd = FitChangeShipModeCommand(self.fitID, self.savedItemID)
         return cmd.Do()
diff --git a/gui/fitCommands/guiAddCargo.py b/gui/fitCommands/guiAddCargo.py
index 124da502f..042d256ab 100644
--- a/gui/fitCommands/guiAddCargo.py
+++ b/gui/fitCommands/guiAddCargo.py
@@ -4,7 +4,7 @@ from service.fit import Fit
 import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import CargoInfo
-from .calc.fitAddCargo import FitAddCargoCommand
+from .calc.cargo.add import FitAddCargoCommand
 
 
 class GuiAddCargoCommand(wx.Command):
diff --git a/gui/fitCommands/guiAddCharge.py b/gui/fitCommands/guiAddCharge.py
index feba85cd9..850b79aae 100644
--- a/gui/fitCommands/guiAddCharge.py
+++ b/gui/fitCommands/guiAddCharge.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeModuleCharges import FitChangeModuleChargesCommand
+from .calc.module.changeCharges import FitChangeModuleChargesCommand
 
 
 class GuiModuleAddChargeCommand(wx.Command):
diff --git a/gui/fitCommands/guiAddCommand.py b/gui/fitCommands/guiAddCommand.py
index 958f57378..73bb2eabe 100644
--- a/gui/fitCommands/guiAddCommand.py
+++ b/gui/fitCommands/guiAddCommand.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitAddCommand import FitAddCommandCommand
+from .calc.commandFit.add import FitAddCommandCommand
 
 
 class GuiAddCommandCommand(wx.Command):
diff --git a/gui/fitCommands/guiAddDrone.py b/gui/fitCommands/guiAddDrone.py
index 9e02bcd4a..48ae4d7ec 100644
--- a/gui/fitCommands/guiAddDrone.py
+++ b/gui/fitCommands/guiAddDrone.py
@@ -4,7 +4,7 @@ from service.fit import Fit
 import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import DroneInfo
-from .calc.fitAddDrone import FitAddDroneCommand
+from .calc.drone.localAdd import FitAddDroneCommand
 
 
 class GuiAddDroneCommand(wx.Command):
diff --git a/gui/fitCommands/guiAddFighter.py b/gui/fitCommands/guiAddFighter.py
index 5ffa88f4d..6991ddfee 100644
--- a/gui/fitCommands/guiAddFighter.py
+++ b/gui/fitCommands/guiAddFighter.py
@@ -4,7 +4,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import FighterInfo
 from service.fit import Fit
-from .calc.fitAddFighter import FitAddFighterCommand
+from .calc.fighter.localAdd import FitAddFighterCommand
 
 
 class GuiAddFighterCommand(wx.Command):
diff --git a/gui/fitCommands/guiAddModule.py b/gui/fitCommands/guiAddModule.py
index 22a5d00d1..ff4fb0906 100644
--- a/gui/fitCommands/guiAddModule.py
+++ b/gui/fitCommands/guiAddModule.py
@@ -6,9 +6,9 @@ from service.market import Market
 from service.fit import Fit
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import ModuleInfo
-from .calc.fitAddModule import FitAddModuleCommand
-from .calc.fitReplaceModule import FitReplaceModuleCommand
-from .calc.fitChangeModuleCharges import FitChangeModuleChargesCommand
+from .calc.module.localAdd import FitAddModuleCommand
+from .calc.module.localReplace import FitReplaceModuleCommand
+from .calc.module.changeCharges import FitChangeModuleChargesCommand
 
 
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/guiAddProjected.py b/gui/fitCommands/guiAddProjected.py
index 5f54c8177..f41978be4 100644
--- a/gui/fitCommands/guiAddProjected.py
+++ b/gui/fitCommands/guiAddProjected.py
@@ -4,10 +4,10 @@ from service.fit import Fit
 import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import ModuleInfo, DroneInfo, FighterInfo
-from .calc.fitAddProjectedModule import FitAddProjectedModuleCommand
-from .calc.fitAddProjectedFit import FitAddProjectedFitCommand
-from .calc.fitAddProjectedFighter import FitAddProjectedFighterCommand
-from .calc.fitAddProjectedDrone import FitAddProjectedDroneCommand
+from .calc.module.projectedAdd import FitAddProjectedModuleCommand
+from .calc.projectedFit.add import FitAddProjectedFitCommand
+from .calc.fighter.projectedAdd import FitAddProjectedFighterCommand
+from .calc.drone.projectedAdd import FitAddProjectedDroneCommand
 from logbook import Logger
 import eos.db
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/guiCargoToModule.py b/gui/fitCommands/guiCargoToModule.py
index 1c7020daa..ed131b5eb 100644
--- a/gui/fitCommands/guiCargoToModule.py
+++ b/gui/fitCommands/guiCargoToModule.py
@@ -3,11 +3,11 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calc.fitChangeModuleCharges import FitChangeModuleChargesCommand
-from gui.fitCommands.calc.fitReplaceModule import FitReplaceModuleCommand
-from gui.fitCommands.calc.fitRemoveCargo import FitRemoveCargoCommand
+from gui.fitCommands.calc.module.changeCharges import FitChangeModuleChargesCommand
+from gui.fitCommands.calc.module.localReplace import FitReplaceModuleCommand
+from gui.fitCommands.calc.cargo.remove import FitRemoveCargoCommand
 from gui.fitCommands.helpers import ModuleInfo
-from .calc.fitAddCargo import FitAddCargoCommand
+from .calc.cargo.add import FitAddCargoCommand
 from logbook import Logger
 pyfalog = Logger(__name__)
 
diff --git a/gui/fitCommands/guiChangeCargoQty.py b/gui/fitCommands/guiChangeCargoQty.py
index 9aa439000..4955df7a4 100644
--- a/gui/fitCommands/guiChangeCargoQty.py
+++ b/gui/fitCommands/guiChangeCargoQty.py
@@ -1,7 +1,7 @@
 import wx
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeCargoAmount import FitChangeCargoAmountCommand
+from .calc.cargo.changeAmount import FitChangeCargoAmountCommand
 from service.fit import Fit
 from gui.fitCommands.helpers import CargoInfo
 from logbook import Logger
diff --git a/gui/fitCommands/guiChangeDroneQty.py b/gui/fitCommands/guiChangeDroneQty.py
index abb1f10ab..2e603b012 100644
--- a/gui/fitCommands/guiChangeDroneQty.py
+++ b/gui/fitCommands/guiChangeDroneQty.py
@@ -1,7 +1,7 @@
 import wx
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeDroneAmount import FitChangeDroneAmountCommand
+from .calc.drone.localChangeAmount import FitChangeDroneAmountCommand
 from service.fit import Fit
 from logbook import Logger
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/guiChangeFighterQty.py b/gui/fitCommands/guiChangeFighterQty.py
index 7ef6556bd..bbcfca07c 100644
--- a/gui/fitCommands/guiChangeFighterQty.py
+++ b/gui/fitCommands/guiChangeFighterQty.py
@@ -1,7 +1,7 @@
 import wx
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeFighterAmount import FitChangeFighterAmountCommand
+from .calc.fighter.localChangeAmount import FitChangeFighterAmountCommand
 from service.fit import Fit
 from logbook import Logger
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/guiChangeProjectedDroneQty.py b/gui/fitCommands/guiChangeProjectedDroneQty.py
index 0af8b9170..5b53f46e5 100644
--- a/gui/fitCommands/guiChangeProjectedDroneQty.py
+++ b/gui/fitCommands/guiChangeProjectedDroneQty.py
@@ -1,7 +1,7 @@
 import wx
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeProjectedDroneAmount import FitChangeProjectedDroneAmountCommand
+from .calc.drone.projectedChangeAmount import FitChangeProjectedDroneAmountCommand
 from service.fit import Fit
 from logbook import Logger
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/guiChangeProjectedFighterAmount.py b/gui/fitCommands/guiChangeProjectedFighterAmount.py
index 949e0cc8e..1ed66731e 100644
--- a/gui/fitCommands/guiChangeProjectedFighterAmount.py
+++ b/gui/fitCommands/guiChangeProjectedFighterAmount.py
@@ -1,7 +1,7 @@
 import wx
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeProjectedFighterAmount import FitChangeProjectedFighterAmountCommand
+from .calc.fighter.projectedChangeAmount import FitChangeProjectedFighterAmountCommand
 from service.fit import Fit
 from logbook import Logger
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/guiChangeProjectedFitQty.py b/gui/fitCommands/guiChangeProjectedFitQty.py
index bdce44392..b21361028 100644
--- a/gui/fitCommands/guiChangeProjectedFitQty.py
+++ b/gui/fitCommands/guiChangeProjectedFitQty.py
@@ -1,7 +1,7 @@
 import wx
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeProjectedFitAmount import FitChangeProjectedFitAmountCommand
+from .calc.projectedFit.changeAmount import FitChangeProjectedFitAmountCommand
 from service.fit import Fit
 from logbook import Logger
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/guiFillWithModule.py b/gui/fitCommands/guiFillWithModule.py
index d8cf097c6..20f61718c 100644
--- a/gui/fitCommands/guiFillWithModule.py
+++ b/gui/fitCommands/guiFillWithModule.py
@@ -5,7 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import ModuleInfo
 from service.fit import Fit
-from .calc.fitAddModule import FitAddModuleCommand
+from .calc.module.localAdd import FitAddModuleCommand
 
 
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/guiImportMutatedModule.py b/gui/fitCommands/guiImportMutatedModule.py
index 8b4c21d6c..babdc56e8 100644
--- a/gui/fitCommands/guiImportMutatedModule.py
+++ b/gui/fitCommands/guiImportMutatedModule.py
@@ -5,7 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import ModuleInfo
 from service.fit import Fit
-from .calc.fitAddModule import FitAddModuleCommand
+from .calc.module.localAdd import FitAddModuleCommand
 
 
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/guiMetaSwap.py b/gui/fitCommands/guiMetaSwap.py
index 93b3dc954..57487a43f 100644
--- a/gui/fitCommands/guiMetaSwap.py
+++ b/gui/fitCommands/guiMetaSwap.py
@@ -7,12 +7,12 @@ from gui.fitCommands.helpers import ModuleInfo, FighterInfo, BoosterInfo
 from .calc.implant.remove import FitRemoveImplantCommand
 from .calc.implant.add import FitAddImplantCommand
 from .calc.booster.add import FitAddBoosterCommand
-from .calc.fitRemoveCargo import FitRemoveCargoCommand
-from .calc.fitAddCargo import FitAddCargoCommand
-from .calc.fitReplaceModule import FitReplaceModuleCommand
-from .calc.fitAddFighter import FitAddFighterCommand
-from .calc.fitRemoveFighter import FitRemoveFighterCommand
-from .calc.fitRebaseItem import FitRebaseItemCommand
+from .calc.cargo.remove import FitRemoveCargoCommand
+from .calc.cargo.add import FitAddCargoCommand
+from .calc.module.localReplace import FitReplaceModuleCommand
+from .calc.fighter.localAdd import FitAddFighterCommand
+from .calc.fighter.localRemove import FitRemoveFighterCommand
+from .calc.itemRebase import FitRebaseItemCommand
 
 
 class GuiMetaSwapCommand(wx.Command):
diff --git a/gui/fitCommands/guiModuleToCargo.py b/gui/fitCommands/guiModuleToCargo.py
index a00866df2..5587c0c2a 100644
--- a/gui/fitCommands/guiModuleToCargo.py
+++ b/gui/fitCommands/guiModuleToCargo.py
@@ -3,12 +3,12 @@ from logbook import Logger
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calc.fitRemoveCargo import FitRemoveCargoCommand
-from gui.fitCommands.calc.fitRemoveModule import FitRemoveModuleCommand
-from gui.fitCommands.calc.fitReplaceModule import FitReplaceModuleCommand
+from gui.fitCommands.calc.cargo.remove import FitRemoveCargoCommand
+from gui.fitCommands.calc.module.localRemove import FitRemoveModuleCommand
+from gui.fitCommands.calc.module.localReplace import FitReplaceModuleCommand
 from gui.fitCommands.helpers import ModuleInfo
 from service.fit import Fit
-from .calc.fitAddCargo import FitAddCargoCommand
+from .calc.cargo.add import FitAddCargoCommand
 
 pyfalog = Logger(__name__)
 
diff --git a/gui/fitCommands/guiMutaConvert.py b/gui/fitCommands/guiMutaConvert.py
index 0a96147e8..709befb75 100644
--- a/gui/fitCommands/guiMutaConvert.py
+++ b/gui/fitCommands/guiMutaConvert.py
@@ -4,7 +4,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import ModuleInfo
 from service.fit import Fit
-from .calc.fitReplaceModule import FitReplaceModuleCommand
+from .calc.module.localReplace import FitReplaceModuleCommand
 
 
 class GuiMutaConvertCommand(wx.Command):
diff --git a/gui/fitCommands/guiMutaRevert.py b/gui/fitCommands/guiMutaRevert.py
index b2cf391f0..02571175d 100644
--- a/gui/fitCommands/guiMutaRevert.py
+++ b/gui/fitCommands/guiMutaRevert.py
@@ -4,7 +4,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import ModuleInfo
 from service.fit import Fit
-from .calc.fitReplaceModule import FitReplaceModuleCommand
+from .calc.module.localReplace import FitReplaceModuleCommand
 
 
 class GuiMutaRevertCommand(wx.Command):
diff --git a/gui/fitCommands/guiRebaseItems.py b/gui/fitCommands/guiRebaseItems.py
index 166b3ecd5..4d792de5a 100644
--- a/gui/fitCommands/guiRebaseItems.py
+++ b/gui/fitCommands/guiRebaseItems.py
@@ -5,10 +5,10 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import CargoInfo
 from service.fit import Fit
-from .calc.fitRebaseItem import FitRebaseItemCommand
-from .calc.fitChangeModuleCharges import FitChangeModuleChargesCommand
-from .calc.fitAddCargo import FitAddCargoCommand
-from .calc.fitRemoveCargo import FitRemoveCargoCommand
+from .calc.itemRebase import FitRebaseItemCommand
+from .calc.module.changeCharges import FitChangeModuleChargesCommand
+from .calc.cargo.add import FitAddCargoCommand
+from .calc.cargo.remove import FitRemoveCargoCommand
 
 
 
diff --git a/gui/fitCommands/guiRemoveCargo.py b/gui/fitCommands/guiRemoveCargo.py
index 632f91894..65104e72c 100644
--- a/gui/fitCommands/guiRemoveCargo.py
+++ b/gui/fitCommands/guiRemoveCargo.py
@@ -6,7 +6,7 @@ from service.fit import Fit
 import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import CargoInfo
-from .calc.fitRemoveCargo import FitRemoveCargoCommand
+from .calc.cargo.remove import FitRemoveCargoCommand
 
 
 class GuiRemoveCargoCommand(wx.Command):
diff --git a/gui/fitCommands/guiRemoveCommand.py b/gui/fitCommands/guiRemoveCommand.py
index 206be23c3..a856cff52 100644
--- a/gui/fitCommands/guiRemoveCommand.py
+++ b/gui/fitCommands/guiRemoveCommand.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitRemoveCommand import FitRemoveCommandCommand
+from .calc.commandFit.remove import FitRemoveCommandCommand
 
 
 class GuiRemoveCommandCommand(wx.Command):
diff --git a/gui/fitCommands/guiRemoveDrone.py b/gui/fitCommands/guiRemoveDrone.py
index 07dd7a80d..01bf6ac43 100644
--- a/gui/fitCommands/guiRemoveDrone.py
+++ b/gui/fitCommands/guiRemoveDrone.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitRemoveDrone import FitRemoveDroneCommand
+from .calc.drone.localRemove import FitRemoveDroneCommand
 
 
 class GuiRemoveDroneCommand(wx.Command):
diff --git a/gui/fitCommands/guiRemoveFighter.py b/gui/fitCommands/guiRemoveFighter.py
index 8b4c3bcb3..75f8568be 100644
--- a/gui/fitCommands/guiRemoveFighter.py
+++ b/gui/fitCommands/guiRemoveFighter.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitRemoveFighter import FitRemoveFighterCommand
+from .calc.fighter.localRemove import FitRemoveFighterCommand
 
 
 class GuiRemoveFighterCommand(wx.Command):
diff --git a/gui/fitCommands/guiRemoveModule.py b/gui/fitCommands/guiRemoveModule.py
index 939e219ed..976b45ad2 100644
--- a/gui/fitCommands/guiRemoveModule.py
+++ b/gui/fitCommands/guiRemoveModule.py
@@ -4,7 +4,7 @@ from service.fit import Fit
 import gui.mainFrame
 from gui import globalEvents as GE
 from .helpers import ModuleInfo
-from .calc.fitRemoveModule import FitRemoveModuleCommand
+from .calc.module.localRemove import FitRemoveModuleCommand
 
 
 class GuiModuleRemoveCommand(wx.Command):
diff --git a/gui/fitCommands/guiRemoveProjected.py b/gui/fitCommands/guiRemoveProjected.py
index c4107d677..e1a0b6126 100644
--- a/gui/fitCommands/guiRemoveProjected.py
+++ b/gui/fitCommands/guiRemoveProjected.py
@@ -3,11 +3,11 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitRemoveProjectedModule import FitRemoveProjectedModuleCommand
-from .calc.fitRemoveProjectedFit import FitRemoveProjectedFitCommand
-from .calc.fitRemoveProjectedFighter import FitRemoveProjectedFighterCommand
+from .calc.module.projectedRemove import FitRemoveProjectedModuleCommand
+from .calc.projectedFit.remove import FitRemoveProjectedFitCommand
+from .calc.fighter.projectedRemove import FitRemoveProjectedFighterCommand
 from logbook import Logger
-from .calc.fitRemoveProjectedDrone import FitRemoveProjectedDroneCommand
+from .calc.drone.projectedRemove import FitRemoveProjectedDroneCommand
 
 from gui.fitCommands.helpers import DroneInfo
 from eos.saveddata.drone import Drone
diff --git a/gui/fitCommands/guiSetMode.py b/gui/fitCommands/guiSetMode.py
index 9538afb10..37bec815c 100644
--- a/gui/fitCommands/guiSetMode.py
+++ b/gui/fitCommands/guiSetMode.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeMode import FitChangeModeCommand
+from .calc.shipModeChange import FitChangeShipModeCommand
 
 
 class GuiSetModeCommand(wx.Command):
@@ -16,7 +16,7 @@ class GuiSetModeCommand(wx.Command):
         self.itemID = itemID
 
     def Do(self):
-        if self.internal_history.Submit(FitChangeModeCommand(self.fitID, self.itemID)):
+        if self.internal_history.Submit(FitChangeShipModeCommand(self.fitID, self.itemID)):
             self.sFit.recalc(self.fitID)
             wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
             return True
diff --git a/gui/fitCommands/guiSetSpoolup.py b/gui/fitCommands/guiSetSpoolup.py
index 7d1879fee..cf61c05ec 100644
--- a/gui/fitCommands/guiSetSpoolup.py
+++ b/gui/fitCommands/guiSetSpoolup.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeModuleSpoolup import FitChangeModuleSpoolupCommand
+from .calc.module.changeSpool import FitChangeModuleSpoolCommand
 
 
 class GuiSetSpoolup(wx.Command):
@@ -20,7 +20,7 @@ class GuiSetSpoolup(wx.Command):
         self.context = context
 
     def Do(self):
-        if self.internal_history.Submit(FitChangeModuleSpoolupCommand(
+        if self.internal_history.Submit(FitChangeModuleSpoolCommand(
             fitID=self.fitID,
             position=self.position,
             spoolType=self.spoolType,
diff --git a/gui/fitCommands/guiSwapCloneModule.py b/gui/fitCommands/guiSwapCloneModule.py
index cbeaf0845..f4bd5a2be 100644
--- a/gui/fitCommands/guiSwapCloneModule.py
+++ b/gui/fitCommands/guiSwapCloneModule.py
@@ -3,8 +3,8 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calc.fitSwapModule import FitSwapModuleCommand
-from .calc.fitCloneModule import FitCloneModuleCommand
+from gui.fitCommands.calc.module.localSwap import FitSwapModuleCommand
+from .calc.module.localClone import FitCloneModuleCommand
 from logbook import Logger
 pyfalog = Logger(__name__)
 
diff --git a/gui/fitCommands/guiToggleCommand.py b/gui/fitCommands/guiToggleCommand.py
index ca8f61e94..11c5956ef 100644
--- a/gui/fitCommands/guiToggleCommand.py
+++ b/gui/fitCommands/guiToggleCommand.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitToggleCommandFit import FitToggleCommandFitStateCommand
+from .calc.commandFit.toggleState import FitToggleCommandFitStateCommand
 
 
 class GuiToggleCommandCommand(wx.Command):
diff --git a/gui/fitCommands/guiToggleDrone.py b/gui/fitCommands/guiToggleDrone.py
index 2ed01e559..e020bcd50 100644
--- a/gui/fitCommands/guiToggleDrone.py
+++ b/gui/fitCommands/guiToggleDrone.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitToggleDrone import FitToggleDroneStateCommand
+from .calc.drone.localToggleState import FitToggleDroneStateCommand
 
 
 class GuiToggleDroneCommand(wx.Command):
diff --git a/gui/fitCommands/guiToggleFighter.py b/gui/fitCommands/guiToggleFighter.py
index 93955c3b6..e6a1b7f2b 100644
--- a/gui/fitCommands/guiToggleFighter.py
+++ b/gui/fitCommands/guiToggleFighter.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitToggleFighter import FitToggleFighterStateCommand
+from .calc.fighter.localToggleState import FitToggleFighterStateCommand
 
 
 class GuiToggleFighterCommand(wx.Command):
diff --git a/gui/fitCommands/guiToggleFighterAbility.py b/gui/fitCommands/guiToggleFighterAbility.py
index 6c2357ab8..96201a9b1 100644
--- a/gui/fitCommands/guiToggleFighterAbility.py
+++ b/gui/fitCommands/guiToggleFighterAbility.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitToggleFighterAbility import FitToggleFighterAbilityStateCommand
+from .calc.fighter.abilityToggle import FitToggleFighterAbilityStateCommand
 
 
 class GuiToggleFighterAbilityCommand(wx.Command):
diff --git a/gui/fitCommands/guiToggleModuleState.py b/gui/fitCommands/guiToggleModuleState.py
index 931262f03..6c745f2bd 100644
--- a/gui/fitCommands/guiToggleModuleState.py
+++ b/gui/fitCommands/guiToggleModuleState.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeModuleStates import FitChangeModuleStatesCommand
+from .calc.module.localChangeStates import FitChangeModuleStatesCommand
 
 
 class GuiModuleStateChangeCommand(wx.Command):
diff --git a/gui/fitCommands/guiToggleProjected.py b/gui/fitCommands/guiToggleProjected.py
index 04bfffd96..7f090e75c 100644
--- a/gui/fitCommands/guiToggleProjected.py
+++ b/gui/fitCommands/guiToggleProjected.py
@@ -7,10 +7,10 @@ from eos.saveddata.fit import Fit as FitType
 from eos.saveddata.module import Module as ModuleType
 from gui import globalEvents as GE
 from service.fit import Fit
-from .calc.fitToggleProjectedDrone import FitToggleProjectedDroneCommand
-from .calc.fitToggleProjectedFighter import FitToggleProjectedFighterStateCommand
-from .calc.fitToggleProjectedFit import FitToggleProjectedFitCommand
-from .calc.fitChangeProjectedModuleState import FitChangeProjectedModuleStateCommand
+from .calc.drone.projectedToggleState import FitToggleProjectedDroneStateCommand
+from .calc.fighter.projectedToggleState import FitToggleProjectedFighterStateCommand
+from .calc.projectedFit.toggleState import FitToggleProjectedFitCommand
+from .calc.module.projectedChangeState import FitChangeProjectedModuleStateCommand
 
 
 class GuiToggleProjectedCommand(wx.Command):
@@ -29,7 +29,7 @@ class GuiToggleProjectedCommand(wx.Command):
             self.commandType = FitChangeProjectedModuleStateCommand
             self.args = (self.fitID, position, click)
         elif isinstance(thing, DroneType):
-            self.commandType = FitToggleProjectedDroneCommand
+            self.commandType = FitToggleProjectedDroneStateCommand
             self.args = (self.fitID, thing.itemID)
         elif isinstance(thing, FighterType):
             position = fit.projectedFighters.index(thing)
diff --git a/service/port/efs.py b/service/port/efs.py
index 3fbfe744c..45a920cee 100755
--- a/service/port/efs.py
+++ b/service/port/efs.py
@@ -16,8 +16,8 @@ from eos.effectHandlerHelpers import HandledList
 from eos.db import gamedata_session, getCategory, getAttributeInfo, getGroup
 from eos.gamedata import Attribute, Effect, Group, Item, ItemEffect
 from eos.utils.spoolSupport import SpoolType, SpoolOptions
-from gui.fitCommands.calc.fitAddModule import FitAddModuleCommand
-from gui.fitCommands.calc.fitRemoveModule import FitRemoveModuleCommand
+from gui.fitCommands.calc.module.localAdd import FitAddModuleCommand
+from gui.fitCommands.calc.module.localRemove import FitRemoveModuleCommand
 from gui.fitCommands.helpers import ModuleInfo