diff --git a/.gitattributes b/.gitattributes
index b05b9215d89..055c1872f0c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -629,6 +629,31 @@ forge-game/src/main/java/forge/game/zone/package-info.java svneol=native#text/pl
 forge-game/src/main/java/forge/package-info.java -text
 forge-game/src/main/java/forge/util/Expressions.java -text
 forge-game/src/main/java/forge/util/package-info.java -text
+forge-gui-android/.classpath -text
+forge-gui-android/.project -text
+forge-gui-android/.settings/org.eclipse.jdt.core.prefs -text
+forge-gui-android/AndroidManifest.xml -text
+forge-gui-android/gen/com/forge/BuildConfig.java -text
+forge-gui-android/gen/com/forge/R.java -text
+forge-gui-android/ic_launcher-web.png -text
+forge-gui-android/libs/android-support-v4.jar -text
+forge-gui-android/libs/gdx-backend-android.jar -text
+forge-gui-android/proguard-project.txt -text
+forge-gui-android/project.properties -text
+forge-gui-android/res/drawable-hdpi/ic_launcher.png -text
+forge-gui-android/res/drawable-mdpi/ic_launcher.png -text
+forge-gui-android/res/drawable-xhdpi/ic_launcher.png -text
+forge-gui-android/res/drawable-xxhdpi/ic_launcher.png -text
+forge-gui-android/res/layout/activity_main.xml -text
+forge-gui-android/res/menu/main.xml -text
+forge-gui-android/res/values-sw600dp/dimens.xml -text
+forge-gui-android/res/values-sw720dp-land/dimens.xml -text
+forge-gui-android/res/values-v11/styles.xml -text
+forge-gui-android/res/values-v14/styles.xml -text
+forge-gui-android/res/values/dimens.xml -text
+forge-gui-android/res/values/strings.xml -text
+forge-gui-android/res/values/styles.xml -text
+forge-gui-android/src/com/forge/Main.java -text
 forge-gui-desktop/.classpath -text
 forge-gui-desktop/.project -text
 forge-gui-desktop/.settings/org.eclipse.core.resources.prefs -text
@@ -1020,6 +1045,271 @@ forge-gui-desktop/src/test/java/forge/gui/ListChooserTest.java -text
 forge-gui-desktop/src/test/java/forge/gui/game/CardDetailPanelTest.java -text
 forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java -text
 forge-gui-desktop/src/test/java/forge/model/FModelTest.java -text
+forge-gui-mobile-dev/.classpath -text
+forge-gui-mobile-dev/.project -text
+forge-gui-mobile-dev/.settings/org.eclipse.jdt.core.prefs -text
+forge-gui-mobile-dev/libs/gdx-backend-lwjgl-natives.jar -text
+forge-gui-mobile-dev/libs/gdx-backend-lwjgl.jar -text
+forge-gui-mobile-dev/libs/gdx-freetype-natives.jar -text
+forge-gui-mobile-dev/libs/gdx-natives.jar -text
+forge-gui-mobile-dev/src/forge/view/Main.java -text
+forge-gui-mobile/.classpath -text
+forge-gui-mobile/.project -text
+forge-gui-mobile/.settings/org.eclipse.jdt.core.prefs -text
+forge-gui-mobile/.settings/org.eclipse.m2e.core.prefs -text
+forge-gui-mobile/libs/gdx-freetype.jar -text
+forge-gui-mobile/libs/gdx-sources.jar -text
+forge-gui-mobile/libs/gdx.jar -text
+forge-gui-mobile/pom.xml -text
+forge-gui-mobile/src/forge/FThreads.java -text
+forge-gui-mobile/src/forge/Forge.java -text
+forge-gui-mobile/src/forge/assets/CardFaceSymbols.java -text
+forge-gui-mobile/src/forge/assets/FImage.java -text
+forge-gui-mobile/src/forge/assets/FSkin.java -text
+forge-gui-mobile/src/forge/assets/FSkinColor.java -text
+forge-gui-mobile/src/forge/assets/FSkinFont.java -text
+forge-gui-mobile/src/forge/assets/FSkinImage.java -text
+forge-gui-mobile/src/forge/assets/FSkinTexture.java -text
+forge-gui-mobile/src/forge/assets/FTextureImage.java -text
+forge-gui-mobile/src/forge/assets/FTextureRegionImage.java -text
+forge-gui-mobile/src/forge/assets/ImageCache.java -text
+forge-gui-mobile/src/forge/assets/ImageLoader.java -text
+forge-gui-mobile/src/forge/deck/DeckProxy.java -text
+forge-gui-mobile/src/forge/deck/DeckType.java -text
+forge-gui-mobile/src/forge/deck/DeckgenUtil.java -text
+forge-gui-mobile/src/forge/deck/FDeckChooser.java -text
+forge-gui-mobile/src/forge/deck/FDeckViewer.java -text
+forge-gui-mobile/src/forge/deck/io/DeckPreferences.java -text
+forge-gui-mobile/src/forge/deck/io/OldDeckParser.java -text
+forge-gui-mobile/src/forge/error/BugReporter.java -text
+forge-gui-mobile/src/forge/error/ExceptionHandler.java -text
+forge-gui-mobile/src/forge/guantlet/GauntletData.java -text
+forge-gui-mobile/src/forge/guantlet/GauntletIO.java -text
+forge-gui-mobile/src/forge/itemmanager/CardManager.java -text
+forge-gui-mobile/src/forge/itemmanager/DeckManager.java -text
+forge-gui-mobile/src/forge/itemmanager/ItemManager.java -text
+forge-gui-mobile/src/forge/itemmanager/ItemManagerConfig.java -text
+forge-gui-mobile/src/forge/itemmanager/ItemManagerModel.java -text
+forge-gui-mobile/src/forge/itemmanager/SFilterUtil.java -text
+forge-gui-mobile/src/forge/itemmanager/SItemManagerUtil.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/CardCMCRangeFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/CardColorFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/CardFormatFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/CardSearchFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/CardSetFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/DeckColorFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/DeckFormatFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/DeckSearchFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/DeckSetFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/DeckStatTypeFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/ItemFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java -text
+forge-gui-mobile/src/forge/itemmanager/views/ColorSetRenderer.java -text
+forge-gui-mobile/src/forge/itemmanager/views/ColumnDef.java -text
+forge-gui-mobile/src/forge/itemmanager/views/DeckStarRenderer.java -text
+forge-gui-mobile/src/forge/itemmanager/views/GroupDef.java -text
+forge-gui-mobile/src/forge/itemmanager/views/ImageView.java -text
+forge-gui-mobile/src/forge/itemmanager/views/IntegerRenderer.java -text
+forge-gui-mobile/src/forge/itemmanager/views/ItemCellRenderer.java -text
+forge-gui-mobile/src/forge/itemmanager/views/ItemColumn.java -text
+forge-gui-mobile/src/forge/itemmanager/views/ItemColumnConfig.java -text
+forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java -text
+forge-gui-mobile/src/forge/itemmanager/views/ItemView.java -text
+forge-gui-mobile/src/forge/itemmanager/views/ManaCostRenderer.java -text
+forge-gui-mobile/src/forge/itemmanager/views/SColumnUtil.java -text
+forge-gui-mobile/src/forge/itemmanager/views/StarRenderer.java -text
+forge-gui-mobile/src/forge/limited/CustomLimited.java -text
+forge-gui-mobile/src/forge/limited/DraftRankCache.java -text
+forge-gui-mobile/src/forge/limited/GauntletMini.java -text
+forge-gui-mobile/src/forge/limited/ReadDraftRankings.java -text
+forge-gui-mobile/src/forge/menu/FDropDown.java -text
+forge-gui-mobile/src/forge/menu/FDropDownMenu.java -text
+forge-gui-mobile/src/forge/menu/FMenuBar.java -text
+forge-gui-mobile/src/forge/menu/FMenuItem.java -text
+forge-gui-mobile/src/forge/menu/FMenuTab.java -text
+forge-gui-mobile/src/forge/menu/FPopupMenu.java -text
+forge-gui-mobile/src/forge/menu/FSubMenu.java -text
+forge-gui-mobile/src/forge/menu/FTooltip.java -text
+forge-gui-mobile/src/forge/model/CardBlock.java -text
+forge-gui-mobile/src/forge/model/CardCollections.java -text
+forge-gui-mobile/src/forge/model/FModel.java -text
+forge-gui-mobile/src/forge/model/MetaSet.java -text
+forge-gui-mobile/src/forge/model/UnOpenedMeta.java -text
+forge-gui-mobile/src/forge/net/FServer.java -text
+forge-gui-mobile/src/forge/net/IClientSocket.java -text
+forge-gui-mobile/src/forge/net/IConnectionObserver.java -text
+forge-gui-mobile/src/forge/net/Lobby.java -text
+forge-gui-mobile/src/forge/net/LobbyPlayerRemote.java -text
+forge-gui-mobile/src/forge/net/client/INetClient.java -text
+forge-gui-mobile/src/forge/net/client/InvalidFieldInPacketException.java -text
+forge-gui-mobile/src/forge/net/client/NetClient.java -text
+forge-gui-mobile/src/forge/net/client/state/ConnectedClientState.java -text
+forge-gui-mobile/src/forge/net/client/state/IClientState.java -text
+forge-gui-mobile/src/forge/net/client/state/InLobbyClientState.java -text
+forge-gui-mobile/src/forge/net/client/state/UnauthorizedClientState.java -text
+forge-gui-mobile/src/forge/player/HumanCostDecision.java -text
+forge-gui-mobile/src/forge/player/HumanPlay.java -text
+forge-gui-mobile/src/forge/player/HumanPlaySpellAbility.java -text
+forge-gui-mobile/src/forge/player/LobbyPlayerHuman.java -text
+forge-gui-mobile/src/forge/player/PlayerControllerHuman.java -text
+forge-gui-mobile/src/forge/player/TargetSelection.java -text
+forge-gui-mobile/src/forge/quest/BoosterUtils.java -text
+forge-gui-mobile/src/forge/quest/IQuestRewardCard.java -text
+forge-gui-mobile/src/forge/quest/QuestController.java -text
+forge-gui-mobile/src/forge/quest/QuestDeckMap.java -text
+forge-gui-mobile/src/forge/quest/QuestEvent.java -text
+forge-gui-mobile/src/forge/quest/QuestEventChallenge.java -text
+forge-gui-mobile/src/forge/quest/QuestEventDifficulty.java -text
+forge-gui-mobile/src/forge/quest/QuestEventDuel.java -text
+forge-gui-mobile/src/forge/quest/QuestEventDuelManager.java -text
+forge-gui-mobile/src/forge/quest/QuestMode.java -text
+forge-gui-mobile/src/forge/quest/QuestRewardCard.java -text
+forge-gui-mobile/src/forge/quest/QuestRewardCardChooser.java -text
+forge-gui-mobile/src/forge/quest/QuestRewardCardDuplicate.java -text
+forge-gui-mobile/src/forge/quest/QuestRewardCardFiltered.java -text
+forge-gui-mobile/src/forge/quest/QuestUtil.java -text
+forge-gui-mobile/src/forge/quest/QuestUtilCards.java -text
+forge-gui-mobile/src/forge/quest/QuestUtilUnlockSets.java -text
+forge-gui-mobile/src/forge/quest/QuestWorld.java -text
+forge-gui-mobile/src/forge/quest/SellRules.java -text
+forge-gui-mobile/src/forge/quest/StartingPoolPreferences.java -text
+forge-gui-mobile/src/forge/quest/StartingPoolType.java -text
+forge-gui-mobile/src/forge/quest/bazaar/IQuestBazaarItem.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestBazaarManager.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestItemBasic.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestItemCharmOfVigor.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestItemElixir.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestItemEstates.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestItemPoundFlesh.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestItemType.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestItemZeppelin.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestPetController.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestPetStats.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestPetStorage.java -text
+forge-gui-mobile/src/forge/quest/bazaar/QuestStallDefinition.java -text
+forge-gui-mobile/src/forge/quest/bazaar/package-info.java -text
+forge-gui-mobile/src/forge/quest/data/GameFormatQuest.java -text
+forge-gui-mobile/src/forge/quest/data/QuestAchievements.java -text
+forge-gui-mobile/src/forge/quest/data/QuestAssets.java -text
+forge-gui-mobile/src/forge/quest/data/QuestData.java -text
+forge-gui-mobile/src/forge/quest/data/QuestItemCondition.java -text
+forge-gui-mobile/src/forge/quest/data/QuestPreferences.java -text
+forge-gui-mobile/src/forge/quest/data/package-info.java -text
+forge-gui-mobile/src/forge/quest/io/QuestChallengeReader.java -text
+forge-gui-mobile/src/forge/quest/io/QuestDataIO.java -text
+forge-gui-mobile/src/forge/quest/io/QuestDuelReader.java -text
+forge-gui-mobile/src/forge/quest/io/ReadPriceList.java -text
+forge-gui-mobile/src/forge/quest/io/package-info.java -text
+forge-gui-mobile/src/forge/quest/package-info.java -text
+forge-gui-mobile/src/forge/screens/FScreen.java -text
+forge-gui-mobile/src/forge/screens/LaunchScreen.java -text
+forge-gui-mobile/src/forge/screens/SplashScreen.java -text
+forge-gui-mobile/src/forge/screens/constructed/ConstructedScreen.java -text
+forge-gui-mobile/src/forge/screens/draft/DraftScreen.java -text
+forge-gui-mobile/src/forge/screens/guantlet/GuantletScreen.java -text
+forge-gui-mobile/src/forge/screens/home/HomeScreen.java -text
+forge-gui-mobile/src/forge/screens/match/FControl.java -text
+forge-gui-mobile/src/forge/screens/match/FControlGameEventHandler.java -text
+forge-gui-mobile/src/forge/screens/match/FControlGamePlayback.java -text
+forge-gui-mobile/src/forge/screens/match/MatchScreen.java -text
+forge-gui-mobile/src/forge/screens/match/events/IUiEventVisitor.java -text
+forge-gui-mobile/src/forge/screens/match/events/UiEvent.java -text
+forge-gui-mobile/src/forge/screens/match/events/UiEventAttackerDeclared.java -text
+forge-gui-mobile/src/forge/screens/match/events/UiEventBlockerAssigned.java -text
+forge-gui-mobile/src/forge/screens/match/input/ButtonUtil.java -text
+forge-gui-mobile/src/forge/screens/match/input/Input.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputAttack.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputBase.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputBlock.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputConfirm.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputConfirmMulligan.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputLockUI.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputPassPriority.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputPayMana.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputPayManaOfCostPayment.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputPayManaSimple.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputPayManaX.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputPlaybackControl.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputProliferate.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputProxy.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputQueue.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputSelectCardsForConvoke.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputSelectCardsFromList.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputSelectEntitiesFromList.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputSelectManyBase.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputSelectTargets.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputSynchronized.java -text
+forge-gui-mobile/src/forge/screens/match/input/InputSyncronizedBase.java -text
+forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java -text
+forge-gui-mobile/src/forge/screens/match/views/VAvatar.java -text
+forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java -text
+forge-gui-mobile/src/forge/screens/match/views/VCombat.java -text
+forge-gui-mobile/src/forge/screens/match/views/VDevMenu.java -text
+forge-gui-mobile/src/forge/screens/match/views/VDisplayArea.java -text
+forge-gui-mobile/src/forge/screens/match/views/VField.java -text
+forge-gui-mobile/src/forge/screens/match/views/VFlashbackZone.java -text
+forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java -text
+forge-gui-mobile/src/forge/screens/match/views/VLog.java -text
+forge-gui-mobile/src/forge/screens/match/views/VManaPool.java -text
+forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java -text
+forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java -text
+forge-gui-mobile/src/forge/screens/match/views/VPlayers.java -text
+forge-gui-mobile/src/forge/screens/match/views/VPrompt.java -text
+forge-gui-mobile/src/forge/screens/match/views/VStack.java -text
+forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java -text
+forge-gui-mobile/src/forge/screens/match/winlose/ControlWinLose.java -text
+forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java -text
+forge-gui-mobile/src/forge/screens/match/winlose/LimitedWinLose.java -text
+forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java -text
+forge-gui-mobile/src/forge/screens/quest/QuestScreen.java -text
+forge-gui-mobile/src/forge/screens/sealed/SealedScreen.java -text
+forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java -text
+forge-gui-mobile/src/forge/toolbox/FButton.java -text
+forge-gui-mobile/src/forge/toolbox/FCardPanel.java -text
+forge-gui-mobile/src/forge/toolbox/FCardZoom.java -text
+forge-gui-mobile/src/forge/toolbox/FCheckBox.java -text
+forge-gui-mobile/src/forge/toolbox/FComboBox.java -text
+forge-gui-mobile/src/forge/toolbox/FContainer.java -text
+forge-gui-mobile/src/forge/toolbox/FDisplayObject.java -text
+forge-gui-mobile/src/forge/toolbox/FEvent.java -text
+forge-gui-mobile/src/forge/toolbox/FFileChooser.java -text
+forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java -text
+forge-gui-mobile/src/forge/toolbox/FLabel.java -text
+forge-gui-mobile/src/forge/toolbox/FList.java -text
+forge-gui-mobile/src/forge/toolbox/FOptionPane.java -text
+forge-gui-mobile/src/forge/toolbox/FOverlay.java -text
+forge-gui-mobile/src/forge/toolbox/FPanel.java -text
+forge-gui-mobile/src/forge/toolbox/FProgressBar.java -text
+forge-gui-mobile/src/forge/toolbox/FRadioButton.java -text
+forge-gui-mobile/src/forge/toolbox/FScrollPane.java -text
+forge-gui-mobile/src/forge/toolbox/FSpinner.java -text
+forge-gui-mobile/src/forge/toolbox/FTextArea.java -text
+forge-gui-mobile/src/forge/toolbox/FTextField.java -text
+forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java -text
+forge-gui-mobile/src/forge/toolbox/GuiChoose.java -text
+forge-gui-mobile/src/forge/toolbox/GuiDialog.java -text
+forge-gui-mobile/src/forge/utils/CardPreferences.java -text
+forge-gui-mobile/src/forge/utils/Constants.java -text
+forge-gui-mobile/src/forge/utils/Evaluator.java -text
+forge-gui-mobile/src/forge/utils/ForgePreferences.java -text
+forge-gui-mobile/src/forge/utils/ForgeProfileProperties.java -text
+forge-gui-mobile/src/forge/utils/IgnoringXStream.java -text
+forge-gui-mobile/src/forge/utils/LayoutHelper.java -text
+forge-gui-mobile/src/forge/utils/PhysicsObject.java -text
+forge-gui-mobile/src/forge/utils/Preferences.java -text
+forge-gui-mobile/src/forge/utils/PreferencesStore.java -text
+forge-gui-mobile/src/forge/utils/Utils.java -text
+forge-gui-mobile/src/forge/utils/XmlUtil.java -text
 forge-gui/.classpath -text
 forge-gui/.project -text
 forge-gui/.settings/org.eclipse.core.resources.prefs -text
@@ -16141,296 +16431,6 @@ forge-gui/tools/mtgdata-sets-to-forge.txt svneol=native#text/plain
 forge-gui/tools/oracleScraper.py -text
 forge-gui/tools/oracleScript.py svneol=native#text/x-python
 forge-gui/tools/packdata.xlsx -text
-forge-m-android/.classpath -text
-forge-m-android/.project -text
-forge-m-android/.settings/org.eclipse.jdt.core.prefs -text
-forge-m-android/AndroidManifest.xml -text
-forge-m-android/gen/com/forge/BuildConfig.java -text
-forge-m-android/gen/com/forge/R.java -text
-forge-m-android/ic_launcher-web.png -text
-forge-m-android/libs/android-support-v4.jar -text
-forge-m-android/libs/gdx-backend-android.jar -text
-forge-m-android/proguard-project.txt -text
-forge-m-android/project.properties -text
-forge-m-android/res/drawable-hdpi/ic_launcher.png -text
-forge-m-android/res/drawable-mdpi/ic_launcher.png -text
-forge-m-android/res/drawable-xhdpi/ic_launcher.png -text
-forge-m-android/res/drawable-xxhdpi/ic_launcher.png -text
-forge-m-android/res/layout/activity_main.xml -text
-forge-m-android/res/menu/main.xml -text
-forge-m-android/res/values-sw600dp/dimens.xml -text
-forge-m-android/res/values-sw720dp-land/dimens.xml -text
-forge-m-android/res/values-v11/styles.xml -text
-forge-m-android/res/values-v14/styles.xml -text
-forge-m-android/res/values/dimens.xml -text
-forge-m-android/res/values/strings.xml -text
-forge-m-android/res/values/styles.xml -text
-forge-m-android/src/com/forge/Main.java -text
-forge-m-base/.classpath -text
-forge-m-base/.project -text
-forge-m-base/.settings/org.eclipse.jdt.core.prefs -text
-forge-m-base/.settings/org.eclipse.m2e.core.prefs -text
-forge-m-base/libs/gdx-freetype.jar -text
-forge-m-base/libs/gdx-sources.jar -text
-forge-m-base/libs/gdx.jar -text
-forge-m-base/pom.xml -text
-forge-m-base/src/forge/FThreads.java -text
-forge-m-base/src/forge/Forge.java -text
-forge-m-base/src/forge/assets/CardFaceSymbols.java -text
-forge-m-base/src/forge/assets/FImage.java -text
-forge-m-base/src/forge/assets/FSkin.java -text
-forge-m-base/src/forge/assets/FSkinColor.java -text
-forge-m-base/src/forge/assets/FSkinFont.java -text
-forge-m-base/src/forge/assets/FSkinImage.java -text
-forge-m-base/src/forge/assets/FSkinTexture.java -text
-forge-m-base/src/forge/assets/FTextureImage.java -text
-forge-m-base/src/forge/assets/FTextureRegionImage.java -text
-forge-m-base/src/forge/assets/ImageCache.java -text
-forge-m-base/src/forge/assets/ImageLoader.java -text
-forge-m-base/src/forge/deck/DeckProxy.java -text
-forge-m-base/src/forge/deck/DeckType.java -text
-forge-m-base/src/forge/deck/DeckgenUtil.java -text
-forge-m-base/src/forge/deck/FDeckChooser.java -text
-forge-m-base/src/forge/deck/FDeckViewer.java -text
-forge-m-base/src/forge/deck/io/DeckPreferences.java -text
-forge-m-base/src/forge/deck/io/OldDeckParser.java -text
-forge-m-base/src/forge/error/BugReporter.java -text
-forge-m-base/src/forge/error/ExceptionHandler.java -text
-forge-m-base/src/forge/guantlet/GauntletData.java -text
-forge-m-base/src/forge/guantlet/GauntletIO.java -text
-forge-m-base/src/forge/itemmanager/CardManager.java -text
-forge-m-base/src/forge/itemmanager/DeckManager.java -text
-forge-m-base/src/forge/itemmanager/ItemManager.java -text
-forge-m-base/src/forge/itemmanager/ItemManagerConfig.java -text
-forge-m-base/src/forge/itemmanager/ItemManagerModel.java -text
-forge-m-base/src/forge/itemmanager/SFilterUtil.java -text
-forge-m-base/src/forge/itemmanager/SItemManagerUtil.java -text
-forge-m-base/src/forge/itemmanager/filters/CardCMCFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/CardCMCRangeFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/CardColorFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/CardFormatFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/CardPowerFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/CardSearchFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/CardSetFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/CardToughnessFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/CardTypeFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/DeckColorFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/DeckFolderFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/DeckFormatFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/DeckSearchFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/DeckSetFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/DeckStatTypeFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/FormatFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/ItemFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/ListLabelFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/StatTypeFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/TextSearchFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/ToggleButtonsFilter.java -text
-forge-m-base/src/forge/itemmanager/filters/ValueRangeFilter.java -text
-forge-m-base/src/forge/itemmanager/views/ColorSetRenderer.java -text
-forge-m-base/src/forge/itemmanager/views/ColumnDef.java -text
-forge-m-base/src/forge/itemmanager/views/DeckStarRenderer.java -text
-forge-m-base/src/forge/itemmanager/views/GroupDef.java -text
-forge-m-base/src/forge/itemmanager/views/ImageView.java -text
-forge-m-base/src/forge/itemmanager/views/IntegerRenderer.java -text
-forge-m-base/src/forge/itemmanager/views/ItemCellRenderer.java -text
-forge-m-base/src/forge/itemmanager/views/ItemColumn.java -text
-forge-m-base/src/forge/itemmanager/views/ItemColumnConfig.java -text
-forge-m-base/src/forge/itemmanager/views/ItemListView.java -text
-forge-m-base/src/forge/itemmanager/views/ItemView.java -text
-forge-m-base/src/forge/itemmanager/views/ManaCostRenderer.java -text
-forge-m-base/src/forge/itemmanager/views/SColumnUtil.java -text
-forge-m-base/src/forge/itemmanager/views/StarRenderer.java -text
-forge-m-base/src/forge/limited/CustomLimited.java -text
-forge-m-base/src/forge/limited/DraftRankCache.java -text
-forge-m-base/src/forge/limited/GauntletMini.java -text
-forge-m-base/src/forge/limited/ReadDraftRankings.java -text
-forge-m-base/src/forge/menu/FDropDown.java -text
-forge-m-base/src/forge/menu/FDropDownMenu.java -text
-forge-m-base/src/forge/menu/FMenuBar.java -text
-forge-m-base/src/forge/menu/FMenuItem.java -text
-forge-m-base/src/forge/menu/FMenuTab.java -text
-forge-m-base/src/forge/menu/FPopupMenu.java -text
-forge-m-base/src/forge/menu/FSubMenu.java -text
-forge-m-base/src/forge/menu/FTooltip.java -text
-forge-m-base/src/forge/model/CardBlock.java -text
-forge-m-base/src/forge/model/CardCollections.java -text
-forge-m-base/src/forge/model/FModel.java -text
-forge-m-base/src/forge/model/MetaSet.java -text
-forge-m-base/src/forge/model/UnOpenedMeta.java -text
-forge-m-base/src/forge/net/FServer.java -text
-forge-m-base/src/forge/net/IClientSocket.java -text
-forge-m-base/src/forge/net/IConnectionObserver.java -text
-forge-m-base/src/forge/net/Lobby.java -text
-forge-m-base/src/forge/net/LobbyPlayerRemote.java -text
-forge-m-base/src/forge/net/client/INetClient.java -text
-forge-m-base/src/forge/net/client/InvalidFieldInPacketException.java -text
-forge-m-base/src/forge/net/client/NetClient.java -text
-forge-m-base/src/forge/net/client/state/ConnectedClientState.java -text
-forge-m-base/src/forge/net/client/state/IClientState.java -text
-forge-m-base/src/forge/net/client/state/InLobbyClientState.java -text
-forge-m-base/src/forge/net/client/state/UnauthorizedClientState.java -text
-forge-m-base/src/forge/player/HumanCostDecision.java -text
-forge-m-base/src/forge/player/HumanPlay.java -text
-forge-m-base/src/forge/player/HumanPlaySpellAbility.java -text
-forge-m-base/src/forge/player/LobbyPlayerHuman.java -text
-forge-m-base/src/forge/player/PlayerControllerHuman.java -text
-forge-m-base/src/forge/player/TargetSelection.java -text
-forge-m-base/src/forge/quest/BoosterUtils.java -text
-forge-m-base/src/forge/quest/IQuestRewardCard.java -text
-forge-m-base/src/forge/quest/QuestController.java -text
-forge-m-base/src/forge/quest/QuestDeckMap.java -text
-forge-m-base/src/forge/quest/QuestEvent.java -text
-forge-m-base/src/forge/quest/QuestEventChallenge.java -text
-forge-m-base/src/forge/quest/QuestEventDifficulty.java -text
-forge-m-base/src/forge/quest/QuestEventDuel.java -text
-forge-m-base/src/forge/quest/QuestEventDuelManager.java -text
-forge-m-base/src/forge/quest/QuestMode.java -text
-forge-m-base/src/forge/quest/QuestRewardCard.java -text
-forge-m-base/src/forge/quest/QuestRewardCardChooser.java -text
-forge-m-base/src/forge/quest/QuestRewardCardDuplicate.java -text
-forge-m-base/src/forge/quest/QuestRewardCardFiltered.java -text
-forge-m-base/src/forge/quest/QuestUtil.java -text
-forge-m-base/src/forge/quest/QuestUtilCards.java -text
-forge-m-base/src/forge/quest/QuestUtilUnlockSets.java -text
-forge-m-base/src/forge/quest/QuestWorld.java -text
-forge-m-base/src/forge/quest/SellRules.java -text
-forge-m-base/src/forge/quest/StartingPoolPreferences.java -text
-forge-m-base/src/forge/quest/StartingPoolType.java -text
-forge-m-base/src/forge/quest/bazaar/IQuestBazaarItem.java -text
-forge-m-base/src/forge/quest/bazaar/QuestBazaarManager.java -text
-forge-m-base/src/forge/quest/bazaar/QuestItemBasic.java -text
-forge-m-base/src/forge/quest/bazaar/QuestItemCharmOfVigor.java -text
-forge-m-base/src/forge/quest/bazaar/QuestItemElixir.java -text
-forge-m-base/src/forge/quest/bazaar/QuestItemEstates.java -text
-forge-m-base/src/forge/quest/bazaar/QuestItemPoundFlesh.java -text
-forge-m-base/src/forge/quest/bazaar/QuestItemType.java -text
-forge-m-base/src/forge/quest/bazaar/QuestItemZeppelin.java -text
-forge-m-base/src/forge/quest/bazaar/QuestPetController.java -text
-forge-m-base/src/forge/quest/bazaar/QuestPetStats.java -text
-forge-m-base/src/forge/quest/bazaar/QuestPetStorage.java -text
-forge-m-base/src/forge/quest/bazaar/QuestStallDefinition.java -text
-forge-m-base/src/forge/quest/bazaar/package-info.java -text
-forge-m-base/src/forge/quest/data/GameFormatQuest.java -text
-forge-m-base/src/forge/quest/data/QuestAchievements.java -text
-forge-m-base/src/forge/quest/data/QuestAssets.java -text
-forge-m-base/src/forge/quest/data/QuestData.java -text
-forge-m-base/src/forge/quest/data/QuestItemCondition.java -text
-forge-m-base/src/forge/quest/data/QuestPreferences.java -text
-forge-m-base/src/forge/quest/data/package-info.java -text
-forge-m-base/src/forge/quest/io/QuestChallengeReader.java -text
-forge-m-base/src/forge/quest/io/QuestDataIO.java -text
-forge-m-base/src/forge/quest/io/QuestDuelReader.java -text
-forge-m-base/src/forge/quest/io/ReadPriceList.java -text
-forge-m-base/src/forge/quest/io/package-info.java -text
-forge-m-base/src/forge/quest/package-info.java -text
-forge-m-base/src/forge/screens/FScreen.java -text
-forge-m-base/src/forge/screens/LaunchScreen.java -text
-forge-m-base/src/forge/screens/SplashScreen.java -text
-forge-m-base/src/forge/screens/constructed/ConstructedScreen.java -text
-forge-m-base/src/forge/screens/draft/DraftScreen.java -text
-forge-m-base/src/forge/screens/guantlet/GuantletScreen.java -text
-forge-m-base/src/forge/screens/home/HomeScreen.java -text
-forge-m-base/src/forge/screens/match/FControl.java -text
-forge-m-base/src/forge/screens/match/FControlGameEventHandler.java -text
-forge-m-base/src/forge/screens/match/FControlGamePlayback.java -text
-forge-m-base/src/forge/screens/match/MatchScreen.java -text
-forge-m-base/src/forge/screens/match/events/IUiEventVisitor.java -text
-forge-m-base/src/forge/screens/match/events/UiEvent.java -text
-forge-m-base/src/forge/screens/match/events/UiEventAttackerDeclared.java -text
-forge-m-base/src/forge/screens/match/events/UiEventBlockerAssigned.java -text
-forge-m-base/src/forge/screens/match/input/ButtonUtil.java -text
-forge-m-base/src/forge/screens/match/input/Input.java -text
-forge-m-base/src/forge/screens/match/input/InputAttack.java -text
-forge-m-base/src/forge/screens/match/input/InputBase.java -text
-forge-m-base/src/forge/screens/match/input/InputBlock.java -text
-forge-m-base/src/forge/screens/match/input/InputConfirm.java -text
-forge-m-base/src/forge/screens/match/input/InputConfirmMulligan.java -text
-forge-m-base/src/forge/screens/match/input/InputLockUI.java -text
-forge-m-base/src/forge/screens/match/input/InputPassPriority.java -text
-forge-m-base/src/forge/screens/match/input/InputPayMana.java -text
-forge-m-base/src/forge/screens/match/input/InputPayManaOfCostPayment.java -text
-forge-m-base/src/forge/screens/match/input/InputPayManaSimple.java -text
-forge-m-base/src/forge/screens/match/input/InputPayManaX.java -text
-forge-m-base/src/forge/screens/match/input/InputPlaybackControl.java -text
-forge-m-base/src/forge/screens/match/input/InputProliferate.java -text
-forge-m-base/src/forge/screens/match/input/InputProxy.java -text
-forge-m-base/src/forge/screens/match/input/InputQueue.java -text
-forge-m-base/src/forge/screens/match/input/InputSelectCardsForConvoke.java -text
-forge-m-base/src/forge/screens/match/input/InputSelectCardsFromList.java -text
-forge-m-base/src/forge/screens/match/input/InputSelectEntitiesFromList.java -text
-forge-m-base/src/forge/screens/match/input/InputSelectManyBase.java -text
-forge-m-base/src/forge/screens/match/input/InputSelectTargets.java -text
-forge-m-base/src/forge/screens/match/input/InputSynchronized.java -text
-forge-m-base/src/forge/screens/match/input/InputSyncronizedBase.java -text
-forge-m-base/src/forge/screens/match/views/VAssignDamage.java -text
-forge-m-base/src/forge/screens/match/views/VAvatar.java -text
-forge-m-base/src/forge/screens/match/views/VCardDisplayArea.java -text
-forge-m-base/src/forge/screens/match/views/VCombat.java -text
-forge-m-base/src/forge/screens/match/views/VDevMenu.java -text
-forge-m-base/src/forge/screens/match/views/VDisplayArea.java -text
-forge-m-base/src/forge/screens/match/views/VField.java -text
-forge-m-base/src/forge/screens/match/views/VFlashbackZone.java -text
-forge-m-base/src/forge/screens/match/views/VGameMenu.java -text
-forge-m-base/src/forge/screens/match/views/VLog.java -text
-forge-m-base/src/forge/screens/match/views/VManaPool.java -text
-forge-m-base/src/forge/screens/match/views/VPhaseIndicator.java -text
-forge-m-base/src/forge/screens/match/views/VPlayerPanel.java -text
-forge-m-base/src/forge/screens/match/views/VPlayers.java -text
-forge-m-base/src/forge/screens/match/views/VPrompt.java -text
-forge-m-base/src/forge/screens/match/views/VStack.java -text
-forge-m-base/src/forge/screens/match/views/VZoneDisplay.java -text
-forge-m-base/src/forge/screens/match/winlose/ControlWinLose.java -text
-forge-m-base/src/forge/screens/match/winlose/GauntletWinLose.java -text
-forge-m-base/src/forge/screens/match/winlose/LimitedWinLose.java -text
-forge-m-base/src/forge/screens/match/winlose/ViewWinLose.java -text
-forge-m-base/src/forge/screens/quest/QuestScreen.java -text
-forge-m-base/src/forge/screens/sealed/SealedScreen.java -text
-forge-m-base/src/forge/screens/settings/SettingsScreen.java -text
-forge-m-base/src/forge/toolbox/FButton.java -text
-forge-m-base/src/forge/toolbox/FCardPanel.java -text
-forge-m-base/src/forge/toolbox/FCardZoom.java -text
-forge-m-base/src/forge/toolbox/FCheckBox.java -text
-forge-m-base/src/forge/toolbox/FComboBox.java -text
-forge-m-base/src/forge/toolbox/FContainer.java -text
-forge-m-base/src/forge/toolbox/FDisplayObject.java -text
-forge-m-base/src/forge/toolbox/FEvent.java -text
-forge-m-base/src/forge/toolbox/FFileChooser.java -text
-forge-m-base/src/forge/toolbox/FGestureAdapter.java -text
-forge-m-base/src/forge/toolbox/FLabel.java -text
-forge-m-base/src/forge/toolbox/FList.java -text
-forge-m-base/src/forge/toolbox/FOptionPane.java -text
-forge-m-base/src/forge/toolbox/FOverlay.java -text
-forge-m-base/src/forge/toolbox/FPanel.java -text
-forge-m-base/src/forge/toolbox/FProgressBar.java -text
-forge-m-base/src/forge/toolbox/FRadioButton.java -text
-forge-m-base/src/forge/toolbox/FScrollPane.java -text
-forge-m-base/src/forge/toolbox/FSpinner.java -text
-forge-m-base/src/forge/toolbox/FTextArea.java -text
-forge-m-base/src/forge/toolbox/FTextField.java -text
-forge-m-base/src/forge/toolbox/FToggleSwitch.java -text
-forge-m-base/src/forge/toolbox/GuiChoose.java -text
-forge-m-base/src/forge/toolbox/GuiDialog.java -text
-forge-m-base/src/forge/utils/CardPreferences.java -text
-forge-m-base/src/forge/utils/Constants.java -text
-forge-m-base/src/forge/utils/Evaluator.java -text
-forge-m-base/src/forge/utils/ForgePreferences.java -text
-forge-m-base/src/forge/utils/ForgeProfileProperties.java -text
-forge-m-base/src/forge/utils/IgnoringXStream.java -text
-forge-m-base/src/forge/utils/LayoutHelper.java -text
-forge-m-base/src/forge/utils/PhysicsObject.java -text
-forge-m-base/src/forge/utils/Preferences.java -text
-forge-m-base/src/forge/utils/PreferencesStore.java -text
-forge-m-base/src/forge/utils/Utils.java -text
-forge-m-base/src/forge/utils/XmlUtil.java -text
-forge-m-desktop/.classpath -text
-forge-m-desktop/.project -text
-forge-m-desktop/.settings/org.eclipse.jdt.core.prefs -text
-forge-m-desktop/libs/gdx-backend-lwjgl-natives.jar -text
-forge-m-desktop/libs/gdx-backend-lwjgl.jar -text
-forge-m-desktop/libs/gdx-freetype-natives.jar -text
-forge-m-desktop/libs/gdx-natives.jar -text
-forge-m-desktop/src/forge/view/Main.java -text
 forge-net/.classpath -text
 forge-net/.project -text
 forge-net/.settings/org.eclipse.core.resources.prefs -text
diff --git a/.gitignore b/.gitignore
index c5f12e29150..5cb5b9f26bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,14 @@ forge-ai/target
 forge-core/forge-core.iml
 forge-core/target
 forge-game/target
+forge-gui-android/bin
+forge-gui-android/target
 forge-gui-desktop/target
+forge-gui-mobile-dev/bin
+forge-gui-mobile-dev/res
+forge-gui-mobile-dev/target
+forge-gui-mobile/bin
+forge-gui-mobile/target
 forge-gui/forge-gui.iml
 forge-gui/forge.profile.properties
 forge-gui/res/*.log
@@ -167,13 +174,6 @@ forge-gui/res/skins/zendikar/pics_product
 forge-gui/target
 forge-gui/tools/PerSetTrackingResults
 forge-gui/tools/oracleScript.log
-forge-m-android/bin
-forge-m-android/target
-forge-m-base/bin
-forge-m-base/target
-forge-m-desktop/bin
-forge-m-desktop/res
-forge-m-desktop/target
 forge-net/target
 /forge.profile.properties
 /nbactions.xml
diff --git a/forge-m-android/.classpath b/forge-gui-android/.classpath
similarity index 100%
rename from forge-m-android/.classpath
rename to forge-gui-android/.classpath
diff --git a/forge-m-android/.project b/forge-gui-android/.project
similarity index 100%
rename from forge-m-android/.project
rename to forge-gui-android/.project
diff --git a/forge-m-android/.settings/org.eclipse.jdt.core.prefs b/forge-gui-android/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from forge-m-android/.settings/org.eclipse.jdt.core.prefs
rename to forge-gui-android/.settings/org.eclipse.jdt.core.prefs
diff --git a/forge-m-android/AndroidManifest.xml b/forge-gui-android/AndroidManifest.xml
similarity index 100%
rename from forge-m-android/AndroidManifest.xml
rename to forge-gui-android/AndroidManifest.xml
diff --git a/forge-m-android/gen/com/forge/BuildConfig.java b/forge-gui-android/gen/com/forge/BuildConfig.java
similarity index 100%
rename from forge-m-android/gen/com/forge/BuildConfig.java
rename to forge-gui-android/gen/com/forge/BuildConfig.java
diff --git a/forge-m-android/gen/com/forge/R.java b/forge-gui-android/gen/com/forge/R.java
similarity index 100%
rename from forge-m-android/gen/com/forge/R.java
rename to forge-gui-android/gen/com/forge/R.java
diff --git a/forge-m-android/ic_launcher-web.png b/forge-gui-android/ic_launcher-web.png
similarity index 100%
rename from forge-m-android/ic_launcher-web.png
rename to forge-gui-android/ic_launcher-web.png
diff --git a/forge-m-android/libs/android-support-v4.jar b/forge-gui-android/libs/android-support-v4.jar
similarity index 100%
rename from forge-m-android/libs/android-support-v4.jar
rename to forge-gui-android/libs/android-support-v4.jar
diff --git a/forge-m-android/libs/gdx-backend-android.jar b/forge-gui-android/libs/gdx-backend-android.jar
similarity index 100%
rename from forge-m-android/libs/gdx-backend-android.jar
rename to forge-gui-android/libs/gdx-backend-android.jar
diff --git a/forge-m-android/proguard-project.txt b/forge-gui-android/proguard-project.txt
similarity index 100%
rename from forge-m-android/proguard-project.txt
rename to forge-gui-android/proguard-project.txt
diff --git a/forge-m-android/project.properties b/forge-gui-android/project.properties
similarity index 100%
rename from forge-m-android/project.properties
rename to forge-gui-android/project.properties
diff --git a/forge-m-android/res/drawable-hdpi/ic_launcher.png b/forge-gui-android/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from forge-m-android/res/drawable-hdpi/ic_launcher.png
rename to forge-gui-android/res/drawable-hdpi/ic_launcher.png
diff --git a/forge-m-android/res/drawable-mdpi/ic_launcher.png b/forge-gui-android/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from forge-m-android/res/drawable-mdpi/ic_launcher.png
rename to forge-gui-android/res/drawable-mdpi/ic_launcher.png
diff --git a/forge-m-android/res/drawable-xhdpi/ic_launcher.png b/forge-gui-android/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from forge-m-android/res/drawable-xhdpi/ic_launcher.png
rename to forge-gui-android/res/drawable-xhdpi/ic_launcher.png
diff --git a/forge-m-android/res/drawable-xxhdpi/ic_launcher.png b/forge-gui-android/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from forge-m-android/res/drawable-xxhdpi/ic_launcher.png
rename to forge-gui-android/res/drawable-xxhdpi/ic_launcher.png
diff --git a/forge-m-android/res/layout/activity_main.xml b/forge-gui-android/res/layout/activity_main.xml
similarity index 100%
rename from forge-m-android/res/layout/activity_main.xml
rename to forge-gui-android/res/layout/activity_main.xml
diff --git a/forge-m-android/res/menu/main.xml b/forge-gui-android/res/menu/main.xml
similarity index 100%
rename from forge-m-android/res/menu/main.xml
rename to forge-gui-android/res/menu/main.xml
diff --git a/forge-m-android/res/values-sw600dp/dimens.xml b/forge-gui-android/res/values-sw600dp/dimens.xml
similarity index 100%
rename from forge-m-android/res/values-sw600dp/dimens.xml
rename to forge-gui-android/res/values-sw600dp/dimens.xml
diff --git a/forge-m-android/res/values-sw720dp-land/dimens.xml b/forge-gui-android/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from forge-m-android/res/values-sw720dp-land/dimens.xml
rename to forge-gui-android/res/values-sw720dp-land/dimens.xml
diff --git a/forge-m-android/res/values-v11/styles.xml b/forge-gui-android/res/values-v11/styles.xml
similarity index 100%
rename from forge-m-android/res/values-v11/styles.xml
rename to forge-gui-android/res/values-v11/styles.xml
diff --git a/forge-m-android/res/values-v14/styles.xml b/forge-gui-android/res/values-v14/styles.xml
similarity index 100%
rename from forge-m-android/res/values-v14/styles.xml
rename to forge-gui-android/res/values-v14/styles.xml
diff --git a/forge-m-android/res/values/dimens.xml b/forge-gui-android/res/values/dimens.xml
similarity index 100%
rename from forge-m-android/res/values/dimens.xml
rename to forge-gui-android/res/values/dimens.xml
diff --git a/forge-m-android/res/values/strings.xml b/forge-gui-android/res/values/strings.xml
similarity index 100%
rename from forge-m-android/res/values/strings.xml
rename to forge-gui-android/res/values/strings.xml
diff --git a/forge-m-android/res/values/styles.xml b/forge-gui-android/res/values/styles.xml
similarity index 100%
rename from forge-m-android/res/values/styles.xml
rename to forge-gui-android/res/values/styles.xml
diff --git a/forge-m-android/src/com/forge/Main.java b/forge-gui-android/src/com/forge/Main.java
similarity index 100%
rename from forge-m-android/src/com/forge/Main.java
rename to forge-gui-android/src/com/forge/Main.java
diff --git a/forge-m-desktop/.classpath b/forge-gui-mobile-dev/.classpath
similarity index 100%
rename from forge-m-desktop/.classpath
rename to forge-gui-mobile-dev/.classpath
diff --git a/forge-m-desktop/.project b/forge-gui-mobile-dev/.project
similarity index 100%
rename from forge-m-desktop/.project
rename to forge-gui-mobile-dev/.project
diff --git a/forge-m-desktop/.settings/org.eclipse.jdt.core.prefs b/forge-gui-mobile-dev/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from forge-m-desktop/.settings/org.eclipse.jdt.core.prefs
rename to forge-gui-mobile-dev/.settings/org.eclipse.jdt.core.prefs
diff --git a/forge-m-desktop/libs/gdx-backend-lwjgl-natives.jar b/forge-gui-mobile-dev/libs/gdx-backend-lwjgl-natives.jar
similarity index 100%
rename from forge-m-desktop/libs/gdx-backend-lwjgl-natives.jar
rename to forge-gui-mobile-dev/libs/gdx-backend-lwjgl-natives.jar
diff --git a/forge-m-desktop/libs/gdx-backend-lwjgl.jar b/forge-gui-mobile-dev/libs/gdx-backend-lwjgl.jar
similarity index 100%
rename from forge-m-desktop/libs/gdx-backend-lwjgl.jar
rename to forge-gui-mobile-dev/libs/gdx-backend-lwjgl.jar
diff --git a/forge-m-desktop/libs/gdx-freetype-natives.jar b/forge-gui-mobile-dev/libs/gdx-freetype-natives.jar
similarity index 100%
rename from forge-m-desktop/libs/gdx-freetype-natives.jar
rename to forge-gui-mobile-dev/libs/gdx-freetype-natives.jar
diff --git a/forge-m-desktop/libs/gdx-natives.jar b/forge-gui-mobile-dev/libs/gdx-natives.jar
similarity index 100%
rename from forge-m-desktop/libs/gdx-natives.jar
rename to forge-gui-mobile-dev/libs/gdx-natives.jar
diff --git a/forge-m-desktop/src/forge/view/Main.java b/forge-gui-mobile-dev/src/forge/view/Main.java
similarity index 100%
rename from forge-m-desktop/src/forge/view/Main.java
rename to forge-gui-mobile-dev/src/forge/view/Main.java
diff --git a/forge-m-base/.classpath b/forge-gui-mobile/.classpath
similarity index 100%
rename from forge-m-base/.classpath
rename to forge-gui-mobile/.classpath
diff --git a/forge-m-base/.project b/forge-gui-mobile/.project
similarity index 100%
rename from forge-m-base/.project
rename to forge-gui-mobile/.project
diff --git a/forge-m-base/.settings/org.eclipse.jdt.core.prefs b/forge-gui-mobile/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from forge-m-base/.settings/org.eclipse.jdt.core.prefs
rename to forge-gui-mobile/.settings/org.eclipse.jdt.core.prefs
diff --git a/forge-m-base/.settings/org.eclipse.m2e.core.prefs b/forge-gui-mobile/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from forge-m-base/.settings/org.eclipse.m2e.core.prefs
rename to forge-gui-mobile/.settings/org.eclipse.m2e.core.prefs
diff --git a/forge-m-base/libs/gdx-freetype.jar b/forge-gui-mobile/libs/gdx-freetype.jar
similarity index 100%
rename from forge-m-base/libs/gdx-freetype.jar
rename to forge-gui-mobile/libs/gdx-freetype.jar
diff --git a/forge-m-base/libs/gdx-sources.jar b/forge-gui-mobile/libs/gdx-sources.jar
similarity index 100%
rename from forge-m-base/libs/gdx-sources.jar
rename to forge-gui-mobile/libs/gdx-sources.jar
diff --git a/forge-m-base/libs/gdx.jar b/forge-gui-mobile/libs/gdx.jar
similarity index 100%
rename from forge-m-base/libs/gdx.jar
rename to forge-gui-mobile/libs/gdx.jar
diff --git a/forge-m-base/pom.xml b/forge-gui-mobile/pom.xml
similarity index 100%
rename from forge-m-base/pom.xml
rename to forge-gui-mobile/pom.xml
diff --git a/forge-m-base/src/forge/FThreads.java b/forge-gui-mobile/src/forge/FThreads.java
similarity index 100%
rename from forge-m-base/src/forge/FThreads.java
rename to forge-gui-mobile/src/forge/FThreads.java
diff --git a/forge-m-base/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
similarity index 100%
rename from forge-m-base/src/forge/Forge.java
rename to forge-gui-mobile/src/forge/Forge.java
diff --git a/forge-m-base/src/forge/assets/CardFaceSymbols.java b/forge-gui-mobile/src/forge/assets/CardFaceSymbols.java
similarity index 100%
rename from forge-m-base/src/forge/assets/CardFaceSymbols.java
rename to forge-gui-mobile/src/forge/assets/CardFaceSymbols.java
diff --git a/forge-m-base/src/forge/assets/FImage.java b/forge-gui-mobile/src/forge/assets/FImage.java
similarity index 100%
rename from forge-m-base/src/forge/assets/FImage.java
rename to forge-gui-mobile/src/forge/assets/FImage.java
diff --git a/forge-m-base/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
similarity index 100%
rename from forge-m-base/src/forge/assets/FSkin.java
rename to forge-gui-mobile/src/forge/assets/FSkin.java
diff --git a/forge-m-base/src/forge/assets/FSkinColor.java b/forge-gui-mobile/src/forge/assets/FSkinColor.java
similarity index 100%
rename from forge-m-base/src/forge/assets/FSkinColor.java
rename to forge-gui-mobile/src/forge/assets/FSkinColor.java
diff --git a/forge-m-base/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java
similarity index 100%
rename from forge-m-base/src/forge/assets/FSkinFont.java
rename to forge-gui-mobile/src/forge/assets/FSkinFont.java
diff --git a/forge-m-base/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java
similarity index 100%
rename from forge-m-base/src/forge/assets/FSkinImage.java
rename to forge-gui-mobile/src/forge/assets/FSkinImage.java
diff --git a/forge-m-base/src/forge/assets/FSkinTexture.java b/forge-gui-mobile/src/forge/assets/FSkinTexture.java
similarity index 100%
rename from forge-m-base/src/forge/assets/FSkinTexture.java
rename to forge-gui-mobile/src/forge/assets/FSkinTexture.java
diff --git a/forge-m-base/src/forge/assets/FTextureImage.java b/forge-gui-mobile/src/forge/assets/FTextureImage.java
similarity index 100%
rename from forge-m-base/src/forge/assets/FTextureImage.java
rename to forge-gui-mobile/src/forge/assets/FTextureImage.java
diff --git a/forge-m-base/src/forge/assets/FTextureRegionImage.java b/forge-gui-mobile/src/forge/assets/FTextureRegionImage.java
similarity index 100%
rename from forge-m-base/src/forge/assets/FTextureRegionImage.java
rename to forge-gui-mobile/src/forge/assets/FTextureRegionImage.java
diff --git a/forge-m-base/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
similarity index 100%
rename from forge-m-base/src/forge/assets/ImageCache.java
rename to forge-gui-mobile/src/forge/assets/ImageCache.java
diff --git a/forge-m-base/src/forge/assets/ImageLoader.java b/forge-gui-mobile/src/forge/assets/ImageLoader.java
similarity index 100%
rename from forge-m-base/src/forge/assets/ImageLoader.java
rename to forge-gui-mobile/src/forge/assets/ImageLoader.java
diff --git a/forge-m-base/src/forge/deck/DeckProxy.java b/forge-gui-mobile/src/forge/deck/DeckProxy.java
similarity index 100%
rename from forge-m-base/src/forge/deck/DeckProxy.java
rename to forge-gui-mobile/src/forge/deck/DeckProxy.java
diff --git a/forge-m-base/src/forge/deck/DeckType.java b/forge-gui-mobile/src/forge/deck/DeckType.java
similarity index 100%
rename from forge-m-base/src/forge/deck/DeckType.java
rename to forge-gui-mobile/src/forge/deck/DeckType.java
diff --git a/forge-m-base/src/forge/deck/DeckgenUtil.java b/forge-gui-mobile/src/forge/deck/DeckgenUtil.java
similarity index 100%
rename from forge-m-base/src/forge/deck/DeckgenUtil.java
rename to forge-gui-mobile/src/forge/deck/DeckgenUtil.java
diff --git a/forge-m-base/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
similarity index 100%
rename from forge-m-base/src/forge/deck/FDeckChooser.java
rename to forge-gui-mobile/src/forge/deck/FDeckChooser.java
diff --git a/forge-m-base/src/forge/deck/FDeckViewer.java b/forge-gui-mobile/src/forge/deck/FDeckViewer.java
similarity index 100%
rename from forge-m-base/src/forge/deck/FDeckViewer.java
rename to forge-gui-mobile/src/forge/deck/FDeckViewer.java
diff --git a/forge-m-base/src/forge/deck/io/DeckPreferences.java b/forge-gui-mobile/src/forge/deck/io/DeckPreferences.java
similarity index 100%
rename from forge-m-base/src/forge/deck/io/DeckPreferences.java
rename to forge-gui-mobile/src/forge/deck/io/DeckPreferences.java
diff --git a/forge-m-base/src/forge/deck/io/OldDeckParser.java b/forge-gui-mobile/src/forge/deck/io/OldDeckParser.java
similarity index 100%
rename from forge-m-base/src/forge/deck/io/OldDeckParser.java
rename to forge-gui-mobile/src/forge/deck/io/OldDeckParser.java
diff --git a/forge-m-base/src/forge/error/BugReporter.java b/forge-gui-mobile/src/forge/error/BugReporter.java
similarity index 100%
rename from forge-m-base/src/forge/error/BugReporter.java
rename to forge-gui-mobile/src/forge/error/BugReporter.java
diff --git a/forge-m-base/src/forge/error/ExceptionHandler.java b/forge-gui-mobile/src/forge/error/ExceptionHandler.java
similarity index 100%
rename from forge-m-base/src/forge/error/ExceptionHandler.java
rename to forge-gui-mobile/src/forge/error/ExceptionHandler.java
diff --git a/forge-m-base/src/forge/guantlet/GauntletData.java b/forge-gui-mobile/src/forge/guantlet/GauntletData.java
similarity index 100%
rename from forge-m-base/src/forge/guantlet/GauntletData.java
rename to forge-gui-mobile/src/forge/guantlet/GauntletData.java
diff --git a/forge-m-base/src/forge/guantlet/GauntletIO.java b/forge-gui-mobile/src/forge/guantlet/GauntletIO.java
similarity index 100%
rename from forge-m-base/src/forge/guantlet/GauntletIO.java
rename to forge-gui-mobile/src/forge/guantlet/GauntletIO.java
diff --git a/forge-m-base/src/forge/itemmanager/CardManager.java b/forge-gui-mobile/src/forge/itemmanager/CardManager.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/CardManager.java
rename to forge-gui-mobile/src/forge/itemmanager/CardManager.java
diff --git a/forge-m-base/src/forge/itemmanager/DeckManager.java b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/DeckManager.java
rename to forge-gui-mobile/src/forge/itemmanager/DeckManager.java
diff --git a/forge-m-base/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/ItemManager.java
rename to forge-gui-mobile/src/forge/itemmanager/ItemManager.java
diff --git a/forge-m-base/src/forge/itemmanager/ItemManagerConfig.java b/forge-gui-mobile/src/forge/itemmanager/ItemManagerConfig.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/ItemManagerConfig.java
rename to forge-gui-mobile/src/forge/itemmanager/ItemManagerConfig.java
diff --git a/forge-m-base/src/forge/itemmanager/ItemManagerModel.java b/forge-gui-mobile/src/forge/itemmanager/ItemManagerModel.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/ItemManagerModel.java
rename to forge-gui-mobile/src/forge/itemmanager/ItemManagerModel.java
diff --git a/forge-m-base/src/forge/itemmanager/SFilterUtil.java b/forge-gui-mobile/src/forge/itemmanager/SFilterUtil.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/SFilterUtil.java
rename to forge-gui-mobile/src/forge/itemmanager/SFilterUtil.java
diff --git a/forge-m-base/src/forge/itemmanager/SItemManagerUtil.java b/forge-gui-mobile/src/forge/itemmanager/SItemManagerUtil.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/SItemManagerUtil.java
rename to forge-gui-mobile/src/forge/itemmanager/SItemManagerUtil.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/CardCMCFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/CardCMCFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/CardCMCFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/CardCMCRangeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardCMCRangeFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/CardCMCRangeFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/CardCMCRangeFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/CardColorFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardColorFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/CardColorFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/CardColorFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/CardFormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardFormatFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/CardFormatFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/CardFormatFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/CardPowerFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/CardPowerFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/CardPowerFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/CardSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardSearchFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/CardSearchFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/CardSearchFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/CardSetFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardSetFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/CardSetFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/CardSetFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/CardToughnessFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/CardToughnessFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/CardToughnessFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/CardTypeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/CardTypeFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/DeckColorFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/DeckColorFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/DeckColorFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/DeckColorFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/DeckFolderFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/DeckFolderFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/DeckFormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/DeckFormatFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/DeckFormatFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/DeckFormatFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/DeckSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/DeckSearchFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/DeckSearchFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/DeckSearchFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/DeckSetFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/DeckSetFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/DeckSetFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/DeckSetFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/DeckStatTypeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/DeckStatTypeFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/DeckStatTypeFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/DeckStatTypeFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/FormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/FormatFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/ItemFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ItemFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/ItemFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/ItemFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/ListLabelFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/ListLabelFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/StatTypeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/StatTypeFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/TextSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/TextSearchFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/ToggleButtonsFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/ToggleButtonsFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/filters/ValueRangeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/filters/ValueRangeFilter.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java
diff --git a/forge-m-base/src/forge/itemmanager/views/ColorSetRenderer.java b/forge-gui-mobile/src/forge/itemmanager/views/ColorSetRenderer.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/ColorSetRenderer.java
rename to forge-gui-mobile/src/forge/itemmanager/views/ColorSetRenderer.java
diff --git a/forge-m-base/src/forge/itemmanager/views/ColumnDef.java b/forge-gui-mobile/src/forge/itemmanager/views/ColumnDef.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/ColumnDef.java
rename to forge-gui-mobile/src/forge/itemmanager/views/ColumnDef.java
diff --git a/forge-m-base/src/forge/itemmanager/views/DeckStarRenderer.java b/forge-gui-mobile/src/forge/itemmanager/views/DeckStarRenderer.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/DeckStarRenderer.java
rename to forge-gui-mobile/src/forge/itemmanager/views/DeckStarRenderer.java
diff --git a/forge-m-base/src/forge/itemmanager/views/GroupDef.java b/forge-gui-mobile/src/forge/itemmanager/views/GroupDef.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/GroupDef.java
rename to forge-gui-mobile/src/forge/itemmanager/views/GroupDef.java
diff --git a/forge-m-base/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/ImageView.java
rename to forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
diff --git a/forge-m-base/src/forge/itemmanager/views/IntegerRenderer.java b/forge-gui-mobile/src/forge/itemmanager/views/IntegerRenderer.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/IntegerRenderer.java
rename to forge-gui-mobile/src/forge/itemmanager/views/IntegerRenderer.java
diff --git a/forge-m-base/src/forge/itemmanager/views/ItemCellRenderer.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemCellRenderer.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/ItemCellRenderer.java
rename to forge-gui-mobile/src/forge/itemmanager/views/ItemCellRenderer.java
diff --git a/forge-m-base/src/forge/itemmanager/views/ItemColumn.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemColumn.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/ItemColumn.java
rename to forge-gui-mobile/src/forge/itemmanager/views/ItemColumn.java
diff --git a/forge-m-base/src/forge/itemmanager/views/ItemColumnConfig.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemColumnConfig.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/ItemColumnConfig.java
rename to forge-gui-mobile/src/forge/itemmanager/views/ItemColumnConfig.java
diff --git a/forge-m-base/src/forge/itemmanager/views/ItemListView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/ItemListView.java
rename to forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
diff --git a/forge-m-base/src/forge/itemmanager/views/ItemView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/ItemView.java
rename to forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
diff --git a/forge-m-base/src/forge/itemmanager/views/ManaCostRenderer.java b/forge-gui-mobile/src/forge/itemmanager/views/ManaCostRenderer.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/ManaCostRenderer.java
rename to forge-gui-mobile/src/forge/itemmanager/views/ManaCostRenderer.java
diff --git a/forge-m-base/src/forge/itemmanager/views/SColumnUtil.java b/forge-gui-mobile/src/forge/itemmanager/views/SColumnUtil.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/SColumnUtil.java
rename to forge-gui-mobile/src/forge/itemmanager/views/SColumnUtil.java
diff --git a/forge-m-base/src/forge/itemmanager/views/StarRenderer.java b/forge-gui-mobile/src/forge/itemmanager/views/StarRenderer.java
similarity index 100%
rename from forge-m-base/src/forge/itemmanager/views/StarRenderer.java
rename to forge-gui-mobile/src/forge/itemmanager/views/StarRenderer.java
diff --git a/forge-m-base/src/forge/limited/CustomLimited.java b/forge-gui-mobile/src/forge/limited/CustomLimited.java
similarity index 100%
rename from forge-m-base/src/forge/limited/CustomLimited.java
rename to forge-gui-mobile/src/forge/limited/CustomLimited.java
diff --git a/forge-m-base/src/forge/limited/DraftRankCache.java b/forge-gui-mobile/src/forge/limited/DraftRankCache.java
similarity index 100%
rename from forge-m-base/src/forge/limited/DraftRankCache.java
rename to forge-gui-mobile/src/forge/limited/DraftRankCache.java
diff --git a/forge-m-base/src/forge/limited/GauntletMini.java b/forge-gui-mobile/src/forge/limited/GauntletMini.java
similarity index 100%
rename from forge-m-base/src/forge/limited/GauntletMini.java
rename to forge-gui-mobile/src/forge/limited/GauntletMini.java
diff --git a/forge-m-base/src/forge/limited/ReadDraftRankings.java b/forge-gui-mobile/src/forge/limited/ReadDraftRankings.java
similarity index 100%
rename from forge-m-base/src/forge/limited/ReadDraftRankings.java
rename to forge-gui-mobile/src/forge/limited/ReadDraftRankings.java
diff --git a/forge-m-base/src/forge/menu/FDropDown.java b/forge-gui-mobile/src/forge/menu/FDropDown.java
similarity index 100%
rename from forge-m-base/src/forge/menu/FDropDown.java
rename to forge-gui-mobile/src/forge/menu/FDropDown.java
diff --git a/forge-m-base/src/forge/menu/FDropDownMenu.java b/forge-gui-mobile/src/forge/menu/FDropDownMenu.java
similarity index 100%
rename from forge-m-base/src/forge/menu/FDropDownMenu.java
rename to forge-gui-mobile/src/forge/menu/FDropDownMenu.java
diff --git a/forge-m-base/src/forge/menu/FMenuBar.java b/forge-gui-mobile/src/forge/menu/FMenuBar.java
similarity index 100%
rename from forge-m-base/src/forge/menu/FMenuBar.java
rename to forge-gui-mobile/src/forge/menu/FMenuBar.java
diff --git a/forge-m-base/src/forge/menu/FMenuItem.java b/forge-gui-mobile/src/forge/menu/FMenuItem.java
similarity index 100%
rename from forge-m-base/src/forge/menu/FMenuItem.java
rename to forge-gui-mobile/src/forge/menu/FMenuItem.java
diff --git a/forge-m-base/src/forge/menu/FMenuTab.java b/forge-gui-mobile/src/forge/menu/FMenuTab.java
similarity index 100%
rename from forge-m-base/src/forge/menu/FMenuTab.java
rename to forge-gui-mobile/src/forge/menu/FMenuTab.java
diff --git a/forge-m-base/src/forge/menu/FPopupMenu.java b/forge-gui-mobile/src/forge/menu/FPopupMenu.java
similarity index 100%
rename from forge-m-base/src/forge/menu/FPopupMenu.java
rename to forge-gui-mobile/src/forge/menu/FPopupMenu.java
diff --git a/forge-m-base/src/forge/menu/FSubMenu.java b/forge-gui-mobile/src/forge/menu/FSubMenu.java
similarity index 100%
rename from forge-m-base/src/forge/menu/FSubMenu.java
rename to forge-gui-mobile/src/forge/menu/FSubMenu.java
diff --git a/forge-m-base/src/forge/menu/FTooltip.java b/forge-gui-mobile/src/forge/menu/FTooltip.java
similarity index 100%
rename from forge-m-base/src/forge/menu/FTooltip.java
rename to forge-gui-mobile/src/forge/menu/FTooltip.java
diff --git a/forge-m-base/src/forge/model/CardBlock.java b/forge-gui-mobile/src/forge/model/CardBlock.java
similarity index 100%
rename from forge-m-base/src/forge/model/CardBlock.java
rename to forge-gui-mobile/src/forge/model/CardBlock.java
diff --git a/forge-m-base/src/forge/model/CardCollections.java b/forge-gui-mobile/src/forge/model/CardCollections.java
similarity index 100%
rename from forge-m-base/src/forge/model/CardCollections.java
rename to forge-gui-mobile/src/forge/model/CardCollections.java
diff --git a/forge-m-base/src/forge/model/FModel.java b/forge-gui-mobile/src/forge/model/FModel.java
similarity index 100%
rename from forge-m-base/src/forge/model/FModel.java
rename to forge-gui-mobile/src/forge/model/FModel.java
diff --git a/forge-m-base/src/forge/model/MetaSet.java b/forge-gui-mobile/src/forge/model/MetaSet.java
similarity index 100%
rename from forge-m-base/src/forge/model/MetaSet.java
rename to forge-gui-mobile/src/forge/model/MetaSet.java
diff --git a/forge-m-base/src/forge/model/UnOpenedMeta.java b/forge-gui-mobile/src/forge/model/UnOpenedMeta.java
similarity index 100%
rename from forge-m-base/src/forge/model/UnOpenedMeta.java
rename to forge-gui-mobile/src/forge/model/UnOpenedMeta.java
diff --git a/forge-m-base/src/forge/net/FServer.java b/forge-gui-mobile/src/forge/net/FServer.java
similarity index 100%
rename from forge-m-base/src/forge/net/FServer.java
rename to forge-gui-mobile/src/forge/net/FServer.java
diff --git a/forge-m-base/src/forge/net/IClientSocket.java b/forge-gui-mobile/src/forge/net/IClientSocket.java
similarity index 100%
rename from forge-m-base/src/forge/net/IClientSocket.java
rename to forge-gui-mobile/src/forge/net/IClientSocket.java
diff --git a/forge-m-base/src/forge/net/IConnectionObserver.java b/forge-gui-mobile/src/forge/net/IConnectionObserver.java
similarity index 100%
rename from forge-m-base/src/forge/net/IConnectionObserver.java
rename to forge-gui-mobile/src/forge/net/IConnectionObserver.java
diff --git a/forge-m-base/src/forge/net/Lobby.java b/forge-gui-mobile/src/forge/net/Lobby.java
similarity index 100%
rename from forge-m-base/src/forge/net/Lobby.java
rename to forge-gui-mobile/src/forge/net/Lobby.java
diff --git a/forge-m-base/src/forge/net/LobbyPlayerRemote.java b/forge-gui-mobile/src/forge/net/LobbyPlayerRemote.java
similarity index 100%
rename from forge-m-base/src/forge/net/LobbyPlayerRemote.java
rename to forge-gui-mobile/src/forge/net/LobbyPlayerRemote.java
diff --git a/forge-m-base/src/forge/net/client/INetClient.java b/forge-gui-mobile/src/forge/net/client/INetClient.java
similarity index 100%
rename from forge-m-base/src/forge/net/client/INetClient.java
rename to forge-gui-mobile/src/forge/net/client/INetClient.java
diff --git a/forge-m-base/src/forge/net/client/InvalidFieldInPacketException.java b/forge-gui-mobile/src/forge/net/client/InvalidFieldInPacketException.java
similarity index 100%
rename from forge-m-base/src/forge/net/client/InvalidFieldInPacketException.java
rename to forge-gui-mobile/src/forge/net/client/InvalidFieldInPacketException.java
diff --git a/forge-m-base/src/forge/net/client/NetClient.java b/forge-gui-mobile/src/forge/net/client/NetClient.java
similarity index 100%
rename from forge-m-base/src/forge/net/client/NetClient.java
rename to forge-gui-mobile/src/forge/net/client/NetClient.java
diff --git a/forge-m-base/src/forge/net/client/state/ConnectedClientState.java b/forge-gui-mobile/src/forge/net/client/state/ConnectedClientState.java
similarity index 100%
rename from forge-m-base/src/forge/net/client/state/ConnectedClientState.java
rename to forge-gui-mobile/src/forge/net/client/state/ConnectedClientState.java
diff --git a/forge-m-base/src/forge/net/client/state/IClientState.java b/forge-gui-mobile/src/forge/net/client/state/IClientState.java
similarity index 100%
rename from forge-m-base/src/forge/net/client/state/IClientState.java
rename to forge-gui-mobile/src/forge/net/client/state/IClientState.java
diff --git a/forge-m-base/src/forge/net/client/state/InLobbyClientState.java b/forge-gui-mobile/src/forge/net/client/state/InLobbyClientState.java
similarity index 100%
rename from forge-m-base/src/forge/net/client/state/InLobbyClientState.java
rename to forge-gui-mobile/src/forge/net/client/state/InLobbyClientState.java
diff --git a/forge-m-base/src/forge/net/client/state/UnauthorizedClientState.java b/forge-gui-mobile/src/forge/net/client/state/UnauthorizedClientState.java
similarity index 100%
rename from forge-m-base/src/forge/net/client/state/UnauthorizedClientState.java
rename to forge-gui-mobile/src/forge/net/client/state/UnauthorizedClientState.java
diff --git a/forge-m-base/src/forge/player/HumanCostDecision.java b/forge-gui-mobile/src/forge/player/HumanCostDecision.java
similarity index 100%
rename from forge-m-base/src/forge/player/HumanCostDecision.java
rename to forge-gui-mobile/src/forge/player/HumanCostDecision.java
diff --git a/forge-m-base/src/forge/player/HumanPlay.java b/forge-gui-mobile/src/forge/player/HumanPlay.java
similarity index 100%
rename from forge-m-base/src/forge/player/HumanPlay.java
rename to forge-gui-mobile/src/forge/player/HumanPlay.java
diff --git a/forge-m-base/src/forge/player/HumanPlaySpellAbility.java b/forge-gui-mobile/src/forge/player/HumanPlaySpellAbility.java
similarity index 100%
rename from forge-m-base/src/forge/player/HumanPlaySpellAbility.java
rename to forge-gui-mobile/src/forge/player/HumanPlaySpellAbility.java
diff --git a/forge-m-base/src/forge/player/LobbyPlayerHuman.java b/forge-gui-mobile/src/forge/player/LobbyPlayerHuman.java
similarity index 100%
rename from forge-m-base/src/forge/player/LobbyPlayerHuman.java
rename to forge-gui-mobile/src/forge/player/LobbyPlayerHuman.java
diff --git a/forge-m-base/src/forge/player/PlayerControllerHuman.java b/forge-gui-mobile/src/forge/player/PlayerControllerHuman.java
similarity index 100%
rename from forge-m-base/src/forge/player/PlayerControllerHuman.java
rename to forge-gui-mobile/src/forge/player/PlayerControllerHuman.java
diff --git a/forge-m-base/src/forge/player/TargetSelection.java b/forge-gui-mobile/src/forge/player/TargetSelection.java
similarity index 100%
rename from forge-m-base/src/forge/player/TargetSelection.java
rename to forge-gui-mobile/src/forge/player/TargetSelection.java
diff --git a/forge-m-base/src/forge/quest/BoosterUtils.java b/forge-gui-mobile/src/forge/quest/BoosterUtils.java
similarity index 100%
rename from forge-m-base/src/forge/quest/BoosterUtils.java
rename to forge-gui-mobile/src/forge/quest/BoosterUtils.java
diff --git a/forge-m-base/src/forge/quest/IQuestRewardCard.java b/forge-gui-mobile/src/forge/quest/IQuestRewardCard.java
similarity index 100%
rename from forge-m-base/src/forge/quest/IQuestRewardCard.java
rename to forge-gui-mobile/src/forge/quest/IQuestRewardCard.java
diff --git a/forge-m-base/src/forge/quest/QuestController.java b/forge-gui-mobile/src/forge/quest/QuestController.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestController.java
rename to forge-gui-mobile/src/forge/quest/QuestController.java
diff --git a/forge-m-base/src/forge/quest/QuestDeckMap.java b/forge-gui-mobile/src/forge/quest/QuestDeckMap.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestDeckMap.java
rename to forge-gui-mobile/src/forge/quest/QuestDeckMap.java
diff --git a/forge-m-base/src/forge/quest/QuestEvent.java b/forge-gui-mobile/src/forge/quest/QuestEvent.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestEvent.java
rename to forge-gui-mobile/src/forge/quest/QuestEvent.java
diff --git a/forge-m-base/src/forge/quest/QuestEventChallenge.java b/forge-gui-mobile/src/forge/quest/QuestEventChallenge.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestEventChallenge.java
rename to forge-gui-mobile/src/forge/quest/QuestEventChallenge.java
diff --git a/forge-m-base/src/forge/quest/QuestEventDifficulty.java b/forge-gui-mobile/src/forge/quest/QuestEventDifficulty.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestEventDifficulty.java
rename to forge-gui-mobile/src/forge/quest/QuestEventDifficulty.java
diff --git a/forge-m-base/src/forge/quest/QuestEventDuel.java b/forge-gui-mobile/src/forge/quest/QuestEventDuel.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestEventDuel.java
rename to forge-gui-mobile/src/forge/quest/QuestEventDuel.java
diff --git a/forge-m-base/src/forge/quest/QuestEventDuelManager.java b/forge-gui-mobile/src/forge/quest/QuestEventDuelManager.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestEventDuelManager.java
rename to forge-gui-mobile/src/forge/quest/QuestEventDuelManager.java
diff --git a/forge-m-base/src/forge/quest/QuestMode.java b/forge-gui-mobile/src/forge/quest/QuestMode.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestMode.java
rename to forge-gui-mobile/src/forge/quest/QuestMode.java
diff --git a/forge-m-base/src/forge/quest/QuestRewardCard.java b/forge-gui-mobile/src/forge/quest/QuestRewardCard.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestRewardCard.java
rename to forge-gui-mobile/src/forge/quest/QuestRewardCard.java
diff --git a/forge-m-base/src/forge/quest/QuestRewardCardChooser.java b/forge-gui-mobile/src/forge/quest/QuestRewardCardChooser.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestRewardCardChooser.java
rename to forge-gui-mobile/src/forge/quest/QuestRewardCardChooser.java
diff --git a/forge-m-base/src/forge/quest/QuestRewardCardDuplicate.java b/forge-gui-mobile/src/forge/quest/QuestRewardCardDuplicate.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestRewardCardDuplicate.java
rename to forge-gui-mobile/src/forge/quest/QuestRewardCardDuplicate.java
diff --git a/forge-m-base/src/forge/quest/QuestRewardCardFiltered.java b/forge-gui-mobile/src/forge/quest/QuestRewardCardFiltered.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestRewardCardFiltered.java
rename to forge-gui-mobile/src/forge/quest/QuestRewardCardFiltered.java
diff --git a/forge-m-base/src/forge/quest/QuestUtil.java b/forge-gui-mobile/src/forge/quest/QuestUtil.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestUtil.java
rename to forge-gui-mobile/src/forge/quest/QuestUtil.java
diff --git a/forge-m-base/src/forge/quest/QuestUtilCards.java b/forge-gui-mobile/src/forge/quest/QuestUtilCards.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestUtilCards.java
rename to forge-gui-mobile/src/forge/quest/QuestUtilCards.java
diff --git a/forge-m-base/src/forge/quest/QuestUtilUnlockSets.java b/forge-gui-mobile/src/forge/quest/QuestUtilUnlockSets.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestUtilUnlockSets.java
rename to forge-gui-mobile/src/forge/quest/QuestUtilUnlockSets.java
diff --git a/forge-m-base/src/forge/quest/QuestWorld.java b/forge-gui-mobile/src/forge/quest/QuestWorld.java
similarity index 100%
rename from forge-m-base/src/forge/quest/QuestWorld.java
rename to forge-gui-mobile/src/forge/quest/QuestWorld.java
diff --git a/forge-m-base/src/forge/quest/SellRules.java b/forge-gui-mobile/src/forge/quest/SellRules.java
similarity index 100%
rename from forge-m-base/src/forge/quest/SellRules.java
rename to forge-gui-mobile/src/forge/quest/SellRules.java
diff --git a/forge-m-base/src/forge/quest/StartingPoolPreferences.java b/forge-gui-mobile/src/forge/quest/StartingPoolPreferences.java
similarity index 100%
rename from forge-m-base/src/forge/quest/StartingPoolPreferences.java
rename to forge-gui-mobile/src/forge/quest/StartingPoolPreferences.java
diff --git a/forge-m-base/src/forge/quest/StartingPoolType.java b/forge-gui-mobile/src/forge/quest/StartingPoolType.java
similarity index 100%
rename from forge-m-base/src/forge/quest/StartingPoolType.java
rename to forge-gui-mobile/src/forge/quest/StartingPoolType.java
diff --git a/forge-m-base/src/forge/quest/bazaar/IQuestBazaarItem.java b/forge-gui-mobile/src/forge/quest/bazaar/IQuestBazaarItem.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/IQuestBazaarItem.java
rename to forge-gui-mobile/src/forge/quest/bazaar/IQuestBazaarItem.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestBazaarManager.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestBazaarManager.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestBazaarManager.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestBazaarManager.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestItemBasic.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestItemBasic.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestItemBasic.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestItemBasic.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestItemCharmOfVigor.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestItemCharmOfVigor.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestItemCharmOfVigor.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestItemCharmOfVigor.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestItemElixir.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestItemElixir.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestItemElixir.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestItemElixir.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestItemEstates.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestItemEstates.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestItemEstates.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestItemEstates.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestItemPoundFlesh.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestItemPoundFlesh.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestItemPoundFlesh.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestItemPoundFlesh.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestItemType.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestItemType.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestItemType.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestItemType.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestItemZeppelin.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestItemZeppelin.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestItemZeppelin.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestItemZeppelin.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestPetController.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestPetController.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestPetController.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestPetController.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestPetStats.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestPetStats.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestPetStats.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestPetStats.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestPetStorage.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestPetStorage.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestPetStorage.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestPetStorage.java
diff --git a/forge-m-base/src/forge/quest/bazaar/QuestStallDefinition.java b/forge-gui-mobile/src/forge/quest/bazaar/QuestStallDefinition.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/QuestStallDefinition.java
rename to forge-gui-mobile/src/forge/quest/bazaar/QuestStallDefinition.java
diff --git a/forge-m-base/src/forge/quest/bazaar/package-info.java b/forge-gui-mobile/src/forge/quest/bazaar/package-info.java
similarity index 100%
rename from forge-m-base/src/forge/quest/bazaar/package-info.java
rename to forge-gui-mobile/src/forge/quest/bazaar/package-info.java
diff --git a/forge-m-base/src/forge/quest/data/GameFormatQuest.java b/forge-gui-mobile/src/forge/quest/data/GameFormatQuest.java
similarity index 100%
rename from forge-m-base/src/forge/quest/data/GameFormatQuest.java
rename to forge-gui-mobile/src/forge/quest/data/GameFormatQuest.java
diff --git a/forge-m-base/src/forge/quest/data/QuestAchievements.java b/forge-gui-mobile/src/forge/quest/data/QuestAchievements.java
similarity index 100%
rename from forge-m-base/src/forge/quest/data/QuestAchievements.java
rename to forge-gui-mobile/src/forge/quest/data/QuestAchievements.java
diff --git a/forge-m-base/src/forge/quest/data/QuestAssets.java b/forge-gui-mobile/src/forge/quest/data/QuestAssets.java
similarity index 100%
rename from forge-m-base/src/forge/quest/data/QuestAssets.java
rename to forge-gui-mobile/src/forge/quest/data/QuestAssets.java
diff --git a/forge-m-base/src/forge/quest/data/QuestData.java b/forge-gui-mobile/src/forge/quest/data/QuestData.java
similarity index 100%
rename from forge-m-base/src/forge/quest/data/QuestData.java
rename to forge-gui-mobile/src/forge/quest/data/QuestData.java
diff --git a/forge-m-base/src/forge/quest/data/QuestItemCondition.java b/forge-gui-mobile/src/forge/quest/data/QuestItemCondition.java
similarity index 100%
rename from forge-m-base/src/forge/quest/data/QuestItemCondition.java
rename to forge-gui-mobile/src/forge/quest/data/QuestItemCondition.java
diff --git a/forge-m-base/src/forge/quest/data/QuestPreferences.java b/forge-gui-mobile/src/forge/quest/data/QuestPreferences.java
similarity index 100%
rename from forge-m-base/src/forge/quest/data/QuestPreferences.java
rename to forge-gui-mobile/src/forge/quest/data/QuestPreferences.java
diff --git a/forge-m-base/src/forge/quest/data/package-info.java b/forge-gui-mobile/src/forge/quest/data/package-info.java
similarity index 100%
rename from forge-m-base/src/forge/quest/data/package-info.java
rename to forge-gui-mobile/src/forge/quest/data/package-info.java
diff --git a/forge-m-base/src/forge/quest/io/QuestChallengeReader.java b/forge-gui-mobile/src/forge/quest/io/QuestChallengeReader.java
similarity index 100%
rename from forge-m-base/src/forge/quest/io/QuestChallengeReader.java
rename to forge-gui-mobile/src/forge/quest/io/QuestChallengeReader.java
diff --git a/forge-m-base/src/forge/quest/io/QuestDataIO.java b/forge-gui-mobile/src/forge/quest/io/QuestDataIO.java
similarity index 100%
rename from forge-m-base/src/forge/quest/io/QuestDataIO.java
rename to forge-gui-mobile/src/forge/quest/io/QuestDataIO.java
diff --git a/forge-m-base/src/forge/quest/io/QuestDuelReader.java b/forge-gui-mobile/src/forge/quest/io/QuestDuelReader.java
similarity index 100%
rename from forge-m-base/src/forge/quest/io/QuestDuelReader.java
rename to forge-gui-mobile/src/forge/quest/io/QuestDuelReader.java
diff --git a/forge-m-base/src/forge/quest/io/ReadPriceList.java b/forge-gui-mobile/src/forge/quest/io/ReadPriceList.java
similarity index 100%
rename from forge-m-base/src/forge/quest/io/ReadPriceList.java
rename to forge-gui-mobile/src/forge/quest/io/ReadPriceList.java
diff --git a/forge-m-base/src/forge/quest/io/package-info.java b/forge-gui-mobile/src/forge/quest/io/package-info.java
similarity index 100%
rename from forge-m-base/src/forge/quest/io/package-info.java
rename to forge-gui-mobile/src/forge/quest/io/package-info.java
diff --git a/forge-m-base/src/forge/quest/package-info.java b/forge-gui-mobile/src/forge/quest/package-info.java
similarity index 100%
rename from forge-m-base/src/forge/quest/package-info.java
rename to forge-gui-mobile/src/forge/quest/package-info.java
diff --git a/forge-m-base/src/forge/screens/FScreen.java b/forge-gui-mobile/src/forge/screens/FScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/FScreen.java
rename to forge-gui-mobile/src/forge/screens/FScreen.java
diff --git a/forge-m-base/src/forge/screens/LaunchScreen.java b/forge-gui-mobile/src/forge/screens/LaunchScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/LaunchScreen.java
rename to forge-gui-mobile/src/forge/screens/LaunchScreen.java
diff --git a/forge-m-base/src/forge/screens/SplashScreen.java b/forge-gui-mobile/src/forge/screens/SplashScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/SplashScreen.java
rename to forge-gui-mobile/src/forge/screens/SplashScreen.java
diff --git a/forge-m-base/src/forge/screens/constructed/ConstructedScreen.java b/forge-gui-mobile/src/forge/screens/constructed/ConstructedScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/constructed/ConstructedScreen.java
rename to forge-gui-mobile/src/forge/screens/constructed/ConstructedScreen.java
diff --git a/forge-m-base/src/forge/screens/draft/DraftScreen.java b/forge-gui-mobile/src/forge/screens/draft/DraftScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/draft/DraftScreen.java
rename to forge-gui-mobile/src/forge/screens/draft/DraftScreen.java
diff --git a/forge-m-base/src/forge/screens/guantlet/GuantletScreen.java b/forge-gui-mobile/src/forge/screens/guantlet/GuantletScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/guantlet/GuantletScreen.java
rename to forge-gui-mobile/src/forge/screens/guantlet/GuantletScreen.java
diff --git a/forge-m-base/src/forge/screens/home/HomeScreen.java b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/home/HomeScreen.java
rename to forge-gui-mobile/src/forge/screens/home/HomeScreen.java
diff --git a/forge-m-base/src/forge/screens/match/FControl.java b/forge-gui-mobile/src/forge/screens/match/FControl.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/FControl.java
rename to forge-gui-mobile/src/forge/screens/match/FControl.java
diff --git a/forge-m-base/src/forge/screens/match/FControlGameEventHandler.java b/forge-gui-mobile/src/forge/screens/match/FControlGameEventHandler.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/FControlGameEventHandler.java
rename to forge-gui-mobile/src/forge/screens/match/FControlGameEventHandler.java
diff --git a/forge-m-base/src/forge/screens/match/FControlGamePlayback.java b/forge-gui-mobile/src/forge/screens/match/FControlGamePlayback.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/FControlGamePlayback.java
rename to forge-gui-mobile/src/forge/screens/match/FControlGamePlayback.java
diff --git a/forge-m-base/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/MatchScreen.java
rename to forge-gui-mobile/src/forge/screens/match/MatchScreen.java
diff --git a/forge-m-base/src/forge/screens/match/events/IUiEventVisitor.java b/forge-gui-mobile/src/forge/screens/match/events/IUiEventVisitor.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/events/IUiEventVisitor.java
rename to forge-gui-mobile/src/forge/screens/match/events/IUiEventVisitor.java
diff --git a/forge-m-base/src/forge/screens/match/events/UiEvent.java b/forge-gui-mobile/src/forge/screens/match/events/UiEvent.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/events/UiEvent.java
rename to forge-gui-mobile/src/forge/screens/match/events/UiEvent.java
diff --git a/forge-m-base/src/forge/screens/match/events/UiEventAttackerDeclared.java b/forge-gui-mobile/src/forge/screens/match/events/UiEventAttackerDeclared.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/events/UiEventAttackerDeclared.java
rename to forge-gui-mobile/src/forge/screens/match/events/UiEventAttackerDeclared.java
diff --git a/forge-m-base/src/forge/screens/match/events/UiEventBlockerAssigned.java b/forge-gui-mobile/src/forge/screens/match/events/UiEventBlockerAssigned.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/events/UiEventBlockerAssigned.java
rename to forge-gui-mobile/src/forge/screens/match/events/UiEventBlockerAssigned.java
diff --git a/forge-m-base/src/forge/screens/match/input/ButtonUtil.java b/forge-gui-mobile/src/forge/screens/match/input/ButtonUtil.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/ButtonUtil.java
rename to forge-gui-mobile/src/forge/screens/match/input/ButtonUtil.java
diff --git a/forge-m-base/src/forge/screens/match/input/Input.java b/forge-gui-mobile/src/forge/screens/match/input/Input.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/Input.java
rename to forge-gui-mobile/src/forge/screens/match/input/Input.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputAttack.java b/forge-gui-mobile/src/forge/screens/match/input/InputAttack.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputAttack.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputAttack.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputBase.java b/forge-gui-mobile/src/forge/screens/match/input/InputBase.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputBase.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputBase.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputBlock.java b/forge-gui-mobile/src/forge/screens/match/input/InputBlock.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputBlock.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputBlock.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputConfirm.java b/forge-gui-mobile/src/forge/screens/match/input/InputConfirm.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputConfirm.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputConfirm.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputConfirmMulligan.java b/forge-gui-mobile/src/forge/screens/match/input/InputConfirmMulligan.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputConfirmMulligan.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputConfirmMulligan.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputLockUI.java b/forge-gui-mobile/src/forge/screens/match/input/InputLockUI.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputLockUI.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputLockUI.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputPassPriority.java b/forge-gui-mobile/src/forge/screens/match/input/InputPassPriority.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputPassPriority.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputPassPriority.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputPayMana.java b/forge-gui-mobile/src/forge/screens/match/input/InputPayMana.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputPayMana.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputPayMana.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputPayManaOfCostPayment.java b/forge-gui-mobile/src/forge/screens/match/input/InputPayManaOfCostPayment.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputPayManaOfCostPayment.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputPayManaOfCostPayment.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputPayManaSimple.java b/forge-gui-mobile/src/forge/screens/match/input/InputPayManaSimple.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputPayManaSimple.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputPayManaSimple.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputPayManaX.java b/forge-gui-mobile/src/forge/screens/match/input/InputPayManaX.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputPayManaX.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputPayManaX.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputPlaybackControl.java b/forge-gui-mobile/src/forge/screens/match/input/InputPlaybackControl.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputPlaybackControl.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputPlaybackControl.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputProliferate.java b/forge-gui-mobile/src/forge/screens/match/input/InputProliferate.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputProliferate.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputProliferate.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputProxy.java b/forge-gui-mobile/src/forge/screens/match/input/InputProxy.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputProxy.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputProxy.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputQueue.java b/forge-gui-mobile/src/forge/screens/match/input/InputQueue.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputQueue.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputQueue.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputSelectCardsForConvoke.java b/forge-gui-mobile/src/forge/screens/match/input/InputSelectCardsForConvoke.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputSelectCardsForConvoke.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputSelectCardsForConvoke.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputSelectCardsFromList.java b/forge-gui-mobile/src/forge/screens/match/input/InputSelectCardsFromList.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputSelectCardsFromList.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputSelectCardsFromList.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputSelectEntitiesFromList.java b/forge-gui-mobile/src/forge/screens/match/input/InputSelectEntitiesFromList.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputSelectEntitiesFromList.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputSelectEntitiesFromList.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputSelectManyBase.java b/forge-gui-mobile/src/forge/screens/match/input/InputSelectManyBase.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputSelectManyBase.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputSelectManyBase.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputSelectTargets.java b/forge-gui-mobile/src/forge/screens/match/input/InputSelectTargets.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputSelectTargets.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputSelectTargets.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputSynchronized.java b/forge-gui-mobile/src/forge/screens/match/input/InputSynchronized.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputSynchronized.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputSynchronized.java
diff --git a/forge-m-base/src/forge/screens/match/input/InputSyncronizedBase.java b/forge-gui-mobile/src/forge/screens/match/input/InputSyncronizedBase.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/input/InputSyncronizedBase.java
rename to forge-gui-mobile/src/forge/screens/match/input/InputSyncronizedBase.java
diff --git a/forge-m-base/src/forge/screens/match/views/VAssignDamage.java b/forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VAssignDamage.java
rename to forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java
diff --git a/forge-m-base/src/forge/screens/match/views/VAvatar.java b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VAvatar.java
rename to forge-gui-mobile/src/forge/screens/match/views/VAvatar.java
diff --git a/forge-m-base/src/forge/screens/match/views/VCardDisplayArea.java b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VCardDisplayArea.java
rename to forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
diff --git a/forge-m-base/src/forge/screens/match/views/VCombat.java b/forge-gui-mobile/src/forge/screens/match/views/VCombat.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VCombat.java
rename to forge-gui-mobile/src/forge/screens/match/views/VCombat.java
diff --git a/forge-m-base/src/forge/screens/match/views/VDevMenu.java b/forge-gui-mobile/src/forge/screens/match/views/VDevMenu.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VDevMenu.java
rename to forge-gui-mobile/src/forge/screens/match/views/VDevMenu.java
diff --git a/forge-m-base/src/forge/screens/match/views/VDisplayArea.java b/forge-gui-mobile/src/forge/screens/match/views/VDisplayArea.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VDisplayArea.java
rename to forge-gui-mobile/src/forge/screens/match/views/VDisplayArea.java
diff --git a/forge-m-base/src/forge/screens/match/views/VField.java b/forge-gui-mobile/src/forge/screens/match/views/VField.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VField.java
rename to forge-gui-mobile/src/forge/screens/match/views/VField.java
diff --git a/forge-m-base/src/forge/screens/match/views/VFlashbackZone.java b/forge-gui-mobile/src/forge/screens/match/views/VFlashbackZone.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VFlashbackZone.java
rename to forge-gui-mobile/src/forge/screens/match/views/VFlashbackZone.java
diff --git a/forge-m-base/src/forge/screens/match/views/VGameMenu.java b/forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VGameMenu.java
rename to forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java
diff --git a/forge-m-base/src/forge/screens/match/views/VLog.java b/forge-gui-mobile/src/forge/screens/match/views/VLog.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VLog.java
rename to forge-gui-mobile/src/forge/screens/match/views/VLog.java
diff --git a/forge-m-base/src/forge/screens/match/views/VManaPool.java b/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VManaPool.java
rename to forge-gui-mobile/src/forge/screens/match/views/VManaPool.java
diff --git a/forge-m-base/src/forge/screens/match/views/VPhaseIndicator.java b/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VPhaseIndicator.java
rename to forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java
diff --git a/forge-m-base/src/forge/screens/match/views/VPlayerPanel.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VPlayerPanel.java
rename to forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
diff --git a/forge-m-base/src/forge/screens/match/views/VPlayers.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayers.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VPlayers.java
rename to forge-gui-mobile/src/forge/screens/match/views/VPlayers.java
diff --git a/forge-m-base/src/forge/screens/match/views/VPrompt.java b/forge-gui-mobile/src/forge/screens/match/views/VPrompt.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VPrompt.java
rename to forge-gui-mobile/src/forge/screens/match/views/VPrompt.java
diff --git a/forge-m-base/src/forge/screens/match/views/VStack.java b/forge-gui-mobile/src/forge/screens/match/views/VStack.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VStack.java
rename to forge-gui-mobile/src/forge/screens/match/views/VStack.java
diff --git a/forge-m-base/src/forge/screens/match/views/VZoneDisplay.java b/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/views/VZoneDisplay.java
rename to forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java
diff --git a/forge-m-base/src/forge/screens/match/winlose/ControlWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/ControlWinLose.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/winlose/ControlWinLose.java
rename to forge-gui-mobile/src/forge/screens/match/winlose/ControlWinLose.java
diff --git a/forge-m-base/src/forge/screens/match/winlose/GauntletWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/winlose/GauntletWinLose.java
rename to forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java
diff --git a/forge-m-base/src/forge/screens/match/winlose/LimitedWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/LimitedWinLose.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/winlose/LimitedWinLose.java
rename to forge-gui-mobile/src/forge/screens/match/winlose/LimitedWinLose.java
diff --git a/forge-m-base/src/forge/screens/match/winlose/ViewWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java
similarity index 100%
rename from forge-m-base/src/forge/screens/match/winlose/ViewWinLose.java
rename to forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java
diff --git a/forge-m-base/src/forge/screens/quest/QuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/quest/QuestScreen.java
rename to forge-gui-mobile/src/forge/screens/quest/QuestScreen.java
diff --git a/forge-m-base/src/forge/screens/sealed/SealedScreen.java b/forge-gui-mobile/src/forge/screens/sealed/SealedScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/sealed/SealedScreen.java
rename to forge-gui-mobile/src/forge/screens/sealed/SealedScreen.java
diff --git a/forge-m-base/src/forge/screens/settings/SettingsScreen.java b/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java
similarity index 100%
rename from forge-m-base/src/forge/screens/settings/SettingsScreen.java
rename to forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java
diff --git a/forge-m-base/src/forge/toolbox/FButton.java b/forge-gui-mobile/src/forge/toolbox/FButton.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FButton.java
rename to forge-gui-mobile/src/forge/toolbox/FButton.java
diff --git a/forge-m-base/src/forge/toolbox/FCardPanel.java b/forge-gui-mobile/src/forge/toolbox/FCardPanel.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FCardPanel.java
rename to forge-gui-mobile/src/forge/toolbox/FCardPanel.java
diff --git a/forge-m-base/src/forge/toolbox/FCardZoom.java b/forge-gui-mobile/src/forge/toolbox/FCardZoom.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FCardZoom.java
rename to forge-gui-mobile/src/forge/toolbox/FCardZoom.java
diff --git a/forge-m-base/src/forge/toolbox/FCheckBox.java b/forge-gui-mobile/src/forge/toolbox/FCheckBox.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FCheckBox.java
rename to forge-gui-mobile/src/forge/toolbox/FCheckBox.java
diff --git a/forge-m-base/src/forge/toolbox/FComboBox.java b/forge-gui-mobile/src/forge/toolbox/FComboBox.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FComboBox.java
rename to forge-gui-mobile/src/forge/toolbox/FComboBox.java
diff --git a/forge-m-base/src/forge/toolbox/FContainer.java b/forge-gui-mobile/src/forge/toolbox/FContainer.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FContainer.java
rename to forge-gui-mobile/src/forge/toolbox/FContainer.java
diff --git a/forge-m-base/src/forge/toolbox/FDisplayObject.java b/forge-gui-mobile/src/forge/toolbox/FDisplayObject.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FDisplayObject.java
rename to forge-gui-mobile/src/forge/toolbox/FDisplayObject.java
diff --git a/forge-m-base/src/forge/toolbox/FEvent.java b/forge-gui-mobile/src/forge/toolbox/FEvent.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FEvent.java
rename to forge-gui-mobile/src/forge/toolbox/FEvent.java
diff --git a/forge-m-base/src/forge/toolbox/FFileChooser.java b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FFileChooser.java
rename to forge-gui-mobile/src/forge/toolbox/FFileChooser.java
diff --git a/forge-m-base/src/forge/toolbox/FGestureAdapter.java b/forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FGestureAdapter.java
rename to forge-gui-mobile/src/forge/toolbox/FGestureAdapter.java
diff --git a/forge-m-base/src/forge/toolbox/FLabel.java b/forge-gui-mobile/src/forge/toolbox/FLabel.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FLabel.java
rename to forge-gui-mobile/src/forge/toolbox/FLabel.java
diff --git a/forge-m-base/src/forge/toolbox/FList.java b/forge-gui-mobile/src/forge/toolbox/FList.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FList.java
rename to forge-gui-mobile/src/forge/toolbox/FList.java
diff --git a/forge-m-base/src/forge/toolbox/FOptionPane.java b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FOptionPane.java
rename to forge-gui-mobile/src/forge/toolbox/FOptionPane.java
diff --git a/forge-m-base/src/forge/toolbox/FOverlay.java b/forge-gui-mobile/src/forge/toolbox/FOverlay.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FOverlay.java
rename to forge-gui-mobile/src/forge/toolbox/FOverlay.java
diff --git a/forge-m-base/src/forge/toolbox/FPanel.java b/forge-gui-mobile/src/forge/toolbox/FPanel.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FPanel.java
rename to forge-gui-mobile/src/forge/toolbox/FPanel.java
diff --git a/forge-m-base/src/forge/toolbox/FProgressBar.java b/forge-gui-mobile/src/forge/toolbox/FProgressBar.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FProgressBar.java
rename to forge-gui-mobile/src/forge/toolbox/FProgressBar.java
diff --git a/forge-m-base/src/forge/toolbox/FRadioButton.java b/forge-gui-mobile/src/forge/toolbox/FRadioButton.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FRadioButton.java
rename to forge-gui-mobile/src/forge/toolbox/FRadioButton.java
diff --git a/forge-m-base/src/forge/toolbox/FScrollPane.java b/forge-gui-mobile/src/forge/toolbox/FScrollPane.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FScrollPane.java
rename to forge-gui-mobile/src/forge/toolbox/FScrollPane.java
diff --git a/forge-m-base/src/forge/toolbox/FSpinner.java b/forge-gui-mobile/src/forge/toolbox/FSpinner.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FSpinner.java
rename to forge-gui-mobile/src/forge/toolbox/FSpinner.java
diff --git a/forge-m-base/src/forge/toolbox/FTextArea.java b/forge-gui-mobile/src/forge/toolbox/FTextArea.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FTextArea.java
rename to forge-gui-mobile/src/forge/toolbox/FTextArea.java
diff --git a/forge-m-base/src/forge/toolbox/FTextField.java b/forge-gui-mobile/src/forge/toolbox/FTextField.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FTextField.java
rename to forge-gui-mobile/src/forge/toolbox/FTextField.java
diff --git a/forge-m-base/src/forge/toolbox/FToggleSwitch.java b/forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/FToggleSwitch.java
rename to forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java
diff --git a/forge-m-base/src/forge/toolbox/GuiChoose.java b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/GuiChoose.java
rename to forge-gui-mobile/src/forge/toolbox/GuiChoose.java
diff --git a/forge-m-base/src/forge/toolbox/GuiDialog.java b/forge-gui-mobile/src/forge/toolbox/GuiDialog.java
similarity index 100%
rename from forge-m-base/src/forge/toolbox/GuiDialog.java
rename to forge-gui-mobile/src/forge/toolbox/GuiDialog.java
diff --git a/forge-m-base/src/forge/utils/CardPreferences.java b/forge-gui-mobile/src/forge/utils/CardPreferences.java
similarity index 100%
rename from forge-m-base/src/forge/utils/CardPreferences.java
rename to forge-gui-mobile/src/forge/utils/CardPreferences.java
diff --git a/forge-m-base/src/forge/utils/Constants.java b/forge-gui-mobile/src/forge/utils/Constants.java
similarity index 100%
rename from forge-m-base/src/forge/utils/Constants.java
rename to forge-gui-mobile/src/forge/utils/Constants.java
diff --git a/forge-m-base/src/forge/utils/Evaluator.java b/forge-gui-mobile/src/forge/utils/Evaluator.java
similarity index 100%
rename from forge-m-base/src/forge/utils/Evaluator.java
rename to forge-gui-mobile/src/forge/utils/Evaluator.java
diff --git a/forge-m-base/src/forge/utils/ForgePreferences.java b/forge-gui-mobile/src/forge/utils/ForgePreferences.java
similarity index 100%
rename from forge-m-base/src/forge/utils/ForgePreferences.java
rename to forge-gui-mobile/src/forge/utils/ForgePreferences.java
diff --git a/forge-m-base/src/forge/utils/ForgeProfileProperties.java b/forge-gui-mobile/src/forge/utils/ForgeProfileProperties.java
similarity index 100%
rename from forge-m-base/src/forge/utils/ForgeProfileProperties.java
rename to forge-gui-mobile/src/forge/utils/ForgeProfileProperties.java
diff --git a/forge-m-base/src/forge/utils/IgnoringXStream.java b/forge-gui-mobile/src/forge/utils/IgnoringXStream.java
similarity index 100%
rename from forge-m-base/src/forge/utils/IgnoringXStream.java
rename to forge-gui-mobile/src/forge/utils/IgnoringXStream.java
diff --git a/forge-m-base/src/forge/utils/LayoutHelper.java b/forge-gui-mobile/src/forge/utils/LayoutHelper.java
similarity index 100%
rename from forge-m-base/src/forge/utils/LayoutHelper.java
rename to forge-gui-mobile/src/forge/utils/LayoutHelper.java
diff --git a/forge-m-base/src/forge/utils/PhysicsObject.java b/forge-gui-mobile/src/forge/utils/PhysicsObject.java
similarity index 100%
rename from forge-m-base/src/forge/utils/PhysicsObject.java
rename to forge-gui-mobile/src/forge/utils/PhysicsObject.java
diff --git a/forge-m-base/src/forge/utils/Preferences.java b/forge-gui-mobile/src/forge/utils/Preferences.java
similarity index 100%
rename from forge-m-base/src/forge/utils/Preferences.java
rename to forge-gui-mobile/src/forge/utils/Preferences.java
diff --git a/forge-m-base/src/forge/utils/PreferencesStore.java b/forge-gui-mobile/src/forge/utils/PreferencesStore.java
similarity index 100%
rename from forge-m-base/src/forge/utils/PreferencesStore.java
rename to forge-gui-mobile/src/forge/utils/PreferencesStore.java
diff --git a/forge-m-base/src/forge/utils/Utils.java b/forge-gui-mobile/src/forge/utils/Utils.java
similarity index 100%
rename from forge-m-base/src/forge/utils/Utils.java
rename to forge-gui-mobile/src/forge/utils/Utils.java
diff --git a/forge-m-base/src/forge/utils/XmlUtil.java b/forge-gui-mobile/src/forge/utils/XmlUtil.java
similarity index 100%
rename from forge-m-base/src/forge/utils/XmlUtil.java
rename to forge-gui-mobile/src/forge/utils/XmlUtil.java