Move gui commands to their own package to avoid confusion in commands package

gui/fitCommands/__init__.py

@@ -1,57 +1,57 @@
-from .booster.add import GuiAddBoosterCommand
-from .booster.remove import GuiRemoveBoosterCommand
-from .booster.sideEffectToggleState import GuiToggleBoosterSideEffectStateCommand
-from .booster.toggleState import GuiToggleBoosterStateCommand
-from .cargo.add import GuiAddCargoCommand
-from .cargo.changeAmount import GuiChangeCargoAmountCommand
-from .cargo.remove import GuiRemoveCargoCommand
-from .commandFit.add import GuiAddCommandFitCommand
-from .commandFit.remove import GuiRemoveCommandFitCommand
-from .commandFit.toggleState import GuiToggleCommandFitStateCommand
-from .localDrone.add import GuiAddLocalDroneCommand
-from .localDrone.changeAmount import GuiChangeLocalDroneAmountCommand
-from .localDrone.remove import GuiRemoveLocalDroneCommand
-from .localDrone.toggleState import GuiToggleLocalDroneStateCommand
-from .localFighter.abilityToggleState import GuiToggleLocalFighterAbilityStateCommand
-from .localFighter.add import GuiAddLocalFighterCommand
-from .localFighter.changeAmount import GuiChangeLocalFighterAmountCommand
-from .localFighter.remove import GuiRemoveLocalFighterCommand
-from .localFighter.toggleState import GuiToggleLocalFighterStateCommand
-from .guiCargoToModule import GuiCargoToModuleCommand
-from .fitRename import GuiRenameFitCommand
-from .guiMetaSwap import GuiMetaSwapCommand
-from .guiModuleToCargo import GuiModuleToCargoCommand
-from .itemsRebase import GuiRebaseItemsCommand
-from .shipModeChange import GuiChangeShipModeCommand
-from .guiSwapCloneModule import GuiModuleSwapOrCloneCommand
-from .implant.add import GuiAddImplantCommand
-from .implant.changeLocation import GuiChangeImplantLocationCommand
-from .implant.remove import GuiRemoveImplantCommand
-from .implant.toggleState import GuiToggleImplantStateCommand
-from .localModule.add import GuiAddLocalModuleCommand
-from .localModule.changeCharges import GuiChangeLocalModuleChargesCommand
-from .localModule.changeSpool import GuiChangeLocalModuleSpoolCommand
-from .localModule.changeStates import GuiChangeLocalModuleStatesCommand
-from .localModule.fill import GuiFillWithLocalModulesCommand
-from .localModule.mutatedConvert import GuiConvertMutatedLocalModuleCommand
-from .localModule.mutatedImport import GuiImportLocalMutatedModuleCommand
-from .localModule.mutatedRevert import GuiRevertMutatedLocalModuleCommand
-from .localModule.remove import GuiRemoveLocalModuleCommand
-from .projectedDrone.add import GuiAddProjectedDroneCommand
-from .projectedDrone.changeAmount import GuiChangeProjectedDroneAmountCommand
-from .projectedDrone.remove import GuiRemoveProjectedDroneCommand
-from .projectedDrone.toggleState import GuiToggleProjectedDroneStateCommand
-from .projectedFighter.abilityToggleState import GuiToggleProjectedFighterAbilityStateCommand
-from .projectedFighter.add import GuiAddProjectedFighterCommand
-from .projectedFighter.changeAmount import GuiChangeProjectedFighterAmountCommand
-from .projectedFighter.remove import GuiRemoveProjectedFighterCommand
-from .projectedFighter.toggleState import GuiToggleProjectedFighterStateCommand
-from .projectedFit.add import GuiAddProjectedFitCommand
-from .projectedFit.changeAmount import GuiChangeProjectedFitAmountCommand
-from .projectedFit.remove import GuiRemoveProjectedFitCommand
-from .projectedFit.toggleState import GuiToggleProjectedFitStateCommand
-from .projectedModule.add import GuiAddProjectedModuleCommand
-from .projectedModule.changeCharges import GuiChangeProjectedModuleChargesCommand
-from .projectedModule.changeSpool import GuiChangeProjectedModuleSpoolCommand
-from .projectedModule.changeState import GuiChangeProjectedModuleStateCommand
-from .projectedModule.remove import GuiRemoveProjectedModuleCommand
+from .gui.booster.add import GuiAddBoosterCommand
+from .gui.booster.remove import GuiRemoveBoosterCommand
+from .gui.booster.sideEffectToggleState import GuiToggleBoosterSideEffectStateCommand
+from .gui.booster.toggleState import GuiToggleBoosterStateCommand
+from .gui.cargo.add import GuiAddCargoCommand
+from .gui.cargo.changeAmount import GuiChangeCargoAmountCommand
+from .gui.cargo.remove import GuiRemoveCargoCommand
+from .gui.commandFit.add import GuiAddCommandFitCommand
+from .gui.commandFit.remove import GuiRemoveCommandFitCommand
+from .gui.commandFit.toggleState import GuiToggleCommandFitStateCommand
+from .gui.fitRename import GuiRenameFitCommand
+from .gui.guiCargoToModule import GuiCargoToModuleCommand
+from .gui.guiMetaSwap import GuiMetaSwapCommand
+from .gui.guiModuleToCargo import GuiModuleToCargoCommand
+from .gui.guiSwapCloneModule import GuiModuleSwapOrCloneCommand
+from .gui.implant.add import GuiAddImplantCommand
+from .gui.implant.changeLocation import GuiChangeImplantLocationCommand
+from .gui.implant.remove import GuiRemoveImplantCommand
+from .gui.implant.toggleState import GuiToggleImplantStateCommand
+from .gui.itemsRebase import GuiRebaseItemsCommand
+from .gui.localDrone.add import GuiAddLocalDroneCommand
+from .gui.localDrone.changeAmount import GuiChangeLocalDroneAmountCommand
+from .gui.localDrone.remove import GuiRemoveLocalDroneCommand
+from .gui.localDrone.toggleState import GuiToggleLocalDroneStateCommand
+from .gui.localFighter.abilityToggleState import GuiToggleLocalFighterAbilityStateCommand
+from .gui.localFighter.add import GuiAddLocalFighterCommand
+from .gui.localFighter.changeAmount import GuiChangeLocalFighterAmountCommand
+from .gui.localFighter.remove import GuiRemoveLocalFighterCommand
+from .gui.localFighter.toggleState import GuiToggleLocalFighterStateCommand
+from .gui.localModule.add import GuiAddLocalModuleCommand
+from .gui.localModule.changeCharges import GuiChangeLocalModuleChargesCommand
+from .gui.localModule.changeSpool import GuiChangeLocalModuleSpoolCommand
+from .gui.localModule.changeStates import GuiChangeLocalModuleStatesCommand
+from .gui.localModule.fill import GuiFillWithLocalModulesCommand
+from .gui.localModule.mutatedConvert import GuiConvertMutatedLocalModuleCommand
+from .gui.localModule.mutatedImport import GuiImportLocalMutatedModuleCommand
+from .gui.localModule.mutatedRevert import GuiRevertMutatedLocalModuleCommand
+from .gui.localModule.remove import GuiRemoveLocalModuleCommand
+from .gui.projectedDrone.add import GuiAddProjectedDroneCommand
+from .gui.projectedDrone.changeAmount import GuiChangeProjectedDroneAmountCommand
+from .gui.projectedDrone.remove import GuiRemoveProjectedDroneCommand
+from .gui.projectedDrone.toggleState import GuiToggleProjectedDroneStateCommand
+from .gui.projectedFighter.abilityToggleState import GuiToggleProjectedFighterAbilityStateCommand
+from .gui.projectedFighter.add import GuiAddProjectedFighterCommand
+from .gui.projectedFighter.changeAmount import GuiChangeProjectedFighterAmountCommand
+from .gui.projectedFighter.remove import GuiRemoveProjectedFighterCommand
+from .gui.projectedFighter.toggleState import GuiToggleProjectedFighterStateCommand
+from .gui.projectedFit.add import GuiAddProjectedFitCommand
+from .gui.projectedFit.changeAmount import GuiChangeProjectedFitAmountCommand
+from .gui.projectedFit.remove import GuiRemoveProjectedFitCommand
+from .gui.projectedFit.toggleState import GuiToggleProjectedFitStateCommand
+from .gui.projectedModule.add import GuiAddProjectedModuleCommand
+from .gui.projectedModule.changeCharges import GuiChangeProjectedModuleChargesCommand
+from .gui.projectedModule.changeSpool import GuiChangeProjectedModuleSpoolCommand
+from .gui.projectedModule.changeState import GuiChangeProjectedModuleStateCommand
+from .gui.projectedModule.remove import GuiRemoveProjectedModuleCommand
+from .gui.shipModeChange import GuiChangeShipModeCommand

gui/fitCommands/gui/booster/add.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.booster.add import CalcAddBoosterCommand
+from gui.fitCommands.calc.booster.add import CalcAddBoosterCommand
 from gui.fitCommands.helpers import BoosterInfo, InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/booster/remove.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.booster.remove import CalcRemoveBoosterCommand
+from gui.fitCommands.calc.booster.remove import CalcRemoveBoosterCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/booster/sideEffectToggleState.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.booster.sideEffectToggleState import CalcToggleBoosterSideEffectStateCommand
+from gui.fitCommands.calc.booster.sideEffectToggleState import CalcToggleBoosterSideEffectStateCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/booster/toggleState.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.booster.toggleState import CalcToggleBoosterStateCommand
+from gui.fitCommands.calc.booster.toggleState import CalcToggleBoosterStateCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/cargo/add.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.cargo.add import CalcAddCargoCommand
+from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand
 from gui.fitCommands.helpers import CargoInfo, InternalCommandHistory
 
 

gui/fitCommands/gui/cargo/changeAmount.py

@@ -4,8 +4,8 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.cargo.changeAmount import CalcChangeCargoAmountCommand
-from gui.fitCommands.calcCommands.cargo.remove import CalcRemoveCargoCommand
+from gui.fitCommands.calc.cargo.changeAmount import CalcChangeCargoAmountCommand
+from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand
 from gui.fitCommands.helpers import CargoInfo, InternalCommandHistory
 
 

gui/fitCommands/gui/cargo/remove.py

@@ -4,7 +4,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.cargo.remove import CalcRemoveCargoCommand
+from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand
 from gui.fitCommands.helpers import CargoInfo, InternalCommandHistory
 
 

gui/fitCommands/gui/commandFit/add.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.commandFit.add import CalcAddCommandCommand
+from gui.fitCommands.calc.commandFit.add import CalcAddCommandCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/commandFit/remove.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.commandFit.remove import CalcRemoveCommandCommand
+from gui.fitCommands.calc.commandFit.remove import CalcRemoveCommandCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/commandFit/toggleState.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.commandFit.toggleState import CalcToggleCommandFitStateCommand
+from gui.fitCommands.calc.commandFit.toggleState import CalcToggleCommandFitStateCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/fitRename.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui.builtinShipBrowser.events import FitRenamed
-from gui.fitCommands.calcCommands.fitRename import CalcFitRenameCommand
+from gui.fitCommands.calc.fitRename import CalcFitRenameCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 
 

gui/fitCommands/gui/guiCargoToModule.py

@@ -3,11 +3,11 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.module.changeCharges import CalcChangeModuleChargesCommand
-from gui.fitCommands.calcCommands.module.localReplace import CalcReplaceLocalModuleCommand
-from gui.fitCommands.calcCommands.cargo.remove import CalcRemoveCargoCommand
+from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand
+from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand
+from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand
 from gui.fitCommands.helpers import ModuleInfo
-from .calcCommands.cargo.add import CalcAddCargoCommand
+from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand
 from logbook import Logger
 pyfalog = Logger(__name__)
 

gui/fitCommands/gui/guiMetaSwap.py

@@ -4,15 +4,15 @@ from service.fit import Fit
 import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import ModuleInfo, FighterInfo, BoosterInfo
-from .calcCommands.implant.remove import CalcRemoveImplantCommand
-from .calcCommands.implant.add import CalcAddImplantCommand
-from .calcCommands.booster.add import CalcAddBoosterCommand
-from .calcCommands.cargo.remove import CalcRemoveCargoCommand
-from .calcCommands.cargo.add import CalcAddCargoCommand
-from .calcCommands.module.localReplace import CalcReplaceLocalModuleCommand
-from .calcCommands.fighter.localAdd import CalcAddLocalFighterCommand
-from .calcCommands.fighter.localRemove import CalcRemoveLocalFighterCommand
-from .calcCommands.itemRebase import CalcRebaseItemCommand
+from gui.fitCommands.calc.implant.remove import CalcRemoveImplantCommand
+from gui.fitCommands.calc.implant.add import CalcAddImplantCommand
+from gui.fitCommands.calc.booster.add import CalcAddBoosterCommand
+from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand
+from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand
+from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand
+from gui.fitCommands.calc.fighter.localAdd import CalcAddLocalFighterCommand
+from gui.fitCommands.calc.fighter.localRemove import CalcRemoveLocalFighterCommand
+from gui.fitCommands.calc.itemRebase import CalcRebaseItemCommand
 
 
 class GuiMetaSwapCommand(wx.Command):

gui/fitCommands/gui/guiModuleToCargo.py

@@ -3,12 +3,12 @@ from logbook import Logger
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.cargo.remove import CalcRemoveCargoCommand
-from gui.fitCommands.calcCommands.module.localRemove import CalcRemoveLocalModuleCommand
-from gui.fitCommands.calcCommands.module.localReplace import CalcReplaceLocalModuleCommand
+from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand
+from gui.fitCommands.calc.module.localRemove import CalcRemoveLocalModuleCommand
+from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand
 from gui.fitCommands.helpers import ModuleInfo
 from service.fit import Fit
-from .calcCommands.cargo.add import CalcAddCargoCommand
+from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand
 
 pyfalog = Logger(__name__)
 

gui/fitCommands/gui/guiSwapCloneModule.py

@@ -3,8 +3,8 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.module.localSwap import CalcSwapLocalModuleCommand
-from .calcCommands.module.localClone import CalcCloneLocalModuleCommand
+from gui.fitCommands.calc.module.localSwap import CalcSwapLocalModuleCommand
+from gui.fitCommands.calc.module.localClone import CalcCloneLocalModuleCommand
 from logbook import Logger
 pyfalog = Logger(__name__)
 

gui/fitCommands/gui/implant/add.py

@@ -3,8 +3,8 @@ import wx
 import gui.mainFrame
 from eos.const import ImplantLocation
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.implant.add import CalcAddImplantCommand
-from gui.fitCommands.calcCommands.implant.changeLocation import CalcChangeImplantLocationCommand
+from gui.fitCommands.calc.implant.add import CalcAddImplantCommand
+from gui.fitCommands.calc.implant.changeLocation import CalcChangeImplantLocationCommand
 from gui.fitCommands.helpers import ImplantInfo, InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/implant/changeLocation.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.implant.changeLocation import CalcChangeImplantLocationCommand
+from gui.fitCommands.calc.implant.changeLocation import CalcChangeImplantLocationCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/implant/remove.py

@@ -4,7 +4,7 @@ from service.fit import Fit
 import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import InternalCommandHistory
-from gui.fitCommands.calcCommands.implant.remove import CalcRemoveImplantCommand
+from gui.fitCommands.calc.implant.remove import CalcRemoveImplantCommand
 
 
 class GuiRemoveImplantCommand(wx.Command):

gui/fitCommands/gui/implant/toggleState.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.implant.toggleState import CalcToggleImplantStateCommand
+from gui.fitCommands.calc.implant.toggleState import CalcToggleImplantStateCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/itemsRebase.py

@@ -5,10 +5,10 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import CargoInfo, InternalCommandHistory
 from service.fit import Fit
-from .calcCommands.cargo.add import CalcAddCargoCommand
-from .calcCommands.cargo.remove import CalcRemoveCargoCommand
-from .calcCommands.itemRebase import CalcRebaseItemCommand
-from .calcCommands.module.changeCharges import CalcChangeModuleChargesCommand
+from gui.fitCommands.calc.cargo.add import CalcAddCargoCommand
+from gui.fitCommands.calc.cargo.remove import CalcRemoveCargoCommand
+from gui.fitCommands.calc.itemRebase import CalcRebaseItemCommand
+from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand
 
 
 class GuiRebaseItemsCommand(wx.Command):

gui/fitCommands/gui/localDrone/add.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.drone.localAdd import CalcAddLocalDroneCommand
+from gui.fitCommands.calc.drone.localAdd import CalcAddLocalDroneCommand
 from gui.fitCommands.helpers import DroneInfo, InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localDrone/changeAmount.py

@@ -4,8 +4,8 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.drone.localChangeAmount import CalcChangeLocalDroneAmountCommand
-from gui.fitCommands.calcCommands.drone.localRemove import CalcRemoveLocalDroneCommand
+from gui.fitCommands.calc.drone.localChangeAmount import CalcChangeLocalDroneAmountCommand
+from gui.fitCommands.calc.drone.localRemove import CalcRemoveLocalDroneCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localDrone/remove.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.drone.localRemove import CalcRemoveLocalDroneCommand
+from gui.fitCommands.calc.drone.localRemove import CalcRemoveLocalDroneCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localDrone/toggleState.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.drone.localToggleState import CalcToggleLocalDroneStateCommand
+from gui.fitCommands.calc.drone.localToggleState import CalcToggleLocalDroneStateCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localFighter/abilityToggleState.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.fighter.abilityToggleState import CalcToggleFighterAbilityStateCommand
+from gui.fitCommands.calc.fighter.abilityToggleState import CalcToggleFighterAbilityStateCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localFighter/add.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.fighter.localAdd import CalcAddLocalFighterCommand
+from gui.fitCommands.calc.fighter.localAdd import CalcAddLocalFighterCommand
 from gui.fitCommands.helpers import FighterInfo, InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localFighter/changeAmount.py

@@ -2,8 +2,8 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.fighter.changeAmount import CalcChangeFighterAmountCommand
-from gui.fitCommands.calcCommands.fighter.localRemove import CalcRemoveLocalFighterCommand
+from gui.fitCommands.calc.fighter.changeAmount import CalcChangeFighterAmountCommand
+from gui.fitCommands.calc.fighter.localRemove import CalcRemoveLocalFighterCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localFighter/remove.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.fighter.localRemove import CalcRemoveLocalFighterCommand
+from gui.fitCommands.calc.fighter.localRemove import CalcRemoveLocalFighterCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localFighter/toggleState.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.fighter.toggleState import CalcToggleFighterStateCommand
+from gui.fitCommands.calc.fighter.toggleState import CalcToggleFighterStateCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localModule/add.py

@@ -2,9 +2,9 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.module.changeCharges import CalcChangeModuleChargesCommand
-from gui.fitCommands.calcCommands.module.localAdd import CalcAddLocalModuleCommand
-from gui.fitCommands.calcCommands.module.localReplace import CalcReplaceLocalModuleCommand
+from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand
+from gui.fitCommands.calc.module.localAdd import CalcAddLocalModuleCommand
+from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand
 from gui.fitCommands.helpers import InternalCommandHistory, ModuleInfo
 from service.fit import Fit
 from service.market import Market

gui/fitCommands/gui/localModule/changeCharges.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.module.changeCharges import CalcChangeModuleChargesCommand
+from gui.fitCommands.calc.module.changeCharges import CalcChangeModuleChargesCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localModule/changeSpool.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.module.changeSpool import CalcChangeModuleSpoolCommand
+from gui.fitCommands.calc.module.changeSpool import CalcChangeModuleSpoolCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localModule/changeStates.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.module.localChangeStates import CalcChangeLocalModuleStatesCommand
+from gui.fitCommands.calc.module.localChangeStates import CalcChangeLocalModuleStatesCommand
 from gui.fitCommands.helpers import InternalCommandHistory
 from service.fit import Fit
 

gui/fitCommands/gui/localModule/fill.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.module.localAdd import CalcAddLocalModuleCommand
+from gui.fitCommands.calc.module.localAdd import CalcAddLocalModuleCommand
 from gui.fitCommands.helpers import InternalCommandHistory, ModuleInfo
 from service.fit import Fit
 

gui/fitCommands/gui/localModule/mutatedConvert.py

@@ -2,7 +2,7 @@ import wx
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from gui.fitCommands.calcCommands.module.localReplace import CalcReplaceLocalModuleCommand
+from gui.fitCommands.calc.module.localReplace import CalcReplaceLocalModuleCommand
 from gui.fitCommands.helpers import InternalCommandHistory, ModuleInfo
 from service.fit import Fit