diff --git a/Mage.Common/src/mage/cards/CardBorder.java b/Mage.Common/src/main/java/mage/cards/CardBorder.java
similarity index 100%
rename from Mage.Common/src/mage/cards/CardBorder.java
rename to Mage.Common/src/main/java/mage/cards/CardBorder.java
diff --git a/Mage.Common/src/mage/cards/CardDimensions.java b/Mage.Common/src/main/java/mage/cards/CardDimensions.java
similarity index 100%
rename from Mage.Common/src/mage/cards/CardDimensions.java
rename to Mage.Common/src/main/java/mage/cards/CardDimensions.java
diff --git a/Mage.Common/src/mage/cards/MageCard.java b/Mage.Common/src/main/java/mage/cards/MageCard.java
similarity index 100%
rename from Mage.Common/src/mage/cards/MageCard.java
rename to Mage.Common/src/main/java/mage/cards/MageCard.java
diff --git a/Mage.Common/src/mage/cards/MagePermanent.java b/Mage.Common/src/main/java/mage/cards/MagePermanent.java
similarity index 100%
rename from Mage.Common/src/mage/cards/MagePermanent.java
rename to Mage.Common/src/main/java/mage/cards/MagePermanent.java
diff --git a/Mage.Common/src/mage/cards/TextPopup.form b/Mage.Common/src/main/java/mage/cards/TextPopup.form
similarity index 100%
rename from Mage.Common/src/mage/cards/TextPopup.form
rename to Mage.Common/src/main/java/mage/cards/TextPopup.form
diff --git a/Mage.Common/src/mage/cards/TextPopup.java b/Mage.Common/src/main/java/mage/cards/TextPopup.java
similarity index 100%
rename from Mage.Common/src/mage/cards/TextPopup.java
rename to Mage.Common/src/main/java/mage/cards/TextPopup.java
diff --git a/Mage.Common/src/mage/cards/action/ActionCallback.java b/Mage.Common/src/main/java/mage/cards/action/ActionCallback.java
similarity index 100%
rename from Mage.Common/src/mage/cards/action/ActionCallback.java
rename to Mage.Common/src/main/java/mage/cards/action/ActionCallback.java
diff --git a/Mage.Common/src/mage/cards/action/TransferData.java b/Mage.Common/src/main/java/mage/cards/action/TransferData.java
similarity index 100%
rename from Mage.Common/src/mage/cards/action/TransferData.java
rename to Mage.Common/src/main/java/mage/cards/action/TransferData.java
diff --git a/Mage.Common/src/mage/cards/action/impl/EmptyCallback.java b/Mage.Common/src/main/java/mage/cards/action/impl/EmptyCallback.java
similarity index 100%
rename from Mage.Common/src/mage/cards/action/impl/EmptyCallback.java
rename to Mage.Common/src/main/java/mage/cards/action/impl/EmptyCallback.java
diff --git a/Mage.Common/src/mage/components/CardInfoPane.java b/Mage.Common/src/main/java/mage/components/CardInfoPane.java
similarity index 100%
rename from Mage.Common/src/mage/components/CardInfoPane.java
rename to Mage.Common/src/main/java/mage/components/CardInfoPane.java
diff --git a/Mage.Common/src/mage/components/ImagePanel.java b/Mage.Common/src/main/java/mage/components/ImagePanel.java
similarity index 100%
rename from Mage.Common/src/mage/components/ImagePanel.java
rename to Mage.Common/src/main/java/mage/components/ImagePanel.java
diff --git a/Mage.Common/src/mage/components/ImagePanelStyle.java b/Mage.Common/src/main/java/mage/components/ImagePanelStyle.java
similarity index 100%
rename from Mage.Common/src/mage/components/ImagePanelStyle.java
rename to Mage.Common/src/main/java/mage/components/ImagePanelStyle.java
diff --git a/Mage.Common/src/mage/constants/Constants.java b/Mage.Common/src/main/java/mage/constants/Constants.java
similarity index 100%
rename from Mage.Common/src/mage/constants/Constants.java
rename to Mage.Common/src/main/java/mage/constants/Constants.java
diff --git a/Mage.Common/src/mage/db/EntityManager.java b/Mage.Common/src/main/java/mage/db/EntityManager.java
similarity index 100%
rename from Mage.Common/src/mage/db/EntityManager.java
rename to Mage.Common/src/main/java/mage/db/EntityManager.java
diff --git a/Mage.Common/src/mage/db/EntityManagerTest.java b/Mage.Common/src/main/java/mage/db/EntityManagerTest.java
similarity index 100%
rename from Mage.Common/src/mage/db/EntityManagerTest.java
rename to Mage.Common/src/main/java/mage/db/EntityManagerTest.java
diff --git a/Mage.Common/src/mage/db/Statistics.java b/Mage.Common/src/main/java/mage/db/Statistics.java
similarity index 100%
rename from Mage.Common/src/mage/db/Statistics.java
rename to Mage.Common/src/main/java/mage/db/Statistics.java
diff --git a/Mage.Common/src/mage/db/model/Feedback.java b/Mage.Common/src/main/java/mage/db/model/Feedback.java
similarity index 100%
rename from Mage.Common/src/mage/db/model/Feedback.java
rename to Mage.Common/src/main/java/mage/db/model/Feedback.java
diff --git a/Mage.Common/src/mage/db/model/Log.java b/Mage.Common/src/main/java/mage/db/model/Log.java
similarity index 100%
rename from Mage.Common/src/mage/db/model/Log.java
rename to Mage.Common/src/main/java/mage/db/model/Log.java
diff --git a/Mage.Common/src/mage/filters/MageBufferedImageOp.java b/Mage.Common/src/main/java/mage/filters/MageBufferedImageOp.java
similarity index 100%
rename from Mage.Common/src/mage/filters/MageBufferedImageOp.java
rename to Mage.Common/src/main/java/mage/filters/MageBufferedImageOp.java
diff --git a/Mage.Common/src/mage/interfaces/Action.java b/Mage.Common/src/main/java/mage/interfaces/Action.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/Action.java
rename to Mage.Common/src/main/java/mage/interfaces/Action.java
diff --git a/Mage.Common/src/mage/interfaces/ActionWithResult.java b/Mage.Common/src/main/java/mage/interfaces/ActionWithResult.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/ActionWithResult.java
rename to Mage.Common/src/main/java/mage/interfaces/ActionWithResult.java
diff --git a/Mage.Common/src/mage/interfaces/MageClient.java b/Mage.Common/src/main/java/mage/interfaces/MageClient.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/MageClient.java
rename to Mage.Common/src/main/java/mage/interfaces/MageClient.java
diff --git a/Mage.Common/src/mage/interfaces/MageServer.java b/Mage.Common/src/main/java/mage/interfaces/MageServer.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/MageServer.java
rename to Mage.Common/src/main/java/mage/interfaces/MageServer.java
diff --git a/Mage.Common/src/mage/interfaces/PluginException.java b/Mage.Common/src/main/java/mage/interfaces/PluginException.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/PluginException.java
rename to Mage.Common/src/main/java/mage/interfaces/PluginException.java
diff --git a/Mage.Common/src/mage/interfaces/ServerState.java b/Mage.Common/src/main/java/mage/interfaces/ServerState.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/ServerState.java
rename to Mage.Common/src/main/java/mage/interfaces/ServerState.java
diff --git a/Mage.Common/src/mage/interfaces/callback/CallbackClient.java b/Mage.Common/src/main/java/mage/interfaces/callback/CallbackClient.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/callback/CallbackClient.java
rename to Mage.Common/src/main/java/mage/interfaces/callback/CallbackClient.java
diff --git a/Mage.Common/src/mage/interfaces/callback/ClientCallback.java b/Mage.Common/src/main/java/mage/interfaces/callback/ClientCallback.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/callback/ClientCallback.java
rename to Mage.Common/src/main/java/mage/interfaces/callback/ClientCallback.java
diff --git a/Mage.Common/src/mage/interfaces/callback/ClientCallbackMethod.java b/Mage.Common/src/main/java/mage/interfaces/callback/ClientCallbackMethod.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/callback/ClientCallbackMethod.java
rename to Mage.Common/src/main/java/mage/interfaces/callback/ClientCallbackMethod.java
diff --git a/Mage.Common/src/mage/interfaces/plugin/CardPlugin.java b/Mage.Common/src/main/java/mage/interfaces/plugin/CardPlugin.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/plugin/CardPlugin.java
rename to Mage.Common/src/main/java/mage/interfaces/plugin/CardPlugin.java
diff --git a/Mage.Common/src/mage/interfaces/plugin/CounterPlugin.java b/Mage.Common/src/main/java/mage/interfaces/plugin/CounterPlugin.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/plugin/CounterPlugin.java
rename to Mage.Common/src/main/java/mage/interfaces/plugin/CounterPlugin.java
diff --git a/Mage.Common/src/mage/interfaces/plugin/ThemePlugin.java b/Mage.Common/src/main/java/mage/interfaces/plugin/ThemePlugin.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/plugin/ThemePlugin.java
rename to Mage.Common/src/main/java/mage/interfaces/plugin/ThemePlugin.java
diff --git a/Mage.Common/src/mage/interfaces/rate/RateCallback.java b/Mage.Common/src/main/java/mage/interfaces/rate/RateCallback.java
similarity index 100%
rename from Mage.Common/src/mage/interfaces/rate/RateCallback.java
rename to Mage.Common/src/main/java/mage/interfaces/rate/RateCallback.java
diff --git a/Mage.Common/src/mage/remote/Connection.java b/Mage.Common/src/main/java/mage/remote/Connection.java
similarity index 100%
rename from Mage.Common/src/mage/remote/Connection.java
rename to Mage.Common/src/main/java/mage/remote/Connection.java
diff --git a/Mage.Common/src/mage/remote/MageRemoteException.java b/Mage.Common/src/main/java/mage/remote/MageRemoteException.java
similarity index 100%
rename from Mage.Common/src/mage/remote/MageRemoteException.java
rename to Mage.Common/src/main/java/mage/remote/MageRemoteException.java
diff --git a/Mage.Common/src/mage/remote/MageVersionException.java b/Mage.Common/src/main/java/mage/remote/MageVersionException.java
similarity index 100%
rename from Mage.Common/src/mage/remote/MageVersionException.java
rename to Mage.Common/src/main/java/mage/remote/MageVersionException.java
diff --git a/Mage.Common/src/mage/remote/Session.java b/Mage.Common/src/main/java/mage/remote/Session.java
similarity index 100%
rename from Mage.Common/src/mage/remote/Session.java
rename to Mage.Common/src/main/java/mage/remote/Session.java
diff --git a/Mage.Common/src/mage/remote/SessionImpl.java b/Mage.Common/src/main/java/mage/remote/SessionImpl.java
similarity index 100%
rename from Mage.Common/src/mage/remote/SessionImpl.java
rename to Mage.Common/src/main/java/mage/remote/SessionImpl.java
diff --git a/Mage.Common/src/mage/remote/interfaces/ChatSession.java b/Mage.Common/src/main/java/mage/remote/interfaces/ChatSession.java
similarity index 100%
rename from Mage.Common/src/mage/remote/interfaces/ChatSession.java
rename to Mage.Common/src/main/java/mage/remote/interfaces/ChatSession.java
diff --git a/Mage.Common/src/mage/remote/interfaces/ClientData.java b/Mage.Common/src/main/java/mage/remote/interfaces/ClientData.java
similarity index 100%
rename from Mage.Common/src/mage/remote/interfaces/ClientData.java
rename to Mage.Common/src/main/java/mage/remote/interfaces/ClientData.java
diff --git a/Mage.Common/src/mage/remote/interfaces/Connect.java b/Mage.Common/src/main/java/mage/remote/interfaces/Connect.java
similarity index 100%
rename from Mage.Common/src/mage/remote/interfaces/Connect.java
rename to Mage.Common/src/main/java/mage/remote/interfaces/Connect.java
diff --git a/Mage.Common/src/mage/remote/interfaces/Feedback.java b/Mage.Common/src/main/java/mage/remote/interfaces/Feedback.java
similarity index 100%
rename from Mage.Common/src/mage/remote/interfaces/Feedback.java
rename to Mage.Common/src/main/java/mage/remote/interfaces/Feedback.java
diff --git a/Mage.Common/src/mage/remote/interfaces/GamePlay.java b/Mage.Common/src/main/java/mage/remote/interfaces/GamePlay.java
similarity index 100%
rename from Mage.Common/src/mage/remote/interfaces/GamePlay.java
rename to Mage.Common/src/main/java/mage/remote/interfaces/GamePlay.java
diff --git a/Mage.Common/src/mage/remote/interfaces/GameTypes.java b/Mage.Common/src/main/java/mage/remote/interfaces/GameTypes.java
similarity index 100%
rename from Mage.Common/src/mage/remote/interfaces/GameTypes.java
rename to Mage.Common/src/main/java/mage/remote/interfaces/GameTypes.java
diff --git a/Mage.Common/src/mage/remote/interfaces/PlayerActions.java b/Mage.Common/src/main/java/mage/remote/interfaces/PlayerActions.java
similarity index 100%
rename from Mage.Common/src/mage/remote/interfaces/PlayerActions.java
rename to Mage.Common/src/main/java/mage/remote/interfaces/PlayerActions.java
diff --git a/Mage.Common/src/mage/remote/interfaces/Replays.java b/Mage.Common/src/main/java/mage/remote/interfaces/Replays.java
similarity index 100%
rename from Mage.Common/src/mage/remote/interfaces/Replays.java
rename to Mage.Common/src/main/java/mage/remote/interfaces/Replays.java
diff --git a/Mage.Common/src/mage/remote/interfaces/ServerState.java b/Mage.Common/src/main/java/mage/remote/interfaces/ServerState.java
similarity index 100%
rename from Mage.Common/src/mage/remote/interfaces/ServerState.java
rename to Mage.Common/src/main/java/mage/remote/interfaces/ServerState.java
diff --git a/Mage.Common/src/mage/remote/interfaces/Testable.java b/Mage.Common/src/main/java/mage/remote/interfaces/Testable.java
similarity index 100%
rename from Mage.Common/src/mage/remote/interfaces/Testable.java
rename to Mage.Common/src/main/java/mage/remote/interfaces/Testable.java
diff --git a/Mage.Common/src/mage/remote/traffic/ZippedObject.java b/Mage.Common/src/main/java/mage/remote/traffic/ZippedObject.java
similarity index 100%
rename from Mage.Common/src/mage/remote/traffic/ZippedObject.java
rename to Mage.Common/src/main/java/mage/remote/traffic/ZippedObject.java
diff --git a/Mage.Common/src/mage/remote/traffic/ZippedObjectImpl.java b/Mage.Common/src/main/java/mage/remote/traffic/ZippedObjectImpl.java
similarity index 100%
rename from Mage.Common/src/mage/remote/traffic/ZippedObjectImpl.java
rename to Mage.Common/src/main/java/mage/remote/traffic/ZippedObjectImpl.java
diff --git a/Mage.Common/src/mage/utils/ActionWithBooleanResult.java b/Mage.Common/src/main/java/mage/utils/ActionWithBooleanResult.java
similarity index 100%
rename from Mage.Common/src/mage/utils/ActionWithBooleanResult.java
rename to Mage.Common/src/main/java/mage/utils/ActionWithBooleanResult.java
diff --git a/Mage.Common/src/mage/utils/ActionWithNullNegativeResult.java b/Mage.Common/src/main/java/mage/utils/ActionWithNullNegativeResult.java
similarity index 100%
rename from Mage.Common/src/mage/utils/ActionWithNullNegativeResult.java
rename to Mage.Common/src/main/java/mage/utils/ActionWithNullNegativeResult.java
diff --git a/Mage.Common/src/mage/utils/ActionWithTableViewResult.java b/Mage.Common/src/main/java/mage/utils/ActionWithTableViewResult.java
similarity index 100%
rename from Mage.Common/src/mage/utils/ActionWithTableViewResult.java
rename to Mage.Common/src/main/java/mage/utils/ActionWithTableViewResult.java
diff --git a/Mage.Common/src/mage/utils/ActionWithUUIDResult.java b/Mage.Common/src/main/java/mage/utils/ActionWithUUIDResult.java
similarity index 100%
rename from Mage.Common/src/mage/utils/ActionWithUUIDResult.java
rename to Mage.Common/src/main/java/mage/utils/ActionWithUUIDResult.java
diff --git a/Mage.Common/src/mage/utils/CardUtil.java b/Mage.Common/src/main/java/mage/utils/CardUtil.java
similarity index 100%
rename from Mage.Common/src/mage/utils/CardUtil.java
rename to Mage.Common/src/main/java/mage/utils/CardUtil.java
diff --git a/Mage.Common/src/mage/utils/CompressUtil.java b/Mage.Common/src/main/java/mage/utils/CompressUtil.java
similarity index 100%
rename from Mage.Common/src/mage/utils/CompressUtil.java
rename to Mage.Common/src/main/java/mage/utils/CompressUtil.java
diff --git a/Mage.Common/src/mage/utils/DeckBuilder.java b/Mage.Common/src/main/java/mage/utils/DeckBuilder.java
similarity index 100%
rename from Mage.Common/src/mage/utils/DeckBuilder.java
rename to Mage.Common/src/main/java/mage/utils/DeckBuilder.java
diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/main/java/mage/utils/MageVersion.java
similarity index 100%
rename from Mage.Common/src/mage/utils/MageVersion.java
rename to Mage.Common/src/main/java/mage/utils/MageVersion.java
diff --git a/Mage.Common/src/mage/utils/ThreadUtils.java b/Mage.Common/src/main/java/mage/utils/ThreadUtils.java
similarity index 100%
rename from Mage.Common/src/mage/utils/ThreadUtils.java
rename to Mage.Common/src/main/java/mage/utils/ThreadUtils.java
diff --git a/Mage.Common/src/mage/utils/properties/PropertiesUtil.java b/Mage.Common/src/main/java/mage/utils/properties/PropertiesUtil.java
similarity index 100%
rename from Mage.Common/src/mage/utils/properties/PropertiesUtil.java
rename to Mage.Common/src/main/java/mage/utils/properties/PropertiesUtil.java
diff --git a/Mage.Common/src/mage/utils/properties/PropertyKeys.java b/Mage.Common/src/main/java/mage/utils/properties/PropertyKeys.java
similarity index 100%
rename from Mage.Common/src/mage/utils/properties/PropertyKeys.java
rename to Mage.Common/src/main/java/mage/utils/properties/PropertyKeys.java
diff --git a/Mage.Common/src/mage/utils/timer/PriorityTimer.java b/Mage.Common/src/main/java/mage/utils/timer/PriorityTimer.java
similarity index 100%
rename from Mage.Common/src/mage/utils/timer/PriorityTimer.java
rename to Mage.Common/src/main/java/mage/utils/timer/PriorityTimer.java
diff --git a/Mage.Common/src/mage/view/AbilityPickerView.java b/Mage.Common/src/main/java/mage/view/AbilityPickerView.java
similarity index 100%
rename from Mage.Common/src/mage/view/AbilityPickerView.java
rename to Mage.Common/src/main/java/mage/view/AbilityPickerView.java
diff --git a/Mage.Common/src/mage/view/AbilityView.java b/Mage.Common/src/main/java/mage/view/AbilityView.java
similarity index 100%
rename from Mage.Common/src/mage/view/AbilityView.java
rename to Mage.Common/src/main/java/mage/view/AbilityView.java
diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/main/java/mage/view/CardView.java
similarity index 100%
rename from Mage.Common/src/mage/view/CardView.java
rename to Mage.Common/src/main/java/mage/view/CardView.java
diff --git a/Mage.Common/src/mage/view/CardsView.java b/Mage.Common/src/main/java/mage/view/CardsView.java
similarity index 100%
rename from Mage.Common/src/mage/view/CardsView.java
rename to Mage.Common/src/main/java/mage/view/CardsView.java
diff --git a/Mage.Common/src/mage/view/ChatMessage.java b/Mage.Common/src/main/java/mage/view/ChatMessage.java
similarity index 100%
rename from Mage.Common/src/mage/view/ChatMessage.java
rename to Mage.Common/src/main/java/mage/view/ChatMessage.java
diff --git a/Mage.Common/src/mage/view/CombatGroupView.java b/Mage.Common/src/main/java/mage/view/CombatGroupView.java
similarity index 100%
rename from Mage.Common/src/mage/view/CombatGroupView.java
rename to Mage.Common/src/main/java/mage/view/CombatGroupView.java
diff --git a/Mage.Common/src/mage/view/CommandObjectView.java b/Mage.Common/src/main/java/mage/view/CommandObjectView.java
similarity index 100%
rename from Mage.Common/src/mage/view/CommandObjectView.java
rename to Mage.Common/src/main/java/mage/view/CommandObjectView.java
diff --git a/Mage.Common/src/mage/view/CommanderView.java b/Mage.Common/src/main/java/mage/view/CommanderView.java
similarity index 100%
rename from Mage.Common/src/mage/view/CommanderView.java
rename to Mage.Common/src/main/java/mage/view/CommanderView.java
diff --git a/Mage.Common/src/mage/view/CounterView.java b/Mage.Common/src/main/java/mage/view/CounterView.java
similarity index 100%
rename from Mage.Common/src/mage/view/CounterView.java
rename to Mage.Common/src/main/java/mage/view/CounterView.java
diff --git a/Mage.Common/src/mage/view/DeckView.java b/Mage.Common/src/main/java/mage/view/DeckView.java
similarity index 100%
rename from Mage.Common/src/mage/view/DeckView.java
rename to Mage.Common/src/main/java/mage/view/DeckView.java
diff --git a/Mage.Common/src/mage/view/DraftClientMessage.java b/Mage.Common/src/main/java/mage/view/DraftClientMessage.java
similarity index 100%
rename from Mage.Common/src/mage/view/DraftClientMessage.java
rename to Mage.Common/src/main/java/mage/view/DraftClientMessage.java
diff --git a/Mage.Common/src/mage/view/DraftPickView.java b/Mage.Common/src/main/java/mage/view/DraftPickView.java
similarity index 100%
rename from Mage.Common/src/mage/view/DraftPickView.java
rename to Mage.Common/src/main/java/mage/view/DraftPickView.java
diff --git a/Mage.Common/src/mage/view/DraftView.java b/Mage.Common/src/main/java/mage/view/DraftView.java
similarity index 100%
rename from Mage.Common/src/mage/view/DraftView.java
rename to Mage.Common/src/main/java/mage/view/DraftView.java
diff --git a/Mage.Common/src/mage/view/EmblemView.java b/Mage.Common/src/main/java/mage/view/EmblemView.java
similarity index 100%
rename from Mage.Common/src/mage/view/EmblemView.java
rename to Mage.Common/src/main/java/mage/view/EmblemView.java
diff --git a/Mage.Common/src/mage/view/ExileView.java b/Mage.Common/src/main/java/mage/view/ExileView.java
similarity index 100%
rename from Mage.Common/src/mage/view/ExileView.java
rename to Mage.Common/src/main/java/mage/view/ExileView.java
diff --git a/Mage.Common/src/mage/view/GameClientMessage.java b/Mage.Common/src/main/java/mage/view/GameClientMessage.java
similarity index 100%
rename from Mage.Common/src/mage/view/GameClientMessage.java
rename to Mage.Common/src/main/java/mage/view/GameClientMessage.java
diff --git a/Mage.Common/src/mage/view/GameEndView.java b/Mage.Common/src/main/java/mage/view/GameEndView.java
similarity index 100%
rename from Mage.Common/src/mage/view/GameEndView.java
rename to Mage.Common/src/main/java/mage/view/GameEndView.java
diff --git a/Mage.Common/src/mage/view/GameTypeView.java b/Mage.Common/src/main/java/mage/view/GameTypeView.java
similarity index 100%
rename from Mage.Common/src/mage/view/GameTypeView.java
rename to Mage.Common/src/main/java/mage/view/GameTypeView.java
diff --git a/Mage.Common/src/mage/view/GameView.java b/Mage.Common/src/main/java/mage/view/GameView.java
similarity index 100%
rename from Mage.Common/src/mage/view/GameView.java
rename to Mage.Common/src/main/java/mage/view/GameView.java
diff --git a/Mage.Common/src/mage/view/LookedAtView.java b/Mage.Common/src/main/java/mage/view/LookedAtView.java
similarity index 100%
rename from Mage.Common/src/mage/view/LookedAtView.java
rename to Mage.Common/src/main/java/mage/view/LookedAtView.java
diff --git a/Mage.Common/src/mage/view/ManaPoolView.java b/Mage.Common/src/main/java/mage/view/ManaPoolView.java
similarity index 100%
rename from Mage.Common/src/mage/view/ManaPoolView.java
rename to Mage.Common/src/main/java/mage/view/ManaPoolView.java
diff --git a/Mage.Common/src/mage/view/MatchView.java b/Mage.Common/src/main/java/mage/view/MatchView.java
similarity index 100%
rename from Mage.Common/src/mage/view/MatchView.java
rename to Mage.Common/src/main/java/mage/view/MatchView.java
diff --git a/Mage.Common/src/mage/view/PermanentView.java b/Mage.Common/src/main/java/mage/view/PermanentView.java
similarity index 100%
rename from Mage.Common/src/mage/view/PermanentView.java
rename to Mage.Common/src/main/java/mage/view/PermanentView.java
diff --git a/Mage.Common/src/mage/view/PlayerView.java b/Mage.Common/src/main/java/mage/view/PlayerView.java
similarity index 100%
rename from Mage.Common/src/mage/view/PlayerView.java
rename to Mage.Common/src/main/java/mage/view/PlayerView.java
diff --git a/Mage.Common/src/mage/view/RevealedView.java b/Mage.Common/src/main/java/mage/view/RevealedView.java
similarity index 100%
rename from Mage.Common/src/mage/view/RevealedView.java
rename to Mage.Common/src/main/java/mage/view/RevealedView.java
diff --git a/Mage.Common/src/mage/view/RoomUsersView.java b/Mage.Common/src/main/java/mage/view/RoomUsersView.java
similarity index 100%
rename from Mage.Common/src/mage/view/RoomUsersView.java
rename to Mage.Common/src/main/java/mage/view/RoomUsersView.java
diff --git a/Mage.Common/src/mage/view/RoundView.java b/Mage.Common/src/main/java/mage/view/RoundView.java
similarity index 100%
rename from Mage.Common/src/mage/view/RoundView.java
rename to Mage.Common/src/main/java/mage/view/RoundView.java
diff --git a/Mage.Common/src/mage/view/SeatView.java b/Mage.Common/src/main/java/mage/view/SeatView.java
similarity index 100%
rename from Mage.Common/src/mage/view/SeatView.java
rename to Mage.Common/src/main/java/mage/view/SeatView.java
diff --git a/Mage.Common/src/mage/view/SimpleCardView.java b/Mage.Common/src/main/java/mage/view/SimpleCardView.java
similarity index 100%
rename from Mage.Common/src/mage/view/SimpleCardView.java
rename to Mage.Common/src/main/java/mage/view/SimpleCardView.java
diff --git a/Mage.Common/src/mage/view/SimpleCardsView.java b/Mage.Common/src/main/java/mage/view/SimpleCardsView.java
similarity index 100%
rename from Mage.Common/src/mage/view/SimpleCardsView.java
rename to Mage.Common/src/main/java/mage/view/SimpleCardsView.java
diff --git a/Mage.Common/src/mage/view/StackAbilityView.java b/Mage.Common/src/main/java/mage/view/StackAbilityView.java
similarity index 100%
rename from Mage.Common/src/mage/view/StackAbilityView.java
rename to Mage.Common/src/main/java/mage/view/StackAbilityView.java
diff --git a/Mage.Common/src/mage/view/TableClientMessage.java b/Mage.Common/src/main/java/mage/view/TableClientMessage.java
similarity index 100%
rename from Mage.Common/src/mage/view/TableClientMessage.java
rename to Mage.Common/src/main/java/mage/view/TableClientMessage.java
diff --git a/Mage.Common/src/mage/view/TableView.java b/Mage.Common/src/main/java/mage/view/TableView.java
similarity index 100%
rename from Mage.Common/src/mage/view/TableView.java
rename to Mage.Common/src/main/java/mage/view/TableView.java
diff --git a/Mage.Common/src/mage/view/TournamentGameView.java b/Mage.Common/src/main/java/mage/view/TournamentGameView.java
similarity index 100%
rename from Mage.Common/src/mage/view/TournamentGameView.java
rename to Mage.Common/src/main/java/mage/view/TournamentGameView.java
diff --git a/Mage.Common/src/mage/view/TournamentPlayerView.java b/Mage.Common/src/main/java/mage/view/TournamentPlayerView.java
similarity index 100%
rename from Mage.Common/src/mage/view/TournamentPlayerView.java
rename to Mage.Common/src/main/java/mage/view/TournamentPlayerView.java
diff --git a/Mage.Common/src/mage/view/TournamentTypeView.java b/Mage.Common/src/main/java/mage/view/TournamentTypeView.java
similarity index 100%
rename from Mage.Common/src/mage/view/TournamentTypeView.java
rename to Mage.Common/src/main/java/mage/view/TournamentTypeView.java
diff --git a/Mage.Common/src/mage/view/TournamentView.java b/Mage.Common/src/main/java/mage/view/TournamentView.java
similarity index 100%
rename from Mage.Common/src/mage/view/TournamentView.java
rename to Mage.Common/src/main/java/mage/view/TournamentView.java
diff --git a/Mage.Common/src/mage/view/UserDataView.java b/Mage.Common/src/main/java/mage/view/UserDataView.java
similarity index 100%
rename from Mage.Common/src/mage/view/UserDataView.java
rename to Mage.Common/src/main/java/mage/view/UserDataView.java
diff --git a/Mage.Common/src/mage/view/UserRequestMessage.java b/Mage.Common/src/main/java/mage/view/UserRequestMessage.java
similarity index 100%
rename from Mage.Common/src/mage/view/UserRequestMessage.java
rename to Mage.Common/src/main/java/mage/view/UserRequestMessage.java
diff --git a/Mage.Common/src/mage/view/UserView.java b/Mage.Common/src/main/java/mage/view/UserView.java
similarity index 100%
rename from Mage.Common/src/mage/view/UserView.java
rename to Mage.Common/src/main/java/mage/view/UserView.java
diff --git a/Mage.Common/src/mage/view/UsersView.java b/Mage.Common/src/main/java/mage/view/UsersView.java
similarity index 100%
rename from Mage.Common/src/mage/view/UsersView.java
rename to Mage.Common/src/main/java/mage/view/UsersView.java