diff --git a/gui/fitCommands/calc/booster/__init__.py b/gui/fitCommands/calc/booster/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/gui/fitCommands/calc/fitAddBooster.py b/gui/fitCommands/calc/booster/add.py
similarity index 97%
rename from gui/fitCommands/calc/fitAddBooster.py
rename to gui/fitCommands/calc/booster/add.py
index a460d05fe..b4a458f40 100644
--- a/gui/fitCommands/calc/fitAddBooster.py
+++ b/gui/fitCommands/calc/booster/add.py
@@ -59,6 +59,6 @@ class FitAddBoosterCommand(wx.Command):
         if self.oldBoosterInfo and self.oldPosition:
             cmd = FitAddBoosterCommand(fitID=self.fitID, boosterInfo=self.oldBoosterInfo, position=self.oldPosition)
             return cmd.Do()
-        from .fitRemoveBooster import FitRemoveBoosterCommand
+        from .remove import FitRemoveBoosterCommand
         cmd = FitRemoveBoosterCommand(fitID=self.fitID, position=self.newPosition)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitRemoveBooster.py b/gui/fitCommands/calc/booster/remove.py
similarity index 94%
rename from gui/fitCommands/calc/fitRemoveBooster.py
rename to gui/fitCommands/calc/booster/remove.py
index 0297655f6..1485b270a 100644
--- a/gui/fitCommands/calc/fitRemoveBooster.py
+++ b/gui/fitCommands/calc/booster/remove.py
@@ -28,6 +28,6 @@ class FitRemoveBoosterCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing removal of booster {} on fit {}'.format(self.savedBoosterInfo, self.fitID))
-        from .fitAddBooster import FitAddBoosterCommand
+        from .add import FitAddBoosterCommand
         cmd = FitAddBoosterCommand(fitID=self.fitID, boosterInfo=self.savedBoosterInfo, position=self.position)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitToggleBoosterSideEffect.py b/gui/fitCommands/calc/booster/sideEffectToggleState.py
similarity index 100%
rename from gui/fitCommands/calc/fitToggleBoosterSideEffect.py
rename to gui/fitCommands/calc/booster/sideEffectToggleState.py
diff --git a/gui/fitCommands/calc/fitToggleBooster.py b/gui/fitCommands/calc/booster/toggleState.py
similarity index 100%
rename from gui/fitCommands/calc/fitToggleBooster.py
rename to gui/fitCommands/calc/booster/toggleState.py
diff --git a/gui/fitCommands/calc/implant/__init__.py b/gui/fitCommands/calc/implant/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/gui/fitCommands/calc/fitAddImplant.py b/gui/fitCommands/calc/implant/add.py
similarity index 100%
rename from gui/fitCommands/calc/fitAddImplant.py
rename to gui/fitCommands/calc/implant/add.py
diff --git a/gui/fitCommands/calc/fitChangeImplantLocation.py b/gui/fitCommands/calc/implant/changeLocation.py
similarity index 100%
rename from gui/fitCommands/calc/fitChangeImplantLocation.py
rename to gui/fitCommands/calc/implant/changeLocation.py
diff --git a/gui/fitCommands/calc/fitRemoveImplant.py b/gui/fitCommands/calc/implant/remove.py
similarity index 94%
rename from gui/fitCommands/calc/fitRemoveImplant.py
rename to gui/fitCommands/calc/implant/remove.py
index 0e500630e..eba5e651a 100644
--- a/gui/fitCommands/calc/fitRemoveImplant.py
+++ b/gui/fitCommands/calc/implant/remove.py
@@ -28,6 +28,6 @@ class FitRemoveImplantCommand(wx.Command):
 
     def Undo(self):
         pyfalog.debug('Undoing removal of implant {} on fit {}'.format(self.savedImplantInfo, self.fitID))
-        from .fitAddImplant import FitAddImplantCommand
+        from .add import FitAddImplantCommand
         cmd = FitAddImplantCommand(fitID=self.fitID, implantInfo=self.savedImplantInfo, position=self.position)
         return cmd.Do()
diff --git a/gui/fitCommands/calc/fitToggleImplant.py b/gui/fitCommands/calc/implant/toggleState.py
similarity index 100%
rename from gui/fitCommands/calc/fitToggleImplant.py
rename to gui/fitCommands/calc/implant/toggleState.py
diff --git a/gui/fitCommands/guiAddBooster.py b/gui/fitCommands/guiAddBooster.py
index 89b4e1861..6c0c4ad09 100644
--- a/gui/fitCommands/guiAddBooster.py
+++ b/gui/fitCommands/guiAddBooster.py
@@ -4,7 +4,7 @@ from service.fit import Fit
 import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import BoosterInfo
-from .calc.fitAddBooster import FitAddBoosterCommand
+from .calc.booster.add import FitAddBoosterCommand
 
 
 class GuiAddBoosterCommand(wx.Command):
diff --git a/gui/fitCommands/guiAddImplant.py b/gui/fitCommands/guiAddImplant.py
index ab660a66f..191f247e4 100644
--- a/gui/fitCommands/guiAddImplant.py
+++ b/gui/fitCommands/guiAddImplant.py
@@ -5,8 +5,8 @@ import gui.mainFrame
 from eos.const import ImplantLocation
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import ImplantInfo
-from .calc.fitAddImplant import FitAddImplantCommand
-from .calc.fitChangeImplantLocation import FitChangeImplantLocationCommand
+from .calc.implant.add import FitAddImplantCommand
+from .calc.implant.changeLocation import FitChangeImplantLocationCommand
 
 
 class GuiAddImplantCommand(wx.Command):
diff --git a/gui/fitCommands/guiChangeImplantLocation.py b/gui/fitCommands/guiChangeImplantLocation.py
index fe50f9bb8..9d5d21ab4 100644
--- a/gui/fitCommands/guiChangeImplantLocation.py
+++ b/gui/fitCommands/guiChangeImplantLocation.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitChangeImplantLocation import FitChangeImplantLocationCommand
+from .calc.implant.changeLocation import FitChangeImplantLocationCommand
 
 
 class GuiChangeImplantLocation(wx.Command):
diff --git a/gui/fitCommands/guiMetaSwap.py b/gui/fitCommands/guiMetaSwap.py
index f16c30141..93b3dc954 100644
--- a/gui/fitCommands/guiMetaSwap.py
+++ b/gui/fitCommands/guiMetaSwap.py
@@ -4,9 +4,9 @@ from service.fit import Fit
 import gui.mainFrame
 from gui import globalEvents as GE
 from gui.fitCommands.helpers import ModuleInfo, FighterInfo, BoosterInfo
-from .calc.fitRemoveImplant import FitRemoveImplantCommand
-from .calc.fitAddImplant import FitAddImplantCommand
-from .calc.fitAddBooster import FitAddBoosterCommand
+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
diff --git a/gui/fitCommands/guiRemoveBooster.py b/gui/fitCommands/guiRemoveBooster.py
index 15b504575..8a5bf8e76 100644
--- a/gui/fitCommands/guiRemoveBooster.py
+++ b/gui/fitCommands/guiRemoveBooster.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitRemoveBooster import FitRemoveBoosterCommand
+from .calc.booster.remove import FitRemoveBoosterCommand
 
 
 class GuiRemoveBoosterCommand(wx.Command):
diff --git a/gui/fitCommands/guiRemoveImplant.py b/gui/fitCommands/guiRemoveImplant.py
index 876421e7a..0e7133991 100644
--- a/gui/fitCommands/guiRemoveImplant.py
+++ b/gui/fitCommands/guiRemoveImplant.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitRemoveImplant import FitRemoveImplantCommand
+from .calc.implant.remove import FitRemoveImplantCommand
 
 
 class GuiRemoveImplantCommand(wx.Command):
diff --git a/gui/fitCommands/guiToggleBooster.py b/gui/fitCommands/guiToggleBooster.py
index 3ae36426a..88d8af1cd 100644
--- a/gui/fitCommands/guiToggleBooster.py
+++ b/gui/fitCommands/guiToggleBooster.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitToggleBooster import FitToggleBoosterStateCommand
+from .calc.booster.toggleState import FitToggleBoosterStateCommand
 
 
 class GuiToggleBoosterCommand(wx.Command):
diff --git a/gui/fitCommands/guiToggleBoosterSideEffect.py b/gui/fitCommands/guiToggleBoosterSideEffect.py
index 251857446..9ca51d4ee 100644
--- a/gui/fitCommands/guiToggleBoosterSideEffect.py
+++ b/gui/fitCommands/guiToggleBoosterSideEffect.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitToggleBoosterSideEffect import FitToggleBoosterSideEffectStateCommand
+from .calc.booster.sideEffectToggleState import FitToggleBoosterSideEffectStateCommand
 
 
 class GuiToggleBoosterSideEffectCommand(wx.Command):
diff --git a/gui/fitCommands/guiToggleImplant.py b/gui/fitCommands/guiToggleImplant.py
index eb4bd6f74..7eb45d6d2 100644
--- a/gui/fitCommands/guiToggleImplant.py
+++ b/gui/fitCommands/guiToggleImplant.py
@@ -3,7 +3,7 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from .calc.fitToggleImplant import FitToggleImplantStateCommand
+from .calc.implant.toggleState import FitToggleImplantStateCommand
 
 
 class GuiToggleImplantCommand(wx.Command):