diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index 698ae84ae83..0d8f1e7019c 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -35,15 +35,6 @@ - src - - - - resources - false - - - org.apache.maven.plugins diff --git a/Mage.Client/src/mage/client/MageFrame.form b/Mage.Client/src/main/java/mage/client/MageFrame.form similarity index 100% rename from Mage.Client/src/mage/client/MageFrame.form rename to Mage.Client/src/main/java/mage/client/MageFrame.form diff --git a/Mage.Client/src/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java similarity index 100% rename from Mage.Client/src/mage/client/MageFrame.java rename to Mage.Client/src/main/java/mage/client/MageFrame.java diff --git a/Mage.Client/src/mage/client/MagePane.form b/Mage.Client/src/main/java/mage/client/MagePane.form similarity index 100% rename from Mage.Client/src/mage/client/MagePane.form rename to Mage.Client/src/main/java/mage/client/MagePane.form diff --git a/Mage.Client/src/mage/client/MagePane.java b/Mage.Client/src/main/java/mage/client/MagePane.java similarity index 100% rename from Mage.Client/src/mage/client/MagePane.java rename to Mage.Client/src/main/java/mage/client/MagePane.java diff --git a/Mage.Client/src/mage/client/cards/BigCard.form b/Mage.Client/src/main/java/mage/client/cards/BigCard.form similarity index 100% rename from Mage.Client/src/mage/client/cards/BigCard.form rename to Mage.Client/src/main/java/mage/client/cards/BigCard.form diff --git a/Mage.Client/src/mage/client/cards/BigCard.java b/Mage.Client/src/main/java/mage/client/cards/BigCard.java similarity index 100% rename from Mage.Client/src/mage/client/cards/BigCard.java rename to Mage.Client/src/main/java/mage/client/cards/BigCard.java diff --git a/Mage.Client/src/mage/client/cards/Card.form b/Mage.Client/src/main/java/mage/client/cards/Card.form similarity index 100% rename from Mage.Client/src/mage/client/cards/Card.form rename to Mage.Client/src/main/java/mage/client/cards/Card.form diff --git a/Mage.Client/src/mage/client/cards/Card.java b/Mage.Client/src/main/java/mage/client/cards/Card.java similarity index 100% rename from Mage.Client/src/mage/client/cards/Card.java rename to Mage.Client/src/main/java/mage/client/cards/Card.java diff --git a/Mage.Client/src/mage/client/cards/CardDimensions.java b/Mage.Client/src/main/java/mage/client/cards/CardDimensions.java similarity index 100% rename from Mage.Client/src/mage/client/cards/CardDimensions.java rename to Mage.Client/src/main/java/mage/client/cards/CardDimensions.java diff --git a/Mage.Client/src/mage/client/cards/CardEventSource.java b/Mage.Client/src/main/java/mage/client/cards/CardEventSource.java similarity index 100% rename from Mage.Client/src/mage/client/cards/CardEventSource.java rename to Mage.Client/src/main/java/mage/client/cards/CardEventSource.java diff --git a/Mage.Client/src/mage/client/cards/CardGrid.form b/Mage.Client/src/main/java/mage/client/cards/CardGrid.form similarity index 100% rename from Mage.Client/src/mage/client/cards/CardGrid.form rename to Mage.Client/src/main/java/mage/client/cards/CardGrid.form diff --git a/Mage.Client/src/mage/client/cards/CardGrid.java b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java similarity index 100% rename from Mage.Client/src/mage/client/cards/CardGrid.java rename to Mage.Client/src/main/java/mage/client/cards/CardGrid.java diff --git a/Mage.Client/src/mage/client/cards/Cards.form b/Mage.Client/src/main/java/mage/client/cards/Cards.form similarity index 100% rename from Mage.Client/src/mage/client/cards/Cards.form rename to Mage.Client/src/main/java/mage/client/cards/Cards.form diff --git a/Mage.Client/src/mage/client/cards/Cards.java b/Mage.Client/src/main/java/mage/client/cards/Cards.java similarity index 100% rename from Mage.Client/src/mage/client/cards/Cards.java rename to Mage.Client/src/main/java/mage/client/cards/Cards.java diff --git a/Mage.Client/src/mage/client/cards/CardsList.form b/Mage.Client/src/main/java/mage/client/cards/CardsList.form similarity index 100% rename from Mage.Client/src/mage/client/cards/CardsList.form rename to Mage.Client/src/main/java/mage/client/cards/CardsList.form diff --git a/Mage.Client/src/mage/client/cards/CardsList.java b/Mage.Client/src/main/java/mage/client/cards/CardsList.java similarity index 100% rename from Mage.Client/src/mage/client/cards/CardsList.java rename to Mage.Client/src/main/java/mage/client/cards/CardsList.java diff --git a/Mage.Client/src/mage/client/cards/Permanent.form b/Mage.Client/src/main/java/mage/client/cards/Permanent.form similarity index 100% rename from Mage.Client/src/mage/client/cards/Permanent.form rename to Mage.Client/src/main/java/mage/client/cards/Permanent.form diff --git a/Mage.Client/src/mage/client/cards/Permanent.java b/Mage.Client/src/main/java/mage/client/cards/Permanent.java similarity index 100% rename from Mage.Client/src/mage/client/cards/Permanent.java rename to Mage.Client/src/main/java/mage/client/cards/Permanent.java diff --git a/Mage.Client/src/mage/client/cards/TextPopup.form b/Mage.Client/src/main/java/mage/client/cards/TextPopup.form similarity index 100% rename from Mage.Client/src/mage/client/cards/TextPopup.form rename to Mage.Client/src/main/java/mage/client/cards/TextPopup.form diff --git a/Mage.Client/src/mage/client/cards/TextPopup.java b/Mage.Client/src/main/java/mage/client/cards/TextPopup.java similarity index 100% rename from Mage.Client/src/mage/client/cards/TextPopup.java rename to Mage.Client/src/main/java/mage/client/cards/TextPopup.java diff --git a/Mage.Client/src/mage/client/chat/ChatClientImpl.java b/Mage.Client/src/main/java/mage/client/chat/ChatClientImpl.java similarity index 100% rename from Mage.Client/src/mage/client/chat/ChatClientImpl.java rename to Mage.Client/src/main/java/mage/client/chat/ChatClientImpl.java diff --git a/Mage.Client/src/mage/client/chat/ChatPanel.form b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.form similarity index 100% rename from Mage.Client/src/mage/client/chat/ChatPanel.form rename to Mage.Client/src/main/java/mage/client/chat/ChatPanel.form diff --git a/Mage.Client/src/mage/client/chat/ChatPanel.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java similarity index 100% rename from Mage.Client/src/mage/client/chat/ChatPanel.java rename to Mage.Client/src/main/java/mage/client/chat/ChatPanel.java diff --git a/Mage.Client/src/mage/client/deckeditor/CardSelector.form b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form similarity index 100% rename from Mage.Client/src/mage/client/deckeditor/CardSelector.form rename to Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form diff --git a/Mage.Client/src/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java similarity index 100% rename from Mage.Client/src/mage/client/deckeditor/CardSelector.java rename to Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java diff --git a/Mage.Client/src/mage/client/deckeditor/DeckArea.form b/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.form similarity index 100% rename from Mage.Client/src/mage/client/deckeditor/DeckArea.form rename to Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.form diff --git a/Mage.Client/src/mage/client/deckeditor/DeckArea.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java similarity index 100% rename from Mage.Client/src/mage/client/deckeditor/DeckArea.java rename to Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java diff --git a/Mage.Client/src/mage/client/deckeditor/DeckEditorPane.form b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.form similarity index 100% rename from Mage.Client/src/mage/client/deckeditor/DeckEditorPane.form rename to Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.form diff --git a/Mage.Client/src/mage/client/deckeditor/DeckEditorPane.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.java similarity index 100% rename from Mage.Client/src/mage/client/deckeditor/DeckEditorPane.java rename to Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.java diff --git a/Mage.Client/src/mage/client/deckeditor/DeckEditorPanel.form b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.form similarity index 100% rename from Mage.Client/src/mage/client/deckeditor/DeckEditorPanel.form rename to Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.form diff --git a/Mage.Client/src/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java similarity index 100% rename from Mage.Client/src/mage/client/deckeditor/DeckEditorPanel.java rename to Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java diff --git a/Mage.Client/src/mage/client/dialog/AboutDialog.form b/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/AboutDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/AboutDialog.form diff --git a/Mage.Client/src/mage/client/dialog/AboutDialog.java b/Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/AboutDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java diff --git a/Mage.Client/src/mage/client/dialog/CombatDialog.form b/Mage.Client/src/main/java/mage/client/dialog/CombatDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/CombatDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/CombatDialog.form diff --git a/Mage.Client/src/mage/client/dialog/CombatDialog.java b/Mage.Client/src/main/java/mage/client/dialog/CombatDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/CombatDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/CombatDialog.java diff --git a/Mage.Client/src/mage/client/dialog/ConnectDialog.form b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/ConnectDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form diff --git a/Mage.Client/src/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/ConnectDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java diff --git a/Mage.Client/src/mage/client/dialog/ExileZoneDialog.form b/Mage.Client/src/main/java/mage/client/dialog/ExileZoneDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/ExileZoneDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/ExileZoneDialog.form diff --git a/Mage.Client/src/mage/client/dialog/ExileZoneDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ExileZoneDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/ExileZoneDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/ExileZoneDialog.java diff --git a/Mage.Client/src/mage/client/dialog/JoinTableDialog.form b/Mage.Client/src/main/java/mage/client/dialog/JoinTableDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/JoinTableDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/JoinTableDialog.form diff --git a/Mage.Client/src/mage/client/dialog/JoinTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/JoinTableDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/JoinTableDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/JoinTableDialog.java diff --git a/Mage.Client/src/mage/client/dialog/MageDialog.form b/Mage.Client/src/main/java/mage/client/dialog/MageDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/MageDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/MageDialog.form diff --git a/Mage.Client/src/mage/client/dialog/MageDialog.java b/Mage.Client/src/main/java/mage/client/dialog/MageDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/MageDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/MageDialog.java diff --git a/Mage.Client/src/mage/client/dialog/NewTableDialog.form b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/NewTableDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.form diff --git a/Mage.Client/src/mage/client/dialog/NewTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/NewTableDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java diff --git a/Mage.Client/src/mage/client/dialog/PickChoiceDialog.form b/Mage.Client/src/main/java/mage/client/dialog/PickChoiceDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/PickChoiceDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/PickChoiceDialog.form diff --git a/Mage.Client/src/mage/client/dialog/PickChoiceDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PickChoiceDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/PickChoiceDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/PickChoiceDialog.java diff --git a/Mage.Client/src/mage/client/dialog/PickNumberDialog.form b/Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/PickNumberDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.form diff --git a/Mage.Client/src/mage/client/dialog/PickNumberDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/PickNumberDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.java diff --git a/Mage.Client/src/mage/client/dialog/QuestionDialog.form b/Mage.Client/src/main/java/mage/client/dialog/QuestionDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/QuestionDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/QuestionDialog.form diff --git a/Mage.Client/src/mage/client/dialog/QuestionDialog.java b/Mage.Client/src/main/java/mage/client/dialog/QuestionDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/QuestionDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/QuestionDialog.java diff --git a/Mage.Client/src/mage/client/dialog/ShowCardsDialog.form b/Mage.Client/src/main/java/mage/client/dialog/ShowCardsDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/ShowCardsDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/ShowCardsDialog.form diff --git a/Mage.Client/src/mage/client/dialog/ShowCardsDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ShowCardsDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/ShowCardsDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/ShowCardsDialog.java diff --git a/Mage.Client/src/mage/client/dialog/TableWaitingDialog.form b/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.form similarity index 100% rename from Mage.Client/src/mage/client/dialog/TableWaitingDialog.form rename to Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.form diff --git a/Mage.Client/src/mage/client/dialog/TableWaitingDialog.java b/Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java similarity index 100% rename from Mage.Client/src/mage/client/dialog/TableWaitingDialog.java rename to Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java diff --git a/Mage.Client/src/mage/client/game/AbilityPicker.java b/Mage.Client/src/main/java/mage/client/game/AbilityPicker.java similarity index 100% rename from Mage.Client/src/mage/client/game/AbilityPicker.java rename to Mage.Client/src/main/java/mage/client/game/AbilityPicker.java diff --git a/Mage.Client/src/mage/client/game/BattlefieldPanel.form b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.form similarity index 100% rename from Mage.Client/src/mage/client/game/BattlefieldPanel.form rename to Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.form diff --git a/Mage.Client/src/mage/client/game/BattlefieldPanel.java b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java similarity index 100% rename from Mage.Client/src/mage/client/game/BattlefieldPanel.java rename to Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java diff --git a/Mage.Client/src/mage/client/game/CombatGroup.form b/Mage.Client/src/main/java/mage/client/game/CombatGroup.form similarity index 100% rename from Mage.Client/src/mage/client/game/CombatGroup.form rename to Mage.Client/src/main/java/mage/client/game/CombatGroup.form diff --git a/Mage.Client/src/mage/client/game/CombatGroup.java b/Mage.Client/src/main/java/mage/client/game/CombatGroup.java similarity index 100% rename from Mage.Client/src/mage/client/game/CombatGroup.java rename to Mage.Client/src/main/java/mage/client/game/CombatGroup.java diff --git a/Mage.Client/src/mage/client/game/FeedbackPanel.form b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.form similarity index 100% rename from Mage.Client/src/mage/client/game/FeedbackPanel.form rename to Mage.Client/src/main/java/mage/client/game/FeedbackPanel.form diff --git a/Mage.Client/src/mage/client/game/FeedbackPanel.java b/Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java similarity index 100% rename from Mage.Client/src/mage/client/game/FeedbackPanel.java rename to Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java diff --git a/Mage.Client/src/mage/client/game/GamePane.form b/Mage.Client/src/main/java/mage/client/game/GamePane.form similarity index 100% rename from Mage.Client/src/mage/client/game/GamePane.form rename to Mage.Client/src/main/java/mage/client/game/GamePane.form diff --git a/Mage.Client/src/mage/client/game/GamePane.java b/Mage.Client/src/main/java/mage/client/game/GamePane.java similarity index 100% rename from Mage.Client/src/mage/client/game/GamePane.java rename to Mage.Client/src/main/java/mage/client/game/GamePane.java diff --git a/Mage.Client/src/mage/client/game/GamePanel.form b/Mage.Client/src/main/java/mage/client/game/GamePanel.form similarity index 100% rename from Mage.Client/src/mage/client/game/GamePanel.form rename to Mage.Client/src/main/java/mage/client/game/GamePanel.form diff --git a/Mage.Client/src/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java similarity index 100% rename from Mage.Client/src/mage/client/game/GamePanel.java rename to Mage.Client/src/main/java/mage/client/game/GamePanel.java diff --git a/Mage.Client/src/mage/client/game/ManaPool.form b/Mage.Client/src/main/java/mage/client/game/ManaPool.form similarity index 100% rename from Mage.Client/src/mage/client/game/ManaPool.form rename to Mage.Client/src/main/java/mage/client/game/ManaPool.form diff --git a/Mage.Client/src/mage/client/game/ManaPool.java b/Mage.Client/src/main/java/mage/client/game/ManaPool.java similarity index 100% rename from Mage.Client/src/mage/client/game/ManaPool.java rename to Mage.Client/src/main/java/mage/client/game/ManaPool.java diff --git a/Mage.Client/src/mage/client/game/PlayAreaPanel.form b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.form similarity index 100% rename from Mage.Client/src/mage/client/game/PlayAreaPanel.form rename to Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.form diff --git a/Mage.Client/src/mage/client/game/PlayAreaPanel.java b/Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java similarity index 100% rename from Mage.Client/src/mage/client/game/PlayAreaPanel.java rename to Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java diff --git a/Mage.Client/src/mage/client/game/PlayerPanel.form b/Mage.Client/src/main/java/mage/client/game/PlayerPanel.form similarity index 100% rename from Mage.Client/src/mage/client/game/PlayerPanel.form rename to Mage.Client/src/main/java/mage/client/game/PlayerPanel.form diff --git a/Mage.Client/src/mage/client/game/PlayerPanel.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanel.java similarity index 100% rename from Mage.Client/src/mage/client/game/PlayerPanel.java rename to Mage.Client/src/main/java/mage/client/game/PlayerPanel.java diff --git a/Mage.Client/src/mage/client/remote/Client.java b/Mage.Client/src/main/java/mage/client/remote/Client.java similarity index 100% rename from Mage.Client/src/mage/client/remote/Client.java rename to Mage.Client/src/main/java/mage/client/remote/Client.java diff --git a/Mage.Client/src/mage/client/remote/MageRemoteException.java b/Mage.Client/src/main/java/mage/client/remote/MageRemoteException.java similarity index 100% rename from Mage.Client/src/mage/client/remote/MageRemoteException.java rename to Mage.Client/src/main/java/mage/client/remote/MageRemoteException.java diff --git a/Mage.Client/src/mage/client/remote/Session.java b/Mage.Client/src/main/java/mage/client/remote/Session.java similarity index 100% rename from Mage.Client/src/mage/client/remote/Session.java rename to Mage.Client/src/main/java/mage/client/remote/Session.java diff --git a/Mage.Client/src/mage/client/table/NewPlayerPanel.form b/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.form similarity index 100% rename from Mage.Client/src/mage/client/table/NewPlayerPanel.form rename to Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.form diff --git a/Mage.Client/src/mage/client/table/NewPlayerPanel.java b/Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java similarity index 100% rename from Mage.Client/src/mage/client/table/NewPlayerPanel.java rename to Mage.Client/src/main/java/mage/client/table/NewPlayerPanel.java diff --git a/Mage.Client/src/mage/client/table/PlayerTypeEventSource.java b/Mage.Client/src/main/java/mage/client/table/PlayerTypeEventSource.java similarity index 100% rename from Mage.Client/src/mage/client/table/PlayerTypeEventSource.java rename to Mage.Client/src/main/java/mage/client/table/PlayerTypeEventSource.java diff --git a/Mage.Client/src/mage/client/table/TablePlayerPanel.form b/Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.form similarity index 100% rename from Mage.Client/src/mage/client/table/TablePlayerPanel.form rename to Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.form diff --git a/Mage.Client/src/mage/client/table/TablePlayerPanel.java b/Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java similarity index 100% rename from Mage.Client/src/mage/client/table/TablePlayerPanel.java rename to Mage.Client/src/main/java/mage/client/table/TablePlayerPanel.java diff --git a/Mage.Client/src/mage/client/table/TablesPane.form b/Mage.Client/src/main/java/mage/client/table/TablesPane.form similarity index 100% rename from Mage.Client/src/mage/client/table/TablesPane.form rename to Mage.Client/src/main/java/mage/client/table/TablesPane.form diff --git a/Mage.Client/src/mage/client/table/TablesPane.java b/Mage.Client/src/main/java/mage/client/table/TablesPane.java similarity index 100% rename from Mage.Client/src/mage/client/table/TablesPane.java rename to Mage.Client/src/main/java/mage/client/table/TablesPane.java diff --git a/Mage.Client/src/mage/client/table/TablesPanel.form b/Mage.Client/src/main/java/mage/client/table/TablesPanel.form similarity index 100% rename from Mage.Client/src/mage/client/table/TablesPanel.form rename to Mage.Client/src/main/java/mage/client/table/TablesPanel.form diff --git a/Mage.Client/src/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java similarity index 100% rename from Mage.Client/src/mage/client/table/TablesPanel.java rename to Mage.Client/src/main/java/mage/client/table/TablesPanel.java diff --git a/Mage.Client/src/mage/client/util/ButtonColumn.java b/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java similarity index 100% rename from Mage.Client/src/mage/client/util/ButtonColumn.java rename to Mage.Client/src/main/java/mage/client/util/ButtonColumn.java diff --git a/Mage.Client/src/mage/client/util/Config.java b/Mage.Client/src/main/java/mage/client/util/Config.java similarity index 100% rename from Mage.Client/src/mage/client/util/Config.java rename to Mage.Client/src/main/java/mage/client/util/Config.java diff --git a/Mage.Client/src/mage/client/util/Constants.java b/Mage.Client/src/main/java/mage/client/util/Constants.java similarity index 100% rename from Mage.Client/src/mage/client/util/Constants.java rename to Mage.Client/src/main/java/mage/client/util/Constants.java diff --git a/Mage.Client/src/mage/client/util/EDTExceptionHandler.java b/Mage.Client/src/main/java/mage/client/util/EDTExceptionHandler.java similarity index 100% rename from Mage.Client/src/mage/client/util/EDTExceptionHandler.java rename to Mage.Client/src/main/java/mage/client/util/EDTExceptionHandler.java diff --git a/Mage.Client/src/mage/client/util/Event.java b/Mage.Client/src/main/java/mage/client/util/Event.java similarity index 100% rename from Mage.Client/src/mage/client/util/Event.java rename to Mage.Client/src/main/java/mage/client/util/Event.java diff --git a/Mage.Client/src/mage/client/util/EventDispatcher.java b/Mage.Client/src/main/java/mage/client/util/EventDispatcher.java similarity index 100% rename from Mage.Client/src/mage/client/util/EventDispatcher.java rename to Mage.Client/src/main/java/mage/client/util/EventDispatcher.java diff --git a/Mage.Client/src/mage/client/util/EventSource.java b/Mage.Client/src/main/java/mage/client/util/EventSource.java similarity index 100% rename from Mage.Client/src/mage/client/util/EventSource.java rename to Mage.Client/src/main/java/mage/client/util/EventSource.java diff --git a/Mage.Client/src/mage/client/util/Frames.java b/Mage.Client/src/main/java/mage/client/util/Frames.java similarity index 100% rename from Mage.Client/src/mage/client/util/Frames.java rename to Mage.Client/src/main/java/mage/client/util/Frames.java diff --git a/Mage.Client/src/mage/client/util/ImageHelper.java b/Mage.Client/src/main/java/mage/client/util/ImageHelper.java similarity index 100% rename from Mage.Client/src/mage/client/util/ImageHelper.java rename to Mage.Client/src/main/java/mage/client/util/ImageHelper.java diff --git a/Mage.Client/src/mage/client/util/Listener.java b/Mage.Client/src/main/java/mage/client/util/Listener.java similarity index 100% rename from Mage.Client/src/mage/client/util/Listener.java rename to Mage.Client/src/main/java/mage/client/util/Listener.java diff --git a/Mage.Client/src/mage/client/util/Symbols.java b/Mage.Client/src/main/java/mage/client/util/Symbols.java similarity index 100% rename from Mage.Client/src/mage/client/util/Symbols.java rename to Mage.Client/src/main/java/mage/client/util/Symbols.java diff --git a/Mage.Client/src/mage/client/util/gui/Arrow.java b/Mage.Client/src/main/java/mage/client/util/gui/Arrow.java similarity index 100% rename from Mage.Client/src/mage/client/util/gui/Arrow.java rename to Mage.Client/src/main/java/mage/client/util/gui/Arrow.java diff --git a/Mage.Client/src/mage/client/util/gui/ArrowBuilder.java b/Mage.Client/src/main/java/mage/client/util/gui/ArrowBuilder.java similarity index 100% rename from Mage.Client/src/mage/client/util/gui/ArrowBuilder.java rename to Mage.Client/src/main/java/mage/client/util/gui/ArrowBuilder.java diff --git a/Mage.Client/src/mage/client/util/gui/ImagePanel.java b/Mage.Client/src/main/java/mage/client/util/gui/ImagePanel.java similarity index 100% rename from Mage.Client/src/mage/client/util/gui/ImagePanel.java rename to Mage.Client/src/main/java/mage/client/util/gui/ImagePanel.java diff --git a/Mage.Client/src/mage/client/util/resources/config.properties b/Mage.Client/src/main/java/mage/client/util/resources/config.properties similarity index 100% rename from Mage.Client/src/mage/client/util/resources/config.properties rename to Mage.Client/src/main/java/mage/client/util/resources/config.properties diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 black.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 black.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 black.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 black.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 blue.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 blue.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 blue.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 blue.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 gold.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 gold.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 gold.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 gold.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 green.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 green.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 green.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 green.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 grey.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 grey.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 grey.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 grey.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 land mana black.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 land mana black.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 land mana black.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 land mana black.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 land mana blue.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 land mana blue.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 land mana blue.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 land mana blue.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 land mana green.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 land mana green.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 land mana green.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 land mana green.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 land mana red.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 land mana red.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 land mana red.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 land mana red.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 land mana white.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 land mana white.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 land mana white.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 land mana white.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 multiland nomana colorless.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 multiland nomana colorless.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 multiland nomana colorless.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 multiland nomana colorless.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 red.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 red.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 red.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 red.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/frame/8 white.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 white.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/frame/8 white.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/frame/8 white.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_left.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_left.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_left.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_left.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_middle.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_middle.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_middle.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_middle.png diff --git a/Mage.Client/src/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_right.png b/Mage.Client/src/main/java/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_right.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_right.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/cards/powerbox/graphic_card_powerbox_a_right.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/black_green.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/black_green.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/black_green.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/black_green.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/black_red.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/black_red.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/black_red.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/black_red.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/blue_black.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/blue_black.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/blue_black.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/blue_black.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/blue_red.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/blue_red.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/blue_red.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/blue_red.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_0.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_0.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_0.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_0.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_1.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_1.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_1.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_1.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_10.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_10.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_10.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_10.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_11.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_11.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_11.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_11.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_12.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_12.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_12.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_12.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_13.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_13.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_13.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_13.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_14.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_14.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_14.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_14.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_15.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_15.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_15.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_15.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_16.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_16.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_16.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_16.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_2.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_2.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_2.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_2.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_3.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_3.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_3.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_3.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_4.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_4.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_4.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_4.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_5.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_5.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_5.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_5.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_6.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_6.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_6.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_6.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_7.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_7.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_7.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_7.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_8.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_8.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_8.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_8.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_9.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_9.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_9.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_9.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/colorless_x.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_x.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/colorless_x.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/colorless_x.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/green_blue.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/green_blue.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/green_blue.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/green_blue.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/green_white.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/green_white.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/green_white.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/green_white.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/mana_black.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/mana_black.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/mana_black.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/mana_black.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/mana_blue.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/mana_blue.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/mana_blue.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/mana_blue.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/mana_green.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/mana_green.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/mana_green.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/mana_green.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/mana_red.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/mana_red.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/mana_red.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/mana_red.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/mana_white.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/mana_white.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/mana_white.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/mana_white.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/red_green.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/red_green.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/red_green.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/red_green.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/red_white.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/red_white.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/red_white.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/red_white.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/two_black.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/two_black.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/two_black.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/two_black.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/two_blue.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/two_blue.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/two_blue.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/two_blue.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/two_green.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/two_green.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/two_green.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/two_green.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/two_red.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/two_red.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/two_red.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/two_red.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/two_white.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/two_white.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/two_white.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/two_white.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/white_black.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/white_black.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/white_black.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/white_black.png diff --git a/Mage.Client/src/mage/client/util/resources/images/symbols/white_blue.png b/Mage.Client/src/main/java/mage/client/util/resources/images/symbols/white_blue.png similarity index 100% rename from Mage.Client/src/mage/client/util/resources/images/symbols/white_blue.png rename to Mage.Client/src/main/java/mage/client/util/resources/images/symbols/white_blue.png diff --git a/Mage.Client/resources/dk_gray.jpg b/Mage.Client/src/main/resources/dk_gray.jpg similarity index 100% rename from Mage.Client/resources/dk_gray.jpg rename to Mage.Client/src/main/resources/dk_gray.jpg