diff --git a/Mage.Deck.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
similarity index 100%
rename from Mage.Deck.Constructed/pom.xml
rename to Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
diff --git a/Mage.Deck.Constructed/src/mage/deck/Constructed.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Constructed.java
similarity index 100%
rename from Mage.Deck.Constructed/src/mage/deck/Constructed.java
rename to Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Constructed.java
diff --git a/Mage.Game.FreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
similarity index 100%
rename from Mage.Game.FreeForAll/pom.xml
rename to Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
diff --git a/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java b/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java
similarity index 100%
rename from Mage.Game.FreeForAll/src/mage/game/FreeForAll.java
rename to Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java
diff --git a/Mage.Game.FreeForAll/src/mage/game/FreeForAllType.java b/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAllType.java
similarity index 100%
rename from Mage.Game.FreeForAll/src/mage/game/FreeForAllType.java
rename to Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAllType.java
diff --git a/Mage.Game.TwoPlayerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
similarity index 100%
rename from Mage.Game.TwoPlayerDuel/pom.xml
rename to Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
diff --git a/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java
similarity index 100%
rename from Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java
rename to Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java
diff --git a/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuelType.java b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuelType.java
similarity index 100%
rename from Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuelType.java
rename to Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuelType.java
diff --git a/Mage.Player.AI/manifest.mf b/Mage.Server.Plugins/Mage.Player.AI/manifest.mf
similarity index 100%
rename from Mage.Player.AI/manifest.mf
rename to Mage.Server.Plugins/Mage.Player.AI/manifest.mf
diff --git a/Mage.Player.AI/pom.xml b/Mage.Server.Plugins/Mage.Player.AI/pom.xml
similarity index 100%
rename from Mage.Player.AI/pom.xml
rename to Mage.Server.Plugins/Mage.Player.AI/pom.xml
diff --git a/Mage.Player.AI/src/mage/player/ai/Attackers.java b/Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/Attackers.java
similarity index 100%
rename from Mage.Player.AI/src/mage/player/ai/Attackers.java
rename to Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/Attackers.java
diff --git a/Mage.Player.AI/src/mage/player/ai/CombatEvaluator.java b/Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/CombatEvaluator.java
similarity index 100%
rename from Mage.Player.AI/src/mage/player/ai/CombatEvaluator.java
rename to Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/CombatEvaluator.java
diff --git a/Mage.Player.AI/src/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/ComputerPlayer.java
similarity index 100%
rename from Mage.Player.AI/src/mage/player/ai/ComputerPlayer.java
rename to Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/ComputerPlayer.java
diff --git a/Mage.Player.AI/src/mage/player/ai/PermanentComparator.java b/Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/PermanentComparator.java
similarity index 100%
rename from Mage.Player.AI/src/mage/player/ai/PermanentComparator.java
rename to Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/PermanentComparator.java
diff --git a/Mage.Player.AI/src/mage/player/ai/PermanentEvaluator.java b/Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/PermanentEvaluator.java
similarity index 100%
rename from Mage.Player.AI/src/mage/player/ai/PermanentEvaluator.java
rename to Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/PermanentEvaluator.java
diff --git a/Mage.Player.AI/src/mage/player/ai/simulators/ActionSimulator.java b/Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/simulators/ActionSimulator.java
similarity index 100%
rename from Mage.Player.AI/src/mage/player/ai/simulators/ActionSimulator.java
rename to Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/simulators/ActionSimulator.java
diff --git a/Mage.Player.AI/src/mage/player/ai/simulators/CombatGroupSimulator.java b/Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/simulators/CombatGroupSimulator.java
similarity index 100%
rename from Mage.Player.AI/src/mage/player/ai/simulators/CombatGroupSimulator.java
rename to Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/simulators/CombatGroupSimulator.java
diff --git a/Mage.Player.AI/src/mage/player/ai/simulators/CombatSimulator.java b/Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/simulators/CombatSimulator.java
similarity index 100%
rename from Mage.Player.AI/src/mage/player/ai/simulators/CombatSimulator.java
rename to Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/simulators/CombatSimulator.java
diff --git a/Mage.Player.AI/src/mage/player/ai/simulators/CreatureSimulator.java b/Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/simulators/CreatureSimulator.java
similarity index 100%
rename from Mage.Player.AI/src/mage/player/ai/simulators/CreatureSimulator.java
rename to Mage.Server.Plugins/Mage.Player.AI/src/mage/player/ai/simulators/CreatureSimulator.java
diff --git a/Mage.Player.AIMinimax/config/AIMinimax.properties b/Mage.Server.Plugins/Mage.Player.AIMinimax/config/AIMinimax.properties
similarity index 100%
rename from Mage.Player.AIMinimax/config/AIMinimax.properties
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/config/AIMinimax.properties
diff --git a/Mage.Player.AIMinimax/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
similarity index 100%
rename from Mage.Player.AIMinimax/pom.xml
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
diff --git a/Mage.Player.AIMinimax/src/mage/player/ai/Attackers.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/Attackers.java
similarity index 100%
rename from Mage.Player.AIMinimax/src/mage/player/ai/Attackers.java
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/Attackers.java
diff --git a/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java
similarity index 100%
rename from Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java
diff --git a/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java
similarity index 100%
rename from Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer3.java
diff --git a/Mage.Player.AIMinimax/src/mage/player/ai/Config.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/Config.java
similarity index 100%
rename from Mage.Player.AIMinimax/src/mage/player/ai/Config.java
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/Config.java
diff --git a/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java
similarity index 100%
rename from Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/GameStateEvaluator.java
diff --git a/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java
similarity index 100%
rename from Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulateBlockWorker.java
diff --git a/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedAction.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedAction.java
similarity index 100%
rename from Mage.Player.AIMinimax/src/mage/player/ai/SimulatedAction.java
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedAction.java
diff --git a/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java
similarity index 100%
rename from Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulatedPlayer.java
diff --git a/Mage.Player.AIMinimax/src/mage/player/ai/SimulationNode.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationNode.java
similarity index 100%
rename from Mage.Player.AIMinimax/src/mage/player/ai/SimulationNode.java
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationNode.java
diff --git a/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java
similarity index 100%
rename from Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java
rename to Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/SimulationWorker.java
diff --git a/Mage.Player.Human/pom.xml b/Mage.Server.Plugins/Mage.Player.Human/pom.xml
similarity index 100%
rename from Mage.Player.Human/pom.xml
rename to Mage.Server.Plugins/Mage.Player.Human/pom.xml
diff --git a/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
similarity index 100%
rename from Mage.Player.Human/src/mage/player/human/HumanPlayer.java
rename to Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
diff --git a/Mage.Player.Human/src/mage/player/human/PlayerResponse.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/PlayerResponse.java
similarity index 100%
rename from Mage.Player.Human/src/mage/player/human/PlayerResponse.java
rename to Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/PlayerResponse.java
diff --git a/pom.xml b/pom.xml
index c291f6cd1b..76614ae0df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,8 @@
         <module>Mage.Server</module>
         <module>Mage.Sets</module>
         <module>Mage.Client</module>
-        <module>Mage.Deck.Constructed</module>
-        <module>Mage.Game.FreeForAll</module>
-        <module>Mage.Game.TwoPlayerDuel</module>
-        <module>Mage.Player.AI</module>
-        <module>Mage.Player.AIMinimax</module>
-        <module>Mage.Player.Human</module>
         <module>Mage.Plugins</module>
+        <module>Mage.Server.Plugins</module>
     </modules>
 
     <repositories>