From 96ffc7d4989c7570e5ec0ef980193925eee31782 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 10 Mar 2018 17:38:27 +0100 Subject: [PATCH] Hoist gui module to top level and adapt pom --- gui/pom.xml | 372 ------------- pom.xml | 520 ++++++++++++------ .../java/io/bisq/gui/CandleStickChart.css | 0 .../main/java/io/bisq/gui/GuiModule.java | 0 .../main/java/io/bisq/gui/Navigation.java | 0 .../main/java/io/bisq/gui/SystemTray.java | 0 .../main/java/io/bisq/gui/app/BisqApp.java | 0 .../java/io/bisq/gui/app/BisqAppMain.java | 0 .../java/io/bisq/gui/app/BisqAppModule.java | 0 .../main/java/io/bisq/gui/bisq.css | 0 .../main/java/io/bisq/gui/common/UITimer.java | 0 .../io/bisq/gui/common/ViewfxException.java | 0 .../bisq/gui/common/fxml/FxmlViewLoader.java | 0 .../io/bisq/gui/common/model/Activatable.java | 0 .../common/model/ActivatableDataModel.java | 0 .../common/model/ActivatableViewModel.java | 0 .../model/ActivatableWithDataModel.java | 0 .../io/bisq/gui/common/model/DataModel.java | 0 .../java/io/bisq/gui/common/model/Model.java | 0 .../io/bisq/gui/common/model/ViewModel.java | 0 .../bisq/gui/common/model/WithDataModel.java | 0 .../io/bisq/gui/common/view/AbstractView.java | 0 .../bisq/gui/common/view/ActivatableView.java | 0 .../common/view/ActivatableViewAndModel.java | 0 .../gui/common/view/CachingViewLoader.java | 0 .../common/view/DefaultPathConvention.java | 0 .../io/bisq/gui/common/view/FxmlView.java | 0 .../gui/common/view/InitializableView.java | 0 .../java/io/bisq/gui/common/view/View.java | 0 .../io/bisq/gui/common/view/ViewFactory.java | 0 .../io/bisq/gui/common/view/ViewLoader.java | 0 .../io/bisq/gui/common/view/ViewPath.java | 0 .../view/guice/InjectorViewFactory.java | 0 .../bisq/gui/components/AddressTextField.java | 0 .../AddressWithIconAndDirection.java | 0 .../gui/components/AutoTooltipButton.java | 0 .../gui/components/AutoTooltipCheckBox.java | 0 .../bisq/gui/components/AutoTooltipLabel.java | 0 .../components/AutoTooltipRadioButton.java | 0 .../components/AutoTooltipTableColumn.java | 0 .../components/AutoTooltipToggleButton.java | 0 .../bisq/gui/components/BalanceTextField.java | 0 .../BalanceWithConfirmationTextField.java | 0 .../gui/components/BsqAddressTextField.java | 0 .../io/bisq/gui/components/BusyAnimation.java | 0 .../ColoredDecimalPlacesWithZerosText.java | 0 .../bisq/gui/components/FundsTextField.java | 0 .../gui/components/HyperlinkWithIcon.java | 0 .../io/bisq/gui/components/InfoDisplay.java | 0 .../io/bisq/gui/components/InfoTextField.java | 0 .../bisq/gui/components/InputTextField.java | 0 .../gui/components/PasswordTextField.java | 0 .../io/bisq/gui/components/PeerInfoIcon.java | 0 .../bisq/gui/components/SearchComboBox.java | 0 .../gui/components/SeparatedPhaseBars.java | 0 .../gui/components/TableGroupHeadline.java | 0 .../gui/components/TextFieldWithCopyIcon.java | 0 .../io/bisq/gui/components/TitledGroupBg.java | 0 .../io/bisq/gui/components/TooltipUtil.java | 0 .../io/bisq/gui/components/TxIdTextField.java | 0 .../indicator/TxConfidenceIndicator.java | 0 .../StaticProgressIndicatorBehavior.java | 0 .../skin/StaticProgressIndicatorSkin.java | 0 .../components/paymentmethods/AliPayForm.java | 0 .../components/paymentmethods/BankForm.java | 0 .../paymentmethods/CashAppForm.java | 0 .../paymentmethods/CashDepositForm.java | 0 .../paymentmethods/ChaseQuickPayForm.java | 0 .../paymentmethods/ClearXchangeForm.java | 0 .../paymentmethods/CryptoCurrencyForm.java | 0 .../paymentmethods/FasterPaymentsForm.java | 0 .../paymentmethods/InteracETransferForm.java | 0 .../paymentmethods/MoneyBeamForm.java | 0 .../paymentmethods/NationalBankForm.java | 0 .../components/paymentmethods/OKPayForm.java | 0 .../paymentmethods/PaymentMethodForm.java | 0 .../paymentmethods/PerfectMoneyForm.java | 0 .../paymentmethods/PopmoneyForm.java | 0 .../paymentmethods/RevolutForm.java | 0 .../paymentmethods/SameBankForm.java | 0 .../components/paymentmethods/SepaForm.java | 0 .../paymentmethods/SepaInstantForm.java | 0 .../paymentmethods/SpecificBankForm.java | 0 .../components/paymentmethods/SwishForm.java | 0 .../USPostalMoneyOrderForm.java | 0 .../components/paymentmethods/UpholdForm.java | 0 .../components/paymentmethods/VenmoForm.java | 0 .../paymentmethods/WesternUnionForm.java | 0 .../main/java/io/bisq/gui/images.css | 0 .../main/java/io/bisq/gui/main/MainView.fxml | 0 .../main/java/io/bisq/gui/main/MainView.java | 0 .../java/io/bisq/gui/main/MainViewModel.java | 0 .../bisq/gui/main/PriceFeedComboBoxItem.java | 0 .../io/bisq/gui/main/account/AccountView.fxml | 0 .../io/bisq/gui/main/account/AccountView.java | 0 .../gui/main/account/AccountViewModel.java | 0 .../ArbitratorRegistrationView.fxml | 0 .../ArbitratorRegistrationView.java | 0 .../ArbitratorRegistrationViewModel.java | 0 .../AltCoinAccountsDataModel.java | 0 .../altcoinaccounts/AltCoinAccountsView.fxml | 0 .../altcoinaccounts/AltCoinAccountsView.java | 0 .../AltCoinAccountsViewModel.java | 0 .../ArbitratorListItem.java | 0 .../ArbitratorSelectionView.fxml | 0 .../ArbitratorSelectionView.java | 0 .../ArbitratorSelectionViewModel.java | 0 .../account/content/backup/BackupView.fxml | 0 .../account/content/backup/BackupView.java | 0 .../fiataccounts/FiatAccountsDataModel.java | 0 .../fiataccounts/FiatAccountsView.fxml | 0 .../fiataccounts/FiatAccountsView.java | 0 .../fiataccounts/FiatAccountsViewModel.java | 0 .../content/password/PasswordView.fxml | 0 .../content/password/PasswordView.java | 0 .../content/seedwords/SeedWordsView.fxml | 0 .../content/seedwords/SeedWordsView.java | 0 .../account/settings/AccountSettingsView.fxml | 0 .../account/settings/AccountSettingsView.java | 0 .../java/io/bisq/gui/main/dao/DaoView.fxml | 0 .../java/io/bisq/gui/main/dao/DaoView.java | 0 .../CompensationRequestDisplay.java | 0 .../CompensationRequestListItem.java | 0 .../compensation/CompensationRequestView.java | 0 .../dao/compensation/CompensationView.fxml | 0 .../dao/compensation/CompensationView.java | 0 .../active/ActiveCompensationRequestView.fxml | 0 .../active/ActiveCompensationRequestView.java | 0 .../create/CreateCompensationRequestView.fxml | 0 .../create/CreateCompensationRequestView.java | 0 .../past/PastCompensationRequestView.fxml | 0 .../past/PastCompensationRequestView.java | 0 .../bisq/gui/main/dao/voting/VotingView.fxml | 0 .../bisq/gui/main/dao/voting/VotingView.java | 0 .../voting/dashboard/VotingDashboardView.fxml | 0 .../voting/dashboard/VotingDashboardView.java | 0 .../dao/voting/history/VotingHistoryView.fxml | 0 .../dao/voting/history/VotingHistoryView.java | 0 .../dao/voting/vote/CompensationViewItem.java | 0 .../dao/voting/vote/ParameterViewItem.java | 0 .../gui/main/dao/voting/vote/VoteView.fxml | 0 .../gui/main/dao/voting/vote/VoteView.java | 0 .../gui/main/dao/wallet/BsqBalanceUtil.java | 0 .../gui/main/dao/wallet/BsqWalletView.fxml | 0 .../gui/main/dao/wallet/BsqWalletView.java | 0 .../wallet/dashboard/BsqDashboardView.fxml | 0 .../wallet/dashboard/BsqDashboardView.java | 0 .../dao/wallet/receive/BsqReceiveView.fxml | 0 .../dao/wallet/receive/BsqReceiveView.java | 0 .../gui/main/dao/wallet/send/BsqSendView.fxml | 0 .../gui/main/dao/wallet/send/BsqSendView.java | 0 .../gui/main/dao/wallet/tx/BsqTxListItem.java | 0 .../gui/main/dao/wallet/tx/BsqTxView.fxml | 0 .../gui/main/dao/wallet/tx/BsqTxView.java | 0 .../io/bisq/gui/main/debug/DebugView.fxml | 0 .../io/bisq/gui/main/debug/DebugView.java | 0 .../bisq/gui/main/disputes/DisputesView.fxml | 0 .../bisq/gui/main/disputes/DisputesView.java | 0 .../arbitrator/ArbitratorDisputeView.fxml | 0 .../arbitrator/ArbitratorDisputeView.java | 0 .../disputes/trader/TraderDisputeView.fxml | 0 .../disputes/trader/TraderDisputeView.java | 0 .../io/bisq/gui/main/funds/FundsView.fxml | 0 .../io/bisq/gui/main/funds/FundsView.java | 0 .../main/funds/deposit/DepositListItem.java | 0 .../gui/main/funds/deposit/DepositView.fxml | 0 .../gui/main/funds/deposit/DepositView.java | 0 .../gui/main/funds/locked/LockedListItem.java | 0 .../gui/main/funds/locked/LockedView.fxml | 0 .../gui/main/funds/locked/LockedView.java | 0 .../main/funds/reserved/ReservedListItem.java | 0 .../gui/main/funds/reserved/ReservedView.fxml | 0 .../gui/main/funds/reserved/ReservedView.java | 0 .../transactions/DisplayedTransactions.java | 0 .../DisplayedTransactionsFactory.java | 0 .../DummyTransactionAwareTradable.java | 0 .../transactions/ObservableListDecorator.java | 0 .../transactions/TradableRepository.java | 0 .../TransactionAwareOpenOffer.java | 0 .../TransactionAwareTradable.java | 0 .../TransactionAwareTradableFactory.java | 0 .../transactions/TransactionAwareTrade.java | 0 .../TransactionListItemFactory.java | 0 .../transactions/TransactionsListItem.java | 0 .../funds/transactions/TransactionsView.fxml | 0 .../funds/transactions/TransactionsView.java | 0 .../funds/withdrawal/WithdrawalListItem.java | 0 .../main/funds/withdrawal/WithdrawalView.fxml | 0 .../main/funds/withdrawal/WithdrawalView.java | 0 .../io/bisq/gui/main/market/MarketView.fxml | 0 .../io/bisq/gui/main/market/MarketView.java | 0 .../market/offerbook/OfferBookChartView.fxml | 0 .../market/offerbook/OfferBookChartView.java | 0 .../offerbook/OfferBookChartViewModel.java | 0 .../main/market/offerbook/OfferListItem.java | 0 .../gui/main/market/spread/SpreadItem.java | 0 .../gui/main/market/spread/SpreadView.fxml | 0 .../gui/main/market/spread/SpreadView.java | 0 .../main/market/spread/SpreadViewModel.java | 0 .../main/market/trades/TradesChartsView.fxml | 0 .../main/market/trades/TradesChartsView.java | 0 .../market/trades/TradesChartsViewModel.java | 0 .../main/market/trades/charts/CandleData.java | 0 .../market/trades/charts/price/Candle.java | 0 .../trades/charts/price/CandleStickChart.java | 0 .../trades/charts/price/CandleTooltip.java | 0 .../trades/charts/volume/VolumeBar.java | 0 .../trades/charts/volume/VolumeChart.java | 0 .../io/bisq/gui/main/offer/BuyOfferView.fxml | 0 .../io/bisq/gui/main/offer/BuyOfferView.java | 0 .../bisq/gui/main/offer/OfferDataModel.java | 0 .../io/bisq/gui/main/offer/OfferView.java | 0 .../io/bisq/gui/main/offer/SellOfferView.fxml | 0 .../io/bisq/gui/main/offer/SellOfferView.java | 0 .../createoffer/CreateOfferDataModel.java | 0 .../offer/createoffer/CreateOfferView.fxml | 0 .../offer/createoffer/CreateOfferView.java | 0 .../createoffer/CreateOfferViewModel.java | 0 .../gui/main/offer/offerbook/OfferBook.java | 0 .../offer/offerbook/OfferBookListItem.java | 0 .../main/offer/offerbook/OfferBookView.fxml | 0 .../main/offer/offerbook/OfferBookView.java | 0 .../offer/offerbook/OfferBookViewModel.java | 0 .../offer/takeoffer/TakeOfferDataModel.java | 0 .../main/offer/takeoffer/TakeOfferView.fxml | 0 .../main/offer/takeoffer/TakeOfferView.java | 0 .../offer/takeoffer/TakeOfferViewModel.java | 0 .../io/bisq/gui/main/overlays/Overlay.java | 0 .../editor/PeerInfoWithTagEditor.java | 0 .../overlays/notifications/Notification.java | 0 .../notifications/NotificationCenter.java | 0 .../notifications/NotificationManager.java | 0 .../bisq/gui/main/overlays/popups/Popup.java | 0 .../main/overlays/popups/PopupManager.java | 0 .../main/overlays/windows/ContractWindow.java | 0 .../windows/DisplayAlertMessageWindow.java | 0 .../windows/DisputeSummaryWindow.java | 0 .../overlays/windows/EmptyWalletWindow.java | 0 .../overlays/windows/FeeOptionWindow.java | 0 .../main/overlays/windows/FilterWindow.java | 0 .../windows/ManualPayoutTxWindow.java | 0 .../overlays/windows/OfferDetailsWindow.java | 0 .../main/overlays/windows/QRCodeWindow.java | 0 .../windows/SelectBaseCurrencyWindow.java | 0 .../windows/SelectDepositTxWindow.java | 0 .../windows/SendAlertMessageWindow.java | 0 .../SendPrivateNotificationWindow.java | 0 .../windows/ShowWalletDataWindow.java | 0 .../gui/main/overlays/windows/TacWindow.java | 0 .../windows/TorNetworkSettingsWindow.java | 0 .../overlays/windows/TradeDetailsWindow.java | 0 .../UnlockArbitrationRegistrationWindow.java | 0 .../windows/WalletPasswordWindow.java | 0 .../windows/downloadupdate/BisqInstaller.java | 0 .../DisplayUpdateDownloadWindow.java | 0 .../windows/downloadupdate/DownloadTask.java | 0 .../windows/downloadupdate/VerifyTask.java | 0 .../gui/main/portfolio/PortfolioView.fxml | 0 .../gui/main/portfolio/PortfolioView.java | 0 .../closedtrades/ClosedTradableListItem.java | 0 .../closedtrades/ClosedTradesDataModel.java | 0 .../closedtrades/ClosedTradesView.fxml | 0 .../closedtrades/ClosedTradesView.java | 0 .../closedtrades/ClosedTradesViewModel.java | 0 .../failedtrades/FailedTradesDataModel.java | 0 .../failedtrades/FailedTradesListItem.java | 0 .../failedtrades/FailedTradesView.fxml | 0 .../failedtrades/FailedTradesView.java | 0 .../failedtrades/FailedTradesViewModel.java | 0 .../openoffer/OpenOfferListItem.java | 0 .../openoffer/OpenOffersDataModel.java | 0 .../portfolio/openoffer/OpenOffersView.fxml | 0 .../portfolio/openoffer/OpenOffersView.java | 0 .../openoffer/OpenOffersViewModel.java | 0 .../portfolio/pendingtrades/BuyerSubView.java | 0 .../pendingtrades/PendingTradesDataModel.java | 0 .../pendingtrades/PendingTradesListItem.java | 0 .../pendingtrades/PendingTradesView.fxml | 0 .../pendingtrades/PendingTradesView.java | 0 .../pendingtrades/PendingTradesViewModel.java | 0 .../pendingtrades/SellerSubView.java | 0 .../portfolio/pendingtrades/TradeSubView.java | 0 .../pendingtrades/steps/TradeStepView.java | 0 .../pendingtrades/steps/TradeWizardItem.java | 0 .../steps/buyer/BuyerStep1View.java | 0 .../steps/buyer/BuyerStep2View.java | 0 .../steps/buyer/BuyerStep3View.java | 0 .../steps/buyer/BuyerStep4View.java | 0 .../steps/seller/SellerStep1View.java | 0 .../steps/seller/SellerStep2View.java | 0 .../steps/seller/SellerStep3View.java | 0 .../steps/seller/SellerStep4View.java | 0 .../bisq/gui/main/settings/SettingsView.fxml | 0 .../bisq/gui/main/settings/SettingsView.java | 0 .../gui/main/settings/about/AboutView.fxml | 0 .../gui/main/settings/about/AboutView.java | 0 .../settings/network/NetworkSettingsView.fxml | 0 .../settings/network/NetworkSettingsView.java | 0 .../settings/network/P2pNetworkListItem.java | 0 .../settings/preferences/PreferencesView.fxml | 0 .../settings/preferences/PreferencesView.java | 0 .../java/io/bisq/gui/util/BSFormatter.java | 0 .../java/io/bisq/gui/util/BsqFormatter.java | 0 .../main/java/io/bisq/gui/util/Colors.java | 0 .../java/io/bisq/gui/util/CurrencyList.java | 0 .../io/bisq/gui/util/CurrencyListItem.java | 0 .../io/bisq/gui/util/CurrencyPredicates.java | 0 .../java/io/bisq/gui/util/FormBuilder.java | 0 .../java/io/bisq/gui/util/GUIProfiler.java | 0 .../main/java/io/bisq/gui/util/GUIUtil.java | 0 .../main/java/io/bisq/gui/util/ImageUtil.java | 0 .../main/java/io/bisq/gui/util/Layout.java | 0 .../java/io/bisq/gui/util/Transitions.java | 0 .../util/validation/AccountNrValidator.java | 0 .../gui/util/validation/AliPayValidator.java | 0 .../validation/AltCoinAddressValidator.java | 0 .../gui/util/validation/AltcoinValidator.java | 0 .../gui/util/validation/BICValidator.java | 0 .../gui/util/validation/BankIdValidator.java | 0 .../gui/util/validation/BankValidator.java | 0 .../util/validation/BranchIdValidator.java | 0 .../util/validation/BsqAddressValidator.java | 0 .../gui/util/validation/BsqValidator.java | 0 .../util/validation/BtcAddressValidator.java | 0 .../gui/util/validation/BtcValidator.java | 0 .../gui/util/validation/CashAppValidator.java | 0 .../validation/ChaseQuickPayValidator.java | 0 .../validation/ClearXchangeValidator.java | 0 .../gui/util/validation/EmailValidator.java | 0 .../util/validation/FiatPriceValidator.java | 0 .../util/validation/FiatVolumeValidator.java | 0 .../gui/util/validation/IBANValidator.java | 0 .../gui/util/validation/InputValidator.java | 0 .../validation/InteracETransferValidator.java | 0 .../util/validation/MonetaryValidator.java | 0 .../util/validation/MoneyBeamValidator.java | 0 .../gui/util/validation/NumberValidator.java | 0 .../gui/util/validation/OKPayValidator.java | 0 .../util/validation/PasswordValidator.java | 0 .../validation/PerfectMoneyValidator.java | 0 .../util/validation/PopmoneyValidator.java | 0 .../gui/util/validation/RevolutValidator.java | 0 .../validation/SecurityDepositValidator.java | 0 .../gui/util/validation/SwishValidator.java | 0 .../USPostalMoneyOrderValidator.java | 0 .../gui/util/validation/UpholdValidator.java | 0 .../gui/util/validation/VenmoValidator.java | 0 .../altcoins/ByteballAddressValidator.java | 0 .../altcoins/NxtReedSolomonValidator.java | 0 .../altcoins/OctocoinAddressValidator.java | 0 .../altcoins/PNCAddressValidator.java | 0 .../altcoins/WMCCAddressValidator.java | 0 .../altcoins/XCNAddressValidator.java | 0 .../altcoins/YTNAddressValidator.java | 0 .../gui/util/validation/params/ACHParams.java | 0 .../gui/util/validation/params/AlcParams.java | 0 .../util/validation/params/CageParams.java | 0 .../util/validation/params/CreaParams.java | 0 .../gui/util/validation/params/IOPParams.java | 0 .../gui/util/validation/params/ODNParams.java | 0 .../validation/params/OctocoinParams.java | 0 .../util/validation/params/OnionParams.java | 0 .../util/validation/params/PARTParams.java | 0 .../gui/util/validation/params/PNCParams.java | 0 .../util/validation/params/PivxParams.java | 0 .../validation/params/SpeedCashParams.java | 0 .../util/validation/params/StrayaParams.java | 0 .../validation/params/TerracoinParams.java | 0 .../util/validation/params/WACoinsParams.java | 0 .../util/validation/params/WMCCParams.java | 0 .../util/validation/params/XspecParams.java | 0 .../params/btc/AbstractBitcoinNetParams.java | 0 .../util/validation/params/btc/BTGParams.java | 0 .../btc/BtcMainNetParamsForValidation.java | 0 .../util/validation/params/btc/Networks.java | 0 .../main/resources/fonts/Apache License.txt | 0 .../main/resources/fonts/DroidSansMono.ttf | Bin .../main/resources/fonts/Verdana.ttf | Bin .../main/resources/fonts/VerdanaBold.ttf | Bin .../main/resources/images/alert_round.png | Bin .../main/resources/images/alert_round@2x.png | Bin .../main/resources/images/arrow_blue.png | Bin .../main/resources/images/arrow_blue@2x.png | Bin .../main/resources/images/arrow_grey.png | Bin .../main/resources/images/arrow_grey@2x.png | Bin .../main/resources/images/attachment.png | Bin .../main/resources/images/attachment@2x.png | Bin .../resources/images/avatars/avatar_1.png | Bin .../resources/images/avatars/avatar_10.png | Bin .../resources/images/avatars/avatar_10@2x.png | Bin .../resources/images/avatars/avatar_11.png | Bin .../resources/images/avatars/avatar_11@2x.png | Bin .../resources/images/avatars/avatar_12.png | Bin .../resources/images/avatars/avatar_12@2x.png | Bin .../resources/images/avatars/avatar_13.png | Bin .../resources/images/avatars/avatar_13@2x.png | Bin .../resources/images/avatars/avatar_14.png | Bin .../resources/images/avatars/avatar_14@2x.png | Bin .../resources/images/avatars/avatar_15.png | Bin .../resources/images/avatars/avatar_15@2x.png | Bin .../resources/images/avatars/avatar_1@2x.png | Bin .../resources/images/avatars/avatar_2.png | Bin .../resources/images/avatars/avatar_2@2x.png | Bin .../resources/images/avatars/avatar_3.png | Bin .../resources/images/avatars/avatar_3@2x.png | Bin .../resources/images/avatars/avatar_4.png | Bin .../resources/images/avatars/avatar_4@2x.png | Bin .../resources/images/avatars/avatar_5.png | Bin .../resources/images/avatars/avatar_5@2x.png | Bin .../resources/images/avatars/avatar_6.png | Bin .../resources/images/avatars/avatar_6@2x.png | Bin .../resources/images/avatars/avatar_7.png | Bin .../resources/images/avatars/avatar_7@2x.png | Bin .../resources/images/avatars/avatar_8.png | Bin .../resources/images/avatars/avatar_8@2x.png | Bin .../resources/images/avatars/avatar_9.png | Bin .../resources/images/avatars/avatar_9@2x.png | Bin .../main/resources/images/blue_circle.png | Bin .../main/resources/images/blue_circle@2x.png | Bin .../main/resources/images/btcaverage.png | Bin .../main/resources/images/btcaverage@2x.png | Bin .../images/bubble_arrow_blue_left.png | Bin .../images/bubble_arrow_blue_left@2x.png | Bin .../images/bubble_arrow_blue_right.png | Bin .../images/bubble_arrow_blue_right@2x.png | Bin .../images/bubble_arrow_grey_left.png | Bin .../images/bubble_arrow_grey_left@2x.png | Bin .../images/bubble_arrow_grey_right.png | Bin .../images/bubble_arrow_grey_right@2x.png | Bin .../src => src}/main/resources/images/buy.png | Bin .../main/resources/images/buy@2x.png | Bin .../main/resources/images/buy_large.png | Bin .../main/resources/images/buy_large@2x.png | Bin .../main/resources/images/buy_white.png | Bin .../main/resources/images/buy_white@2x.png | Bin .../main/resources/images/collapse.png | Bin .../main/resources/images/collapse@2x.png | Bin .../resources/images/connection/direct.png | Bin .../resources/images/connection/direct@2x.png | Bin .../main/resources/images/connection/nat.png | Bin .../resources/images/connection/nat@2x.png | Bin .../resources/images/connection/relay.png | Bin .../resources/images/connection/relay@2x.png | Bin .../resources/images/connection/synced.png | Bin .../resources/images/connection/synced@2x.png | Bin .../main/resources/images/connection/tor.png | Bin .../resources/images/connection/tor@2x.png | Bin .../main/resources/images/countries/ad.png | Bin .../main/resources/images/countries/ae.png | Bin .../main/resources/images/countries/af.png | Bin .../main/resources/images/countries/ag.png | Bin .../main/resources/images/countries/ai.png | Bin .../main/resources/images/countries/al.png | Bin .../main/resources/images/countries/am.png | Bin .../main/resources/images/countries/an.png | Bin .../main/resources/images/countries/ao.png | Bin .../main/resources/images/countries/ar.png | Bin .../main/resources/images/countries/as.png | Bin .../main/resources/images/countries/at.png | Bin .../main/resources/images/countries/au.png | Bin .../main/resources/images/countries/aw.png | Bin .../main/resources/images/countries/ax.png | Bin .../main/resources/images/countries/az.png | Bin .../main/resources/images/countries/ba.png | Bin .../main/resources/images/countries/bb.png | Bin .../main/resources/images/countries/bd.png | Bin .../main/resources/images/countries/be.png | Bin .../main/resources/images/countries/bf.png | Bin .../main/resources/images/countries/bg.png | Bin .../main/resources/images/countries/bh.png | Bin .../main/resources/images/countries/bi.png | Bin .../main/resources/images/countries/bj.png | Bin .../main/resources/images/countries/bm.png | Bin .../main/resources/images/countries/bn.png | Bin .../main/resources/images/countries/bo.png | Bin .../main/resources/images/countries/br.png | Bin .../main/resources/images/countries/bs.png | Bin .../main/resources/images/countries/bt.png | Bin .../main/resources/images/countries/bv.png | Bin .../main/resources/images/countries/bw.png | Bin .../main/resources/images/countries/by.png | Bin .../main/resources/images/countries/bz.png | Bin .../main/resources/images/countries/ca.png | Bin .../resources/images/countries/catalonia.png | Bin .../main/resources/images/countries/cc.png | Bin .../main/resources/images/countries/cd.png | Bin .../main/resources/images/countries/cf.png | Bin .../main/resources/images/countries/cg.png | Bin .../main/resources/images/countries/ch.png | Bin .../main/resources/images/countries/ci.png | Bin .../main/resources/images/countries/ck.png | Bin .../main/resources/images/countries/cl.png | Bin .../main/resources/images/countries/cm.png | Bin .../main/resources/images/countries/cn.png | Bin .../main/resources/images/countries/co.png | Bin .../main/resources/images/countries/cr.png | Bin .../main/resources/images/countries/cs.png | Bin .../main/resources/images/countries/cu.png | Bin .../main/resources/images/countries/cv.png | Bin .../main/resources/images/countries/cx.png | Bin .../main/resources/images/countries/cy.png | Bin .../main/resources/images/countries/cz.png | Bin .../main/resources/images/countries/de.png | Bin .../main/resources/images/countries/dj.png | Bin .../main/resources/images/countries/dk.png | Bin .../main/resources/images/countries/dm.png | Bin .../main/resources/images/countries/do.png | Bin .../main/resources/images/countries/dz.png | Bin .../main/resources/images/countries/ec.png | Bin .../main/resources/images/countries/ee.png | Bin .../main/resources/images/countries/eg.png | Bin .../main/resources/images/countries/eh.png | Bin .../resources/images/countries/england.png | Bin .../main/resources/images/countries/er.png | Bin .../main/resources/images/countries/es.png | Bin .../main/resources/images/countries/et.png | Bin .../main/resources/images/countries/eu.png | Bin .../main/resources/images/countries/fam.png | Bin .../main/resources/images/countries/fi.png | Bin .../main/resources/images/countries/fj.png | Bin .../main/resources/images/countries/fk.png | Bin .../main/resources/images/countries/fm.png | Bin .../main/resources/images/countries/fo.png | Bin .../main/resources/images/countries/fr.png | Bin .../main/resources/images/countries/ga.png | Bin .../main/resources/images/countries/gd.png | Bin .../main/resources/images/countries/ge.png | Bin .../main/resources/images/countries/gf.png | Bin .../main/resources/images/countries/gh.png | Bin .../main/resources/images/countries/gi.png | Bin .../main/resources/images/countries/gl.png | Bin .../main/resources/images/countries/gm.png | Bin .../main/resources/images/countries/gn.png | Bin .../main/resources/images/countries/gp.png | Bin .../main/resources/images/countries/gq.png | Bin .../main/resources/images/countries/gr.png | Bin .../main/resources/images/countries/gs.png | Bin .../main/resources/images/countries/gt.png | Bin .../main/resources/images/countries/gu.png | Bin .../main/resources/images/countries/gw.png | Bin .../main/resources/images/countries/gy.png | Bin .../main/resources/images/countries/hk.png | Bin .../main/resources/images/countries/hm.png | Bin .../main/resources/images/countries/hn.png | Bin .../main/resources/images/countries/hr.png | Bin .../main/resources/images/countries/ht.png | Bin .../main/resources/images/countries/hu.png | Bin .../main/resources/images/countries/id.png | Bin .../main/resources/images/countries/ie.png | Bin .../main/resources/images/countries/il.png | Bin .../main/resources/images/countries/in.png | Bin .../main/resources/images/countries/io.png | Bin .../main/resources/images/countries/iq.png | Bin .../main/resources/images/countries/ir.png | Bin .../main/resources/images/countries/is.png | Bin .../main/resources/images/countries/it.png | Bin .../main/resources/images/countries/jm.png | Bin .../main/resources/images/countries/jo.png | Bin .../main/resources/images/countries/jp.png | Bin .../main/resources/images/countries/ke.png | Bin .../main/resources/images/countries/kg.png | Bin .../main/resources/images/countries/kh.png | Bin .../main/resources/images/countries/ki.png | Bin .../main/resources/images/countries/km.png | Bin .../main/resources/images/countries/kn.png | Bin .../main/resources/images/countries/kp.png | Bin .../main/resources/images/countries/kr.png | Bin .../main/resources/images/countries/kw.png | Bin .../main/resources/images/countries/ky.png | Bin .../main/resources/images/countries/kz.png | Bin .../main/resources/images/countries/la.png | Bin .../main/resources/images/countries/lb.png | Bin .../main/resources/images/countries/lc.png | Bin .../main/resources/images/countries/li.png | Bin .../main/resources/images/countries/lk.png | Bin .../main/resources/images/countries/lr.png | Bin .../main/resources/images/countries/ls.png | Bin .../main/resources/images/countries/lt.png | Bin .../main/resources/images/countries/lu.png | Bin .../main/resources/images/countries/lv.png | Bin .../main/resources/images/countries/ly.png | Bin .../main/resources/images/countries/ma.png | Bin .../main/resources/images/countries/mc.png | Bin .../main/resources/images/countries/md.png | Bin .../main/resources/images/countries/me.png | Bin .../main/resources/images/countries/mg.png | Bin .../main/resources/images/countries/mh.png | Bin .../main/resources/images/countries/mk.png | Bin .../main/resources/images/countries/ml.png | Bin .../main/resources/images/countries/mm.png | Bin .../main/resources/images/countries/mn.png | Bin .../main/resources/images/countries/mo.png | Bin .../main/resources/images/countries/mp.png | Bin .../main/resources/images/countries/mq.png | Bin .../main/resources/images/countries/mr.png | Bin .../main/resources/images/countries/ms.png | Bin .../main/resources/images/countries/mt.png | Bin .../main/resources/images/countries/mu.png | Bin .../main/resources/images/countries/mv.png | Bin .../main/resources/images/countries/mw.png | Bin .../main/resources/images/countries/mx.png | Bin .../main/resources/images/countries/my.png | Bin .../main/resources/images/countries/mz.png | Bin .../main/resources/images/countries/na.png | Bin .../main/resources/images/countries/nc.png | Bin .../main/resources/images/countries/ne.png | Bin .../main/resources/images/countries/nf.png | Bin .../main/resources/images/countries/ng.png | Bin .../main/resources/images/countries/ni.png | Bin .../main/resources/images/countries/nl.png | Bin .../main/resources/images/countries/no.png | Bin .../main/resources/images/countries/np.png | Bin .../main/resources/images/countries/nr.png | Bin .../main/resources/images/countries/nu.png | Bin .../main/resources/images/countries/nz.png | Bin .../main/resources/images/countries/om.png | Bin .../main/resources/images/countries/pa.png | Bin .../main/resources/images/countries/pe.png | Bin .../main/resources/images/countries/pf.png | Bin .../main/resources/images/countries/pg.png | Bin .../main/resources/images/countries/ph.png | Bin .../main/resources/images/countries/pk.png | Bin .../main/resources/images/countries/pl.png | Bin .../main/resources/images/countries/pm.png | Bin .../main/resources/images/countries/pn.png | Bin .../main/resources/images/countries/pr.png | Bin .../main/resources/images/countries/ps.png | Bin .../main/resources/images/countries/pt.png | Bin .../main/resources/images/countries/pw.png | Bin .../main/resources/images/countries/py.png | Bin .../main/resources/images/countries/qa.png | Bin .../main/resources/images/countries/re.png | Bin .../main/resources/images/countries/ro.png | Bin .../main/resources/images/countries/rs.png | Bin .../main/resources/images/countries/ru.png | Bin .../main/resources/images/countries/rw.png | Bin .../main/resources/images/countries/sa.png | Bin .../main/resources/images/countries/sb.png | Bin .../main/resources/images/countries/sc.png | Bin .../resources/images/countries/scotland.png | Bin .../main/resources/images/countries/sd.png | Bin .../main/resources/images/countries/se.png | Bin .../main/resources/images/countries/sg.png | Bin .../main/resources/images/countries/sh.png | Bin .../main/resources/images/countries/si.png | Bin .../main/resources/images/countries/sj.png | Bin .../main/resources/images/countries/sk.png | Bin .../main/resources/images/countries/sl.png | Bin .../main/resources/images/countries/sm.png | Bin .../main/resources/images/countries/sn.png | Bin .../main/resources/images/countries/so.png | Bin .../main/resources/images/countries/sr.png | Bin .../main/resources/images/countries/st.png | Bin .../main/resources/images/countries/sv.png | Bin .../main/resources/images/countries/sy.png | Bin .../main/resources/images/countries/sz.png | Bin .../main/resources/images/countries/tc.png | Bin .../main/resources/images/countries/td.png | Bin .../main/resources/images/countries/tf.png | Bin .../main/resources/images/countries/tg.png | Bin .../main/resources/images/countries/th.png | Bin .../main/resources/images/countries/tj.png | Bin .../main/resources/images/countries/tk.png | Bin .../main/resources/images/countries/tl.png | Bin .../main/resources/images/countries/tm.png | Bin .../main/resources/images/countries/tn.png | Bin .../main/resources/images/countries/to.png | Bin .../main/resources/images/countries/tr.png | Bin .../main/resources/images/countries/tt.png | Bin .../main/resources/images/countries/tv.png | Bin .../main/resources/images/countries/tw.png | Bin .../main/resources/images/countries/tz.png | Bin .../main/resources/images/countries/ua.png | Bin .../main/resources/images/countries/ug.png | Bin .../main/resources/images/countries/uk.png | Bin .../main/resources/images/countries/um.png | Bin .../main/resources/images/countries/us.png | Bin .../main/resources/images/countries/uy.png | Bin .../main/resources/images/countries/uz.png | Bin .../main/resources/images/countries/va.png | Bin .../main/resources/images/countries/vc.png | Bin .../main/resources/images/countries/ve.png | Bin .../main/resources/images/countries/vg.png | Bin .../main/resources/images/countries/vi.png | Bin .../main/resources/images/countries/vn.png | Bin .../main/resources/images/countries/vu.png | Bin .../main/resources/images/countries/wales.png | Bin .../main/resources/images/countries/wf.png | Bin .../main/resources/images/countries/ws.png | Bin .../main/resources/images/countries/ye.png | Bin .../main/resources/images/countries/yt.png | Bin .../main/resources/images/countries/za.png | Bin .../main/resources/images/countries/zm.png | Bin .../main/resources/images/countries/zw.png | Bin .../main/resources/images/expand.png | Bin .../main/resources/images/expand@2x.png | Bin .../main/resources/images/green_circle.png | Bin .../main/resources/images/green_circle@2x.png | Bin .../main/resources/images/info.png | Bin .../main/resources/images/info@2x.png | Bin .../main/resources/images/invert.png | Bin .../main/resources/images/invert@2x.png | Bin .../main/resources/images/light_close.png | Bin .../main/resources/images/light_close@2x.png | Bin .../main/resources/images/link.png | Bin .../main/resources/images/link@2x.png | Bin .../main/resources/images/logo_splash.png | Bin .../main/resources/images/logo_splash@2x.png | Bin .../main/resources/images/nav/account.png | Bin .../main/resources/images/nav/account@2x.png | Bin .../resources/images/nav/account_active.png | Bin .../images/nav/account_active@2x.png | Bin .../main/resources/images/nav/buyoffer.png | Bin .../main/resources/images/nav/buyoffer@2x.png | Bin .../resources/images/nav/buyoffer_active.png | Bin .../images/nav/buyoffer_active@2x.png | Bin .../main/resources/images/nav/dao.png | Bin .../main/resources/images/nav/dao@2x.png | Bin .../main/resources/images/nav/dao_active.png | Bin .../resources/images/nav/dao_active@2x.png | Bin .../main/resources/images/nav/disputes.png | Bin .../main/resources/images/nav/disputes@2x.png | Bin .../resources/images/nav/disputes_active.png | Bin .../images/nav/disputes_active@2x.png | Bin .../main/resources/images/nav/funds.png | Bin .../main/resources/images/nav/funds@2x.png | Bin .../resources/images/nav/funds_active.png | Bin .../resources/images/nav/funds_active@2x.png | Bin .../main/resources/images/nav/market.png | Bin .../main/resources/images/nav/market@2x.png | Bin .../resources/images/nav/market_active.png | Bin .../resources/images/nav/market_active@2x.png | Bin .../main/resources/images/nav/portfolio.png | Bin .../resources/images/nav/portfolio@2x.png | Bin .../resources/images/nav/portfolio_active.png | Bin .../images/nav/portfolio_active@2x.png | Bin .../main/resources/images/nav/selloffer.png | Bin .../resources/images/nav/selloffer@2x.png | Bin .../resources/images/nav/selloffer_active.png | Bin .../images/nav/selloffer_active@2x.png | Bin .../main/resources/images/nav/settings.png | Bin .../main/resources/images/nav/settings@2x.png | Bin .../resources/images/nav/settings_active.png | Bin .../images/nav/settings_active@2x.png | Bin .../images/offer/offer_state_available.png | Bin .../images/offer/offer_state_available@2x.png | Bin .../offer/offer_state_not_available.png | Bin .../offer/offer_state_not_available@2x.png | Bin .../images/offer/offer_state_unknown.png | Bin .../images/offer/offer_state_unknown@2x.png | Bin .../main/resources/images/poloniex.png | Bin .../main/resources/images/poloniex@2x.png | Bin .../main/resources/images/remove.png | Bin .../main/resources/images/remove@2x.png | Bin .../main/resources/images/sell.png | Bin .../main/resources/images/sell@2x.png | Bin .../main/resources/images/sell_large.png | Bin .../main/resources/images/sell_large@2x.png | Bin .../main/resources/images/sell_white.png | Bin .../main/resources/images/sell_white@2x.png | Bin .../main/resources/images/spinner.png | Bin .../main/resources/images/spinner@2x.png | Bin .../resources/images/system_tray_icon.png | Bin .../resources/images/system_tray_icon@2x.png | Bin .../images/system_tray_icon_linux.png | Bin .../images/system_tray_icon_windows.png | Bin .../resources/images/task_bar_icon_linux.png | Bin .../images/task_bar_icon_windows.png | Bin .../main/resources/images/tick.png | Bin .../main/resources/images/tick@2x.png | Bin .../images/update/update_available.png | Bin .../images/update/update_available@2x.png | Bin .../resources/images/update/update_failed.png | Bin .../images/update/update_failed@2x.png | Bin .../images/update/update_in_progress.png | Bin .../images/update/update_in_progress@2x.png | Bin .../images/update/update_up_to_date.png | Bin .../images/update/update_up_to_date@2x.png | Bin .../main/resources/images/window_icon.png | Bin .../main/resources/images/window_icon@2x.png | Bin .../main/resources/keys/29CDFD3B.asc | 0 .../main/resources/keys/5BC5ED73.asc | 0 .../main/resources/keys/F379A1C6.asc | 0 {gui/src => src}/main/resources/logback.xml | 0 .../common/locale/TradeCurrencyMakers.java | 0 .../io/bisq/common/monetary/PriceMaker.java | 0 .../io/bisq/common/monetary/VolumeMaker.java | 0 .../java/io/bisq/core/offer/OfferMaker.java | 0 .../io/bisq/core/user/PreferenceMakers.java | 0 .../java/io/bisq/gui/AwesomeFontDemo.java | 0 .../test/java/io/bisq/gui/BindingTest.java | 0 .../fxml/FxmlViewLoaderTests$Malformed.fxml | 0 ...mlViewLoaderTests$MissingFxController.fxml | 0 ...LoaderTests$MissingFxmlViewAnnotation.fxml | 0 .../fxml/FxmlViewLoaderTests$WellFormed.fxml | 0 .../gui/common/fxml/FxmlViewLoaderTests.java | 0 .../support/CachingViewLoaderTests.java | 0 ...ColoredDecimalPlacesWithZerosTextTest.java | 0 .../DisplayedTransactionsTest.java | 0 .../ObservableListDecoratorTest.java | 0 .../TransactionAwareTradableFactoryTest.java | 0 .../TransactionAwareTradeTest.java | 0 .../OfferBookChartViewModelTest.java | 0 .../market/spread/SpreadViewModelTest.java | 0 .../trades/TradesChartsViewModelTest.java | 0 .../createoffer/CreateOfferViewModelTest.java | 0 .../offerbook/OfferBookListItemMaker.java | 0 .../offerbook/OfferBookViewModelTest.java | 0 .../downloadupdate/BisqInstallerTest.java | 0 .../downloadupdate/VerifyTaskTest.java | 0 .../io/bisq/gui/util/BSFormatterTest.java | 0 .../bisq/gui/util/CurrencyListItemMakers.java | 0 .../io/bisq/gui/util/CurrencyListTest.java | 0 .../java/io/bisq/gui/util/GUIUtilTest.java | 0 .../AltCoinAddressValidatorTest.java | 0 .../gui/util/validation/BtcValidatorTest.java | 0 .../validation/FiatVolumeValidatorTest.java | 0 .../InteracETransferValidatorTest.java | 0 .../java/org/bitcoinj/core/CoinMaker.java | 0 .../resources/downloadUpdate/F379A1C6.asc | 0 .../test/resources/downloadUpdate/test.txt | 0 .../resources/downloadUpdate/test.txt.asc | 0 .../resources/downloadUpdate/test_bad.txt | 0 .../resources/downloadUpdate/test_bad.txt.asc | 0 824 files changed, 344 insertions(+), 548 deletions(-) delete mode 100644 gui/pom.xml rename {gui/src => src}/main/java/io/bisq/gui/CandleStickChart.css (100%) rename {gui/src => src}/main/java/io/bisq/gui/GuiModule.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/Navigation.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/SystemTray.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/app/BisqApp.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/app/BisqAppMain.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/app/BisqAppModule.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/bisq.css (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/UITimer.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/ViewfxException.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/fxml/FxmlViewLoader.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/model/Activatable.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/model/ActivatableDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/model/ActivatableViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/model/ActivatableWithDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/model/DataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/model/Model.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/model/ViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/model/WithDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/AbstractView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/ActivatableView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/ActivatableViewAndModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/CachingViewLoader.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/DefaultPathConvention.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/FxmlView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/InitializableView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/View.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/ViewFactory.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/ViewLoader.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/ViewPath.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/common/view/guice/InjectorViewFactory.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/AddressTextField.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/AddressWithIconAndDirection.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/AutoTooltipButton.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/AutoTooltipCheckBox.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/AutoTooltipLabel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/AutoTooltipRadioButton.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/AutoTooltipTableColumn.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/AutoTooltipToggleButton.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/BalanceTextField.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/BalanceWithConfirmationTextField.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/BsqAddressTextField.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/BusyAnimation.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/ColoredDecimalPlacesWithZerosText.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/FundsTextField.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/HyperlinkWithIcon.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/InfoDisplay.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/InfoTextField.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/InputTextField.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/PasswordTextField.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/PeerInfoIcon.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/SearchComboBox.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/SeparatedPhaseBars.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/TableGroupHeadline.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/TextFieldWithCopyIcon.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/TitledGroupBg.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/TooltipUtil.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/TxIdTextField.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/indicator/TxConfidenceIndicator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/indicator/behavior/StaticProgressIndicatorBehavior.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/indicator/skin/StaticProgressIndicatorSkin.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/AliPayForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/BankForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/CashAppForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/ChaseQuickPayForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/ClearXchangeForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/CryptoCurrencyForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/InteracETransferForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/MoneyBeamForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/NationalBankForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/PerfectMoneyForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/PopmoneyForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/RevolutForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/SameBankForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/SepaInstantForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/SpecificBankForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/SwishForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/USPostalMoneyOrderForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/UpholdForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/VenmoForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/components/paymentmethods/WesternUnionForm.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/images.css (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/MainView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/MainView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/MainViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/PriceFeedComboBoxItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/AccountView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/AccountView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/AccountViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/backup/BackupView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/backup/BackupView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/password/PasswordView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/password/PasswordView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/DaoView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/DaoView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestDisplay.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/CompensationView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/CompensationView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/voting/VotingView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/voting/VotingView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/voting/vote/ParameterViewItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/BsqBalanceUtil.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/debug/DebugView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/debug/DebugView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/disputes/DisputesView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/disputes/DisputesView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/FundsView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/FundsView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/deposit/DepositListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/deposit/DepositView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/deposit/DepositView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/locked/LockedListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/locked/LockedView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/locked/LockedView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/reserved/ReservedListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/reserved/ReservedView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/reserved/ReservedView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactions.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsFactory.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/DummyTransactionAwareTradable.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/ObservableListDecorator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/TradableRepository.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareOpenOffer.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradable.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactory.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTrade.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/TransactionListItemFactory.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/TransactionsListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/MarketView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/MarketView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/offerbook/OfferListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/spread/SpreadItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/spread/SpreadView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/spread/SpreadView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/spread/SpreadViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/trades/TradesChartsView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/trades/TradesChartsView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/trades/charts/CandleData.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/trades/charts/price/Candle.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/trades/charts/price/CandleStickChart.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/trades/charts/price/CandleTooltip.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeBar.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeChart.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/BuyOfferView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/BuyOfferView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/OfferDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/OfferView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/SellOfferView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/SellOfferView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/offerbook/OfferBookListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/Overlay.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/notifications/Notification.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/notifications/NotificationManager.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/popups/Popup.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/popups/PopupManager.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/DisplayAlertMessageWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/FeeOptionWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/FilterWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/ManualPayoutTxWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/QRCodeWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/SelectBaseCurrencyWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/SelectDepositTxWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/SendAlertMessageWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/ShowWalletDataWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/TradeDetailsWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/UnlockArbitrationRegistrationWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/BisqInstaller.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DownloadTask.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/VerifyTask.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/PortfolioView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/PortfolioView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradableListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOfferListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/BuyerSubView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/SellerSubView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/TradeSubView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/settings/SettingsView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/settings/SettingsView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/settings/about/AboutView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/settings/about/AboutView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.fxml (100%) rename {gui/src => src}/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/BSFormatter.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/BsqFormatter.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/Colors.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/CurrencyList.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/CurrencyListItem.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/CurrencyPredicates.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/FormBuilder.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/GUIProfiler.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/GUIUtil.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/ImageUtil.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/Layout.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/Transitions.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/AccountNrValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/AliPayValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/AltcoinValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/BICValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/BankIdValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/BankValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/BranchIdValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/BsqAddressValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/BsqValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/BtcAddressValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/BtcValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/CashAppValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/ChaseQuickPayValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/ClearXchangeValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/EmailValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/FiatPriceValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/FiatVolumeValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/IBANValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/InputValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/InteracETransferValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/MonetaryValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/MoneyBeamValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/NumberValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/OKPayValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/PasswordValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/PerfectMoneyValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/PopmoneyValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/RevolutValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/SecurityDepositValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/SwishValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/USPostalMoneyOrderValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/UpholdValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/VenmoValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/altcoins/ByteballAddressValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/altcoins/NxtReedSolomonValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/altcoins/OctocoinAddressValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/altcoins/PNCAddressValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/altcoins/WMCCAddressValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/altcoins/XCNAddressValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/altcoins/YTNAddressValidator.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/ACHParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/AlcParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/CageParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/CreaParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/IOPParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/ODNParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/OctocoinParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/OnionParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/PARTParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/PNCParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/PivxParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/SpeedCashParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/StrayaParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/TerracoinParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/WACoinsParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/WMCCParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/XspecParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/btc/AbstractBitcoinNetParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/btc/BTGParams.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/btc/BtcMainNetParamsForValidation.java (100%) rename {gui/src => src}/main/java/io/bisq/gui/util/validation/params/btc/Networks.java (100%) rename {gui/src => src}/main/resources/fonts/Apache License.txt (100%) rename {gui/src => src}/main/resources/fonts/DroidSansMono.ttf (100%) rename {gui/src => src}/main/resources/fonts/Verdana.ttf (100%) rename {gui/src => src}/main/resources/fonts/VerdanaBold.ttf (100%) rename {gui/src => src}/main/resources/images/alert_round.png (100%) rename {gui/src => src}/main/resources/images/alert_round@2x.png (100%) rename {gui/src => src}/main/resources/images/arrow_blue.png (100%) rename {gui/src => src}/main/resources/images/arrow_blue@2x.png (100%) rename {gui/src => src}/main/resources/images/arrow_grey.png (100%) rename {gui/src => src}/main/resources/images/arrow_grey@2x.png (100%) rename {gui/src => src}/main/resources/images/attachment.png (100%) rename {gui/src => src}/main/resources/images/attachment@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_1.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_10.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_10@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_11.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_11@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_12.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_12@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_13.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_13@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_14.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_14@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_15.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_15@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_1@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_2.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_2@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_3.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_3@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_4.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_4@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_5.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_5@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_6.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_6@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_7.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_7@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_8.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_8@2x.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_9.png (100%) rename {gui/src => src}/main/resources/images/avatars/avatar_9@2x.png (100%) rename {gui/src => src}/main/resources/images/blue_circle.png (100%) rename {gui/src => src}/main/resources/images/blue_circle@2x.png (100%) rename {gui/src => src}/main/resources/images/btcaverage.png (100%) rename {gui/src => src}/main/resources/images/btcaverage@2x.png (100%) rename {gui/src => src}/main/resources/images/bubble_arrow_blue_left.png (100%) rename {gui/src => src}/main/resources/images/bubble_arrow_blue_left@2x.png (100%) rename {gui/src => src}/main/resources/images/bubble_arrow_blue_right.png (100%) rename {gui/src => src}/main/resources/images/bubble_arrow_blue_right@2x.png (100%) rename {gui/src => src}/main/resources/images/bubble_arrow_grey_left.png (100%) rename {gui/src => src}/main/resources/images/bubble_arrow_grey_left@2x.png (100%) rename {gui/src => src}/main/resources/images/bubble_arrow_grey_right.png (100%) rename {gui/src => src}/main/resources/images/bubble_arrow_grey_right@2x.png (100%) rename {gui/src => src}/main/resources/images/buy.png (100%) rename {gui/src => src}/main/resources/images/buy@2x.png (100%) rename {gui/src => src}/main/resources/images/buy_large.png (100%) rename {gui/src => src}/main/resources/images/buy_large@2x.png (100%) rename {gui/src => src}/main/resources/images/buy_white.png (100%) rename {gui/src => src}/main/resources/images/buy_white@2x.png (100%) rename {gui/src => src}/main/resources/images/collapse.png (100%) rename {gui/src => src}/main/resources/images/collapse@2x.png (100%) rename {gui/src => src}/main/resources/images/connection/direct.png (100%) rename {gui/src => src}/main/resources/images/connection/direct@2x.png (100%) rename {gui/src => src}/main/resources/images/connection/nat.png (100%) rename {gui/src => src}/main/resources/images/connection/nat@2x.png (100%) rename {gui/src => src}/main/resources/images/connection/relay.png (100%) rename {gui/src => src}/main/resources/images/connection/relay@2x.png (100%) rename {gui/src => src}/main/resources/images/connection/synced.png (100%) rename {gui/src => src}/main/resources/images/connection/synced@2x.png (100%) rename {gui/src => src}/main/resources/images/connection/tor.png (100%) rename {gui/src => src}/main/resources/images/connection/tor@2x.png (100%) rename {gui/src => src}/main/resources/images/countries/ad.png (100%) rename {gui/src => src}/main/resources/images/countries/ae.png (100%) rename {gui/src => src}/main/resources/images/countries/af.png (100%) rename {gui/src => src}/main/resources/images/countries/ag.png (100%) rename {gui/src => src}/main/resources/images/countries/ai.png (100%) rename {gui/src => src}/main/resources/images/countries/al.png (100%) rename {gui/src => src}/main/resources/images/countries/am.png (100%) rename {gui/src => src}/main/resources/images/countries/an.png (100%) rename {gui/src => src}/main/resources/images/countries/ao.png (100%) rename {gui/src => src}/main/resources/images/countries/ar.png (100%) rename {gui/src => src}/main/resources/images/countries/as.png (100%) rename {gui/src => src}/main/resources/images/countries/at.png (100%) rename {gui/src => src}/main/resources/images/countries/au.png (100%) rename {gui/src => src}/main/resources/images/countries/aw.png (100%) rename {gui/src => src}/main/resources/images/countries/ax.png (100%) rename {gui/src => src}/main/resources/images/countries/az.png (100%) rename {gui/src => src}/main/resources/images/countries/ba.png (100%) rename {gui/src => src}/main/resources/images/countries/bb.png (100%) rename {gui/src => src}/main/resources/images/countries/bd.png (100%) rename {gui/src => src}/main/resources/images/countries/be.png (100%) rename {gui/src => src}/main/resources/images/countries/bf.png (100%) rename {gui/src => src}/main/resources/images/countries/bg.png (100%) rename {gui/src => src}/main/resources/images/countries/bh.png (100%) rename {gui/src => src}/main/resources/images/countries/bi.png (100%) rename {gui/src => src}/main/resources/images/countries/bj.png (100%) rename {gui/src => src}/main/resources/images/countries/bm.png (100%) rename {gui/src => src}/main/resources/images/countries/bn.png (100%) rename {gui/src => src}/main/resources/images/countries/bo.png (100%) rename {gui/src => src}/main/resources/images/countries/br.png (100%) rename {gui/src => src}/main/resources/images/countries/bs.png (100%) rename {gui/src => src}/main/resources/images/countries/bt.png (100%) rename {gui/src => src}/main/resources/images/countries/bv.png (100%) rename {gui/src => src}/main/resources/images/countries/bw.png (100%) rename {gui/src => src}/main/resources/images/countries/by.png (100%) rename {gui/src => src}/main/resources/images/countries/bz.png (100%) rename {gui/src => src}/main/resources/images/countries/ca.png (100%) rename {gui/src => src}/main/resources/images/countries/catalonia.png (100%) rename {gui/src => src}/main/resources/images/countries/cc.png (100%) rename {gui/src => src}/main/resources/images/countries/cd.png (100%) rename {gui/src => src}/main/resources/images/countries/cf.png (100%) rename {gui/src => src}/main/resources/images/countries/cg.png (100%) rename {gui/src => src}/main/resources/images/countries/ch.png (100%) rename {gui/src => src}/main/resources/images/countries/ci.png (100%) rename {gui/src => src}/main/resources/images/countries/ck.png (100%) rename {gui/src => src}/main/resources/images/countries/cl.png (100%) rename {gui/src => src}/main/resources/images/countries/cm.png (100%) rename {gui/src => src}/main/resources/images/countries/cn.png (100%) rename {gui/src => src}/main/resources/images/countries/co.png (100%) rename {gui/src => src}/main/resources/images/countries/cr.png (100%) rename {gui/src => src}/main/resources/images/countries/cs.png (100%) rename {gui/src => src}/main/resources/images/countries/cu.png (100%) rename {gui/src => src}/main/resources/images/countries/cv.png (100%) rename {gui/src => src}/main/resources/images/countries/cx.png (100%) rename {gui/src => src}/main/resources/images/countries/cy.png (100%) rename {gui/src => src}/main/resources/images/countries/cz.png (100%) rename {gui/src => src}/main/resources/images/countries/de.png (100%) rename {gui/src => src}/main/resources/images/countries/dj.png (100%) rename {gui/src => src}/main/resources/images/countries/dk.png (100%) rename {gui/src => src}/main/resources/images/countries/dm.png (100%) rename {gui/src => src}/main/resources/images/countries/do.png (100%) rename {gui/src => src}/main/resources/images/countries/dz.png (100%) rename {gui/src => src}/main/resources/images/countries/ec.png (100%) rename {gui/src => src}/main/resources/images/countries/ee.png (100%) rename {gui/src => src}/main/resources/images/countries/eg.png (100%) rename {gui/src => src}/main/resources/images/countries/eh.png (100%) rename {gui/src => src}/main/resources/images/countries/england.png (100%) rename {gui/src => src}/main/resources/images/countries/er.png (100%) rename {gui/src => src}/main/resources/images/countries/es.png (100%) rename {gui/src => src}/main/resources/images/countries/et.png (100%) rename {gui/src => src}/main/resources/images/countries/eu.png (100%) rename {gui/src => src}/main/resources/images/countries/fam.png (100%) rename {gui/src => src}/main/resources/images/countries/fi.png (100%) rename {gui/src => src}/main/resources/images/countries/fj.png (100%) rename {gui/src => src}/main/resources/images/countries/fk.png (100%) rename {gui/src => src}/main/resources/images/countries/fm.png (100%) rename {gui/src => src}/main/resources/images/countries/fo.png (100%) rename {gui/src => src}/main/resources/images/countries/fr.png (100%) rename {gui/src => src}/main/resources/images/countries/ga.png (100%) rename {gui/src => src}/main/resources/images/countries/gd.png (100%) rename {gui/src => src}/main/resources/images/countries/ge.png (100%) rename {gui/src => src}/main/resources/images/countries/gf.png (100%) rename {gui/src => src}/main/resources/images/countries/gh.png (100%) rename {gui/src => src}/main/resources/images/countries/gi.png (100%) rename {gui/src => src}/main/resources/images/countries/gl.png (100%) rename {gui/src => src}/main/resources/images/countries/gm.png (100%) rename {gui/src => src}/main/resources/images/countries/gn.png (100%) rename {gui/src => src}/main/resources/images/countries/gp.png (100%) rename {gui/src => src}/main/resources/images/countries/gq.png (100%) rename {gui/src => src}/main/resources/images/countries/gr.png (100%) rename {gui/src => src}/main/resources/images/countries/gs.png (100%) rename {gui/src => src}/main/resources/images/countries/gt.png (100%) rename {gui/src => src}/main/resources/images/countries/gu.png (100%) rename {gui/src => src}/main/resources/images/countries/gw.png (100%) rename {gui/src => src}/main/resources/images/countries/gy.png (100%) rename {gui/src => src}/main/resources/images/countries/hk.png (100%) rename {gui/src => src}/main/resources/images/countries/hm.png (100%) rename {gui/src => src}/main/resources/images/countries/hn.png (100%) rename {gui/src => src}/main/resources/images/countries/hr.png (100%) rename {gui/src => src}/main/resources/images/countries/ht.png (100%) rename {gui/src => src}/main/resources/images/countries/hu.png (100%) rename {gui/src => src}/main/resources/images/countries/id.png (100%) rename {gui/src => src}/main/resources/images/countries/ie.png (100%) rename {gui/src => src}/main/resources/images/countries/il.png (100%) rename {gui/src => src}/main/resources/images/countries/in.png (100%) rename {gui/src => src}/main/resources/images/countries/io.png (100%) rename {gui/src => src}/main/resources/images/countries/iq.png (100%) rename {gui/src => src}/main/resources/images/countries/ir.png (100%) rename {gui/src => src}/main/resources/images/countries/is.png (100%) rename {gui/src => src}/main/resources/images/countries/it.png (100%) rename {gui/src => src}/main/resources/images/countries/jm.png (100%) rename {gui/src => src}/main/resources/images/countries/jo.png (100%) rename {gui/src => src}/main/resources/images/countries/jp.png (100%) rename {gui/src => src}/main/resources/images/countries/ke.png (100%) rename {gui/src => src}/main/resources/images/countries/kg.png (100%) rename {gui/src => src}/main/resources/images/countries/kh.png (100%) rename {gui/src => src}/main/resources/images/countries/ki.png (100%) rename {gui/src => src}/main/resources/images/countries/km.png (100%) rename {gui/src => src}/main/resources/images/countries/kn.png (100%) rename {gui/src => src}/main/resources/images/countries/kp.png (100%) rename {gui/src => src}/main/resources/images/countries/kr.png (100%) rename {gui/src => src}/main/resources/images/countries/kw.png (100%) rename {gui/src => src}/main/resources/images/countries/ky.png (100%) rename {gui/src => src}/main/resources/images/countries/kz.png (100%) rename {gui/src => src}/main/resources/images/countries/la.png (100%) rename {gui/src => src}/main/resources/images/countries/lb.png (100%) rename {gui/src => src}/main/resources/images/countries/lc.png (100%) rename {gui/src => src}/main/resources/images/countries/li.png (100%) rename {gui/src => src}/main/resources/images/countries/lk.png (100%) rename {gui/src => src}/main/resources/images/countries/lr.png (100%) rename {gui/src => src}/main/resources/images/countries/ls.png (100%) rename {gui/src => src}/main/resources/images/countries/lt.png (100%) rename {gui/src => src}/main/resources/images/countries/lu.png (100%) rename {gui/src => src}/main/resources/images/countries/lv.png (100%) rename {gui/src => src}/main/resources/images/countries/ly.png (100%) rename {gui/src => src}/main/resources/images/countries/ma.png (100%) rename {gui/src => src}/main/resources/images/countries/mc.png (100%) rename {gui/src => src}/main/resources/images/countries/md.png (100%) rename {gui/src => src}/main/resources/images/countries/me.png (100%) rename {gui/src => src}/main/resources/images/countries/mg.png (100%) rename {gui/src => src}/main/resources/images/countries/mh.png (100%) rename {gui/src => src}/main/resources/images/countries/mk.png (100%) rename {gui/src => src}/main/resources/images/countries/ml.png (100%) rename {gui/src => src}/main/resources/images/countries/mm.png (100%) rename {gui/src => src}/main/resources/images/countries/mn.png (100%) rename {gui/src => src}/main/resources/images/countries/mo.png (100%) rename {gui/src => src}/main/resources/images/countries/mp.png (100%) rename {gui/src => src}/main/resources/images/countries/mq.png (100%) rename {gui/src => src}/main/resources/images/countries/mr.png (100%) rename {gui/src => src}/main/resources/images/countries/ms.png (100%) rename {gui/src => src}/main/resources/images/countries/mt.png (100%) rename {gui/src => src}/main/resources/images/countries/mu.png (100%) rename {gui/src => src}/main/resources/images/countries/mv.png (100%) rename {gui/src => src}/main/resources/images/countries/mw.png (100%) rename {gui/src => src}/main/resources/images/countries/mx.png (100%) rename {gui/src => src}/main/resources/images/countries/my.png (100%) rename {gui/src => src}/main/resources/images/countries/mz.png (100%) rename {gui/src => src}/main/resources/images/countries/na.png (100%) rename {gui/src => src}/main/resources/images/countries/nc.png (100%) rename {gui/src => src}/main/resources/images/countries/ne.png (100%) rename {gui/src => src}/main/resources/images/countries/nf.png (100%) rename {gui/src => src}/main/resources/images/countries/ng.png (100%) rename {gui/src => src}/main/resources/images/countries/ni.png (100%) rename {gui/src => src}/main/resources/images/countries/nl.png (100%) rename {gui/src => src}/main/resources/images/countries/no.png (100%) rename {gui/src => src}/main/resources/images/countries/np.png (100%) rename {gui/src => src}/main/resources/images/countries/nr.png (100%) rename {gui/src => src}/main/resources/images/countries/nu.png (100%) rename {gui/src => src}/main/resources/images/countries/nz.png (100%) rename {gui/src => src}/main/resources/images/countries/om.png (100%) rename {gui/src => src}/main/resources/images/countries/pa.png (100%) rename {gui/src => src}/main/resources/images/countries/pe.png (100%) rename {gui/src => src}/main/resources/images/countries/pf.png (100%) rename {gui/src => src}/main/resources/images/countries/pg.png (100%) rename {gui/src => src}/main/resources/images/countries/ph.png (100%) rename {gui/src => src}/main/resources/images/countries/pk.png (100%) rename {gui/src => src}/main/resources/images/countries/pl.png (100%) rename {gui/src => src}/main/resources/images/countries/pm.png (100%) rename {gui/src => src}/main/resources/images/countries/pn.png (100%) rename {gui/src => src}/main/resources/images/countries/pr.png (100%) rename {gui/src => src}/main/resources/images/countries/ps.png (100%) rename {gui/src => src}/main/resources/images/countries/pt.png (100%) rename {gui/src => src}/main/resources/images/countries/pw.png (100%) rename {gui/src => src}/main/resources/images/countries/py.png (100%) rename {gui/src => src}/main/resources/images/countries/qa.png (100%) rename {gui/src => src}/main/resources/images/countries/re.png (100%) rename {gui/src => src}/main/resources/images/countries/ro.png (100%) rename {gui/src => src}/main/resources/images/countries/rs.png (100%) rename {gui/src => src}/main/resources/images/countries/ru.png (100%) rename {gui/src => src}/main/resources/images/countries/rw.png (100%) rename {gui/src => src}/main/resources/images/countries/sa.png (100%) rename {gui/src => src}/main/resources/images/countries/sb.png (100%) rename {gui/src => src}/main/resources/images/countries/sc.png (100%) rename {gui/src => src}/main/resources/images/countries/scotland.png (100%) rename {gui/src => src}/main/resources/images/countries/sd.png (100%) rename {gui/src => src}/main/resources/images/countries/se.png (100%) rename {gui/src => src}/main/resources/images/countries/sg.png (100%) rename {gui/src => src}/main/resources/images/countries/sh.png (100%) rename {gui/src => src}/main/resources/images/countries/si.png (100%) rename {gui/src => src}/main/resources/images/countries/sj.png (100%) rename {gui/src => src}/main/resources/images/countries/sk.png (100%) rename {gui/src => src}/main/resources/images/countries/sl.png (100%) rename {gui/src => src}/main/resources/images/countries/sm.png (100%) rename {gui/src => src}/main/resources/images/countries/sn.png (100%) rename {gui/src => src}/main/resources/images/countries/so.png (100%) rename {gui/src => src}/main/resources/images/countries/sr.png (100%) rename {gui/src => src}/main/resources/images/countries/st.png (100%) rename {gui/src => src}/main/resources/images/countries/sv.png (100%) rename {gui/src => src}/main/resources/images/countries/sy.png (100%) rename {gui/src => src}/main/resources/images/countries/sz.png (100%) rename {gui/src => src}/main/resources/images/countries/tc.png (100%) rename {gui/src => src}/main/resources/images/countries/td.png (100%) rename {gui/src => src}/main/resources/images/countries/tf.png (100%) rename {gui/src => src}/main/resources/images/countries/tg.png (100%) rename {gui/src => src}/main/resources/images/countries/th.png (100%) rename {gui/src => src}/main/resources/images/countries/tj.png (100%) rename {gui/src => src}/main/resources/images/countries/tk.png (100%) rename {gui/src => src}/main/resources/images/countries/tl.png (100%) rename {gui/src => src}/main/resources/images/countries/tm.png (100%) rename {gui/src => src}/main/resources/images/countries/tn.png (100%) rename {gui/src => src}/main/resources/images/countries/to.png (100%) rename {gui/src => src}/main/resources/images/countries/tr.png (100%) rename {gui/src => src}/main/resources/images/countries/tt.png (100%) rename {gui/src => src}/main/resources/images/countries/tv.png (100%) rename {gui/src => src}/main/resources/images/countries/tw.png (100%) rename {gui/src => src}/main/resources/images/countries/tz.png (100%) rename {gui/src => src}/main/resources/images/countries/ua.png (100%) rename {gui/src => src}/main/resources/images/countries/ug.png (100%) rename {gui/src => src}/main/resources/images/countries/uk.png (100%) rename {gui/src => src}/main/resources/images/countries/um.png (100%) rename {gui/src => src}/main/resources/images/countries/us.png (100%) rename {gui/src => src}/main/resources/images/countries/uy.png (100%) rename {gui/src => src}/main/resources/images/countries/uz.png (100%) rename {gui/src => src}/main/resources/images/countries/va.png (100%) rename {gui/src => src}/main/resources/images/countries/vc.png (100%) rename {gui/src => src}/main/resources/images/countries/ve.png (100%) rename {gui/src => src}/main/resources/images/countries/vg.png (100%) rename {gui/src => src}/main/resources/images/countries/vi.png (100%) rename {gui/src => src}/main/resources/images/countries/vn.png (100%) rename {gui/src => src}/main/resources/images/countries/vu.png (100%) rename {gui/src => src}/main/resources/images/countries/wales.png (100%) rename {gui/src => src}/main/resources/images/countries/wf.png (100%) rename {gui/src => src}/main/resources/images/countries/ws.png (100%) rename {gui/src => src}/main/resources/images/countries/ye.png (100%) rename {gui/src => src}/main/resources/images/countries/yt.png (100%) rename {gui/src => src}/main/resources/images/countries/za.png (100%) rename {gui/src => src}/main/resources/images/countries/zm.png (100%) rename {gui/src => src}/main/resources/images/countries/zw.png (100%) rename {gui/src => src}/main/resources/images/expand.png (100%) rename {gui/src => src}/main/resources/images/expand@2x.png (100%) rename {gui/src => src}/main/resources/images/green_circle.png (100%) rename {gui/src => src}/main/resources/images/green_circle@2x.png (100%) rename {gui/src => src}/main/resources/images/info.png (100%) rename {gui/src => src}/main/resources/images/info@2x.png (100%) rename {gui/src => src}/main/resources/images/invert.png (100%) rename {gui/src => src}/main/resources/images/invert@2x.png (100%) rename {gui/src => src}/main/resources/images/light_close.png (100%) rename {gui/src => src}/main/resources/images/light_close@2x.png (100%) rename {gui/src => src}/main/resources/images/link.png (100%) rename {gui/src => src}/main/resources/images/link@2x.png (100%) rename {gui/src => src}/main/resources/images/logo_splash.png (100%) rename {gui/src => src}/main/resources/images/logo_splash@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/account.png (100%) rename {gui/src => src}/main/resources/images/nav/account@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/account_active.png (100%) rename {gui/src => src}/main/resources/images/nav/account_active@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/buyoffer.png (100%) rename {gui/src => src}/main/resources/images/nav/buyoffer@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/buyoffer_active.png (100%) rename {gui/src => src}/main/resources/images/nav/buyoffer_active@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/dao.png (100%) rename {gui/src => src}/main/resources/images/nav/dao@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/dao_active.png (100%) rename {gui/src => src}/main/resources/images/nav/dao_active@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/disputes.png (100%) rename {gui/src => src}/main/resources/images/nav/disputes@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/disputes_active.png (100%) rename {gui/src => src}/main/resources/images/nav/disputes_active@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/funds.png (100%) rename {gui/src => src}/main/resources/images/nav/funds@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/funds_active.png (100%) rename {gui/src => src}/main/resources/images/nav/funds_active@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/market.png (100%) rename {gui/src => src}/main/resources/images/nav/market@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/market_active.png (100%) rename {gui/src => src}/main/resources/images/nav/market_active@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/portfolio.png (100%) rename {gui/src => src}/main/resources/images/nav/portfolio@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/portfolio_active.png (100%) rename {gui/src => src}/main/resources/images/nav/portfolio_active@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/selloffer.png (100%) rename {gui/src => src}/main/resources/images/nav/selloffer@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/selloffer_active.png (100%) rename {gui/src => src}/main/resources/images/nav/selloffer_active@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/settings.png (100%) rename {gui/src => src}/main/resources/images/nav/settings@2x.png (100%) rename {gui/src => src}/main/resources/images/nav/settings_active.png (100%) rename {gui/src => src}/main/resources/images/nav/settings_active@2x.png (100%) rename {gui/src => src}/main/resources/images/offer/offer_state_available.png (100%) rename {gui/src => src}/main/resources/images/offer/offer_state_available@2x.png (100%) rename {gui/src => src}/main/resources/images/offer/offer_state_not_available.png (100%) rename {gui/src => src}/main/resources/images/offer/offer_state_not_available@2x.png (100%) rename {gui/src => src}/main/resources/images/offer/offer_state_unknown.png (100%) rename {gui/src => src}/main/resources/images/offer/offer_state_unknown@2x.png (100%) rename {gui/src => src}/main/resources/images/poloniex.png (100%) rename {gui/src => src}/main/resources/images/poloniex@2x.png (100%) rename {gui/src => src}/main/resources/images/remove.png (100%) rename {gui/src => src}/main/resources/images/remove@2x.png (100%) rename {gui/src => src}/main/resources/images/sell.png (100%) rename {gui/src => src}/main/resources/images/sell@2x.png (100%) rename {gui/src => src}/main/resources/images/sell_large.png (100%) rename {gui/src => src}/main/resources/images/sell_large@2x.png (100%) rename {gui/src => src}/main/resources/images/sell_white.png (100%) rename {gui/src => src}/main/resources/images/sell_white@2x.png (100%) rename {gui/src => src}/main/resources/images/spinner.png (100%) rename {gui/src => src}/main/resources/images/spinner@2x.png (100%) rename {gui/src => src}/main/resources/images/system_tray_icon.png (100%) rename {gui/src => src}/main/resources/images/system_tray_icon@2x.png (100%) rename {gui/src => src}/main/resources/images/system_tray_icon_linux.png (100%) rename {gui/src => src}/main/resources/images/system_tray_icon_windows.png (100%) rename {gui/src => src}/main/resources/images/task_bar_icon_linux.png (100%) rename {gui/src => src}/main/resources/images/task_bar_icon_windows.png (100%) rename {gui/src => src}/main/resources/images/tick.png (100%) rename {gui/src => src}/main/resources/images/tick@2x.png (100%) rename {gui/src => src}/main/resources/images/update/update_available.png (100%) rename {gui/src => src}/main/resources/images/update/update_available@2x.png (100%) rename {gui/src => src}/main/resources/images/update/update_failed.png (100%) rename {gui/src => src}/main/resources/images/update/update_failed@2x.png (100%) rename {gui/src => src}/main/resources/images/update/update_in_progress.png (100%) rename {gui/src => src}/main/resources/images/update/update_in_progress@2x.png (100%) rename {gui/src => src}/main/resources/images/update/update_up_to_date.png (100%) rename {gui/src => src}/main/resources/images/update/update_up_to_date@2x.png (100%) rename {gui/src => src}/main/resources/images/window_icon.png (100%) rename {gui/src => src}/main/resources/images/window_icon@2x.png (100%) rename {gui/src => src}/main/resources/keys/29CDFD3B.asc (100%) rename {gui/src => src}/main/resources/keys/5BC5ED73.asc (100%) rename {gui/src => src}/main/resources/keys/F379A1C6.asc (100%) rename {gui/src => src}/main/resources/logback.xml (100%) rename {gui/src => src}/test/java/io/bisq/common/locale/TradeCurrencyMakers.java (100%) rename {gui/src => src}/test/java/io/bisq/common/monetary/PriceMaker.java (100%) rename {gui/src => src}/test/java/io/bisq/common/monetary/VolumeMaker.java (100%) rename {gui/src => src}/test/java/io/bisq/core/offer/OfferMaker.java (100%) rename {gui/src => src}/test/java/io/bisq/core/user/PreferenceMakers.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/AwesomeFontDemo.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/BindingTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$Malformed.fxml (100%) rename {gui/src => src}/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml (100%) rename {gui/src => src}/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml (100%) rename {gui/src => src}/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$WellFormed.fxml (100%) rename {gui/src => src}/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/common/support/CachingViewLoaderTests.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/components/ColoredDecimalPlacesWithZerosTextTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/funds/transactions/ObservableListDecoratorTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactoryTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradeTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModelTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/market/spread/SpreadViewModelTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModelTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/offer/offerbook/OfferBookListItemMaker.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/overlays/windows/downloadupdate/BisqInstallerTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/main/overlays/windows/downloadupdate/VerifyTaskTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/util/BSFormatterTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/util/CurrencyListItemMakers.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/util/CurrencyListTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/util/GUIUtilTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/util/validation/BtcValidatorTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/util/validation/FiatVolumeValidatorTest.java (100%) rename {gui/src => src}/test/java/io/bisq/gui/util/validation/InteracETransferValidatorTest.java (100%) rename {gui/src => src}/test/java/org/bitcoinj/core/CoinMaker.java (100%) rename {gui/src => src}/test/resources/downloadUpdate/F379A1C6.asc (100%) rename {gui/src => src}/test/resources/downloadUpdate/test.txt (100%) rename {gui/src => src}/test/resources/downloadUpdate/test.txt.asc (100%) rename {gui/src => src}/test/resources/downloadUpdate/test_bad.txt (100%) rename {gui/src => src}/test/resources/downloadUpdate/test_bad.txt.asc (100%) diff --git a/gui/pom.xml b/gui/pom.xml deleted file mode 100644 index 5d7dee4e2a..0000000000 --- a/gui/pom.xml +++ /dev/null @@ -1,372 +0,0 @@ - - - - - - parent - io.bisq.exchange - -SNAPSHOT - - 4.0.0 - - gui - - - - - - false - ${basedir}/src/main/java - - **/*.fxml - **/*.css - - - - false - ${basedir}/src/main/resources - - **/*.* - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.1 - - - copy-bouncycastle - package - - copy - - - true - - - org.bouncycastle - bcprov-jdk15on - true - ${project.build.directory}/lib - - - org.bouncycastle - bcpg-jdk15on - true - ${project.build.directory}/lib - - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.0 - - - - - org.bouncycastle:*:*:* - - - - - false - - - - io.bisq.gui.app.BisqAppMain - - lib/bcpg-jdk15on.jar lib/bcprov-jdk15on.jar - - - - true - - - - *:* - - META-INF/maven/**/pom.properties - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - true - bundled - shaded - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.4.1 - - - enforce - verify - - enforce - - - - - - - - true - - - - - - - aopalliance:aopalliance:1.0:jar:null:compile:0235ba8b489512805ac13a8f9ea77a1ca5ebe3e8 - - - ch.qos.logback:logback-classic:1.1.10:jar:null:compile:56d094f1fd93c2578e8138a83bb036c13abe5898 - - - ch.qos.logback:logback-core:1.1.10:jar:null:compile:ee683b13d3ca1cdc876cdf8a341c81d04976e1d6 - - - com.google.code.findbugs:jsr305:3.0.1:jar:null:compile:f7be08ec23c21485b9b5a1cf1654c2ec8c58168d - - - com.google.code.gson:gson:2.2.4:jar:null:compile:a60a5e993c98c864010053cb901b7eab25306568 - - - com.google.guava:guava:18.0:jar:null:compile:cce0823396aa693798f8882e64213b1772032b09 - - - com.google.inject:guice:3.0:jar:null:compile:9d84f15fe35e2c716a02979fb62f50a29f38aefa - - - com.google.zxing:core:2.0:jar:null:compile:001a5b8ccf93ca2fb7c40a94417f8485e3c8b4a6 - - - com.google.zxing:javase:2.0:jar:null:compile:d6384ed133a5d2ae38b9cdece13a56564f91066e - - - com.googlecode.jcsv:jcsv:1.4.0:jar:null:compile:3b2dfd1ff251cdcf4745a7643a966f14d10e2532 - - - com.lambdaworks:scrypt:1.4.0:jar:null:compile:906506b74f30c8c20bccd9ed4a11112d8941fe87 - - - com.madgag.spongycastle:core:1.51.0.0:jar:null:compile:0f642963312ea0e615ad65f28adc5a5b3a2a0862 - - - com.squareup.okhttp:okhttp:2.2.0:jar:null:compile:959c454243581fdf730abfd4f4745441724bcf2c - - - com.squareup.okio:okio:1.2.0:jar:null:compile:c0b52915a48fa91b1b94a28d4a2997bac5f524df - - - commons-codec:commons-codec:1.9:jar:null:compile:9ce04e34240f674bc72680f8b843b1457383161a - - - commons-io:commons-io:2.4:jar:null:compile:b1b6ea3b7e4aa4f492509a4952029cd8e48019ad - - - commons-logging:commons-logging:1.1.3:jar:null:compile:f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f - - - de.jensd:fontawesomefx:8.0.0:jar:null:compile:b42d82b8889fb77858d1f17e69dbdc24beb2ad25 - - - javax.inject:javax.inject:1:jar:null:compile:6975da39a7040257bd51d21a231b76c915872d38 - - junit:junit:4.11:jar:null:test:4e031bb61df09069aeb2bffb4019e7a5034a4ee0 - - - net.bytebuddy:byte-buddy-agent:1.6.5:jar:null:test:1a1e2189a7dcca6e861a4d71ffbda621f74072d6 - - - net.bytebuddy:byte-buddy:1.6.5:jar:null:test:25cf61dea06b7402a91bd8435af4ecfc0dd5935b - - - net.glxn:qrgen:1.3:jar:null:compile:e581726a5bffa3a5d624506ae145acbac3cc4a17 - - - net.jcip:jcip-annotations:1.0:jar:null:compile:afba4942caaeaf46aab0b976afd57cc7c181467e - - - net.sf.jopt-simple:jopt-simple:4.8:jar:null:compile:457ac8fb446301588580604fa877cc56285ff74a - - - org.apache.commons:commons-lang3:3.4:jar:null:compile:5fe28b9518e58819180a43a850fbc0dd24b7c050 - - - org.apache.httpcomponents:httpclient:4.5:jar:null:compile:a1e6cbb3cc2c5f210dd1310ff9fcb2c09c0d1438 - - - org.apache.httpcomponents:httpcore:4.4.1:jar:null:compile:f5aa318bda4c6c8d688c9d00b90681dcd82ce636 - - - org.apache.maven.plugins:maven-clean-plugin:2.5:maven-plugin:null:runtime:75653decaefa85ca8114ff3a4f869bb2ee6d605d - - - org.apache.maven.plugins:maven-compiler-plugin:3.1:maven-plugin:null:runtime:9977a8d04e75609cf01badc4eb6a9c7198c4c5ea - - - org.apache.maven.plugins:maven-deploy-plugin:2.7:maven-plugin:null:runtime:6dadfb75679ca010b41286794f737088ebfe12fd - - - org.apache.maven.plugins:maven-enforcer-plugin:1.4.1:maven-plugin:null:runtime:e9bd7df541415bfe587ce082458f9a48bf9b55b4 - - - org.apache.maven.plugins:maven-install-plugin:2.4:maven-plugin:null:runtime:9d1316166fe4c313f56276935e08df11f45267c2 - - - org.apache.maven.plugins:maven-jar-plugin:2.4:maven-plugin:null:runtime:e3200bcf357b5c5e26df072d27df160546bb079a - - - org.apache.maven.plugins:maven-resources-plugin:2.6:maven-plugin:null:runtime:dd093ff6a4b680eae7ae83b5ab04310249fc6590 - - - org.apache.maven.plugins:maven-shade-plugin:2.3:maven-plugin:null:runtime:d136adc7abccc9c12adcad6ae7a9bc51b2b7184b - - - org.apache.maven.plugins:maven-site-plugin:3.3:maven-plugin:null:runtime:77ba1752b1ac4c4339d6f11554800960a56a4ae1 - - - org.apache.maven.plugins:maven-surefire-plugin:2.12.4:maven-plugin:null:runtime:2b435f7f77777d2e62354fdc690da3f1dc47a26b - - - org.bitcoinj:orchid:1.1.1:jar:null:compile:7898329eae76ec6bfdf27081234bb222d5be09df - - - org.bouncycastle:bcprov-jdk15on:1.56:jar:null:compile:a153c6f9744a3e9dd6feab5e210e1c9861362ec7 - - - org.controlsfx:controlsfx:8.0.6_20:jar:null:compile:5a4ca2765419fe12af0f0c7c5a8129c53bb661d9 - - - org.fxmisc.easybind:easybind:1.0.3:jar:null:compile:336c8226dfa775c714bc8c3410a1565feffcfb34 - - - org.hamcrest:hamcrest-core:1.3:jar:null:test:42a25dc3219429f0e5d060061f71acb49bf010a0 - - - org.jetbrains:annotations:13.0:jar:null:compile:919f0dfe192fb4e063e7dacadee7f8bb9a2672a9 - - - org.mockito:mockito-core:2.7.5:jar:null:test:24f0d023df553036db3e0cf949d1c4748b84bd69 - - - org.objenesis:objenesis:2.5:jar:null:test:612ecb799912ccf77cba9b3ed8c813da086076e9 - - - org.slf4j:slf4j-api:1.7.22:jar:null:compile:a1c83373863cec7ae8d89dc1c5722d8cb6ec0309 - - - org.springframework:spring-core:4.1.1.RELEASE:jar:null:compile:4b0c607ba83c95ad9ea3defd40c35ae47c5df7d0 - - - org.springframework:spring-test:4.1.1.RELEASE:jar:null:test:406ce9c05253f7dd75ac3f31170c71cca7419d8a - - - com.google.protobuf:protobuf-java:3.2.0:jar:null:compile:62ccf171a106ff6791507f2d5364c275f9a3131d - - - - - uk.co.froot.maven.enforcer:digest-enforcer-rules:0.0.1:jar:null:runtime:16a9e04f3fe4bb143c42782d07d5faf65b32106f - - - - - - - - - - - - - uk.co.froot.maven.enforcer - digest-enforcer-rules - 0.0.1 - - - - - - - - - - - io.bisq.exchange - core - ${project.version} - - - - org.controlsfx - controlsfx - 8.0.6_20 - - - - net.glxn - qrgen - 1.3 - - - - de.jensd - fontawesomefx - 8.0.0 - - - - com.googlecode.jcsv - jcsv - 1.4.0 - - - - diff --git a/pom.xml b/pom.xml index 2a6a9dfefc..3ddeb5a311 100644 --- a/pom.xml +++ b/pom.xml @@ -1,51 +1,54 @@ -. + --> + + 4.0.0 - - io.bisq.exchange - parent - pom + io.bisq + desktop -SNAPSHOT - Bisq - The decentralized exchange network - https://bisq.io - - - bisq.io - - - - - GNU AFFERO GENERAL PUBLIC LICENSE - http://www.gnu.org/licenses/agpl-3.0.html - repo - - - - - GitHub - https://github.com/bisq-network/exchange/issues - - - - scm:git:https://github.com/bisq-network/exchange - scm:git:https://github.com/bisq-network/exchange - scm:git:https://github.com/bisq-network/exchange - UTF-8 4.3.6.RELEASE - - common - network - core - gui - - + + + + false + ${basedir}/src/main/java + + **/*.fxml + **/*.css + + + + false + ${basedir}/src/main/resources + + **/*.* + + + + org.apache.maven.plugins @@ -56,24 +59,292 @@ 1.8 - - org.xolstice.maven.plugins - protobuf-maven-plugin - 0.6.0 - - /usr/local/bin/protoc - + org.apache.maven.plugins + maven-dependency-plugin + 3.0.1 + copy-bouncycastle + package - compile - test-compile + copy + + true + + + org.bouncycastle + bcprov-jdk15on + true + ${project.build.directory}/lib + + + org.bouncycastle + bcpg-jdk15on + true + ${project.build.directory}/lib + + + - --> + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.0 + + + + + org.bouncycastle:*:*:* + + + + + false + + + + io.bisq.gui.app.BisqAppMain + + lib/bcpg-jdk15on.jar lib/bcprov-jdk15on.jar + + + + true + + + + *:* + + META-INF/maven/**/pom.properties + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + package + + shade + + + true + bundled + shaded + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.4.1 + + + enforce + verify + + enforce + + + + + + + + true + + + + + + + aopalliance:aopalliance:1.0:jar:null:compile:0235ba8b489512805ac13a8f9ea77a1ca5ebe3e8 + + + ch.qos.logback:logback-classic:1.1.10:jar:null:compile:56d094f1fd93c2578e8138a83bb036c13abe5898 + + + ch.qos.logback:logback-core:1.1.10:jar:null:compile:ee683b13d3ca1cdc876cdf8a341c81d04976e1d6 + + + com.google.code.findbugs:jsr305:3.0.1:jar:null:compile:f7be08ec23c21485b9b5a1cf1654c2ec8c58168d + + + com.google.code.gson:gson:2.2.4:jar:null:compile:a60a5e993c98c864010053cb901b7eab25306568 + + + com.google.guava:guava:18.0:jar:null:compile:cce0823396aa693798f8882e64213b1772032b09 + + + com.google.inject:guice:3.0:jar:null:compile:9d84f15fe35e2c716a02979fb62f50a29f38aefa + + + com.google.zxing:core:2.0:jar:null:compile:001a5b8ccf93ca2fb7c40a94417f8485e3c8b4a6 + + + com.google.zxing:javase:2.0:jar:null:compile:d6384ed133a5d2ae38b9cdece13a56564f91066e + + + com.googlecode.jcsv:jcsv:1.4.0:jar:null:compile:3b2dfd1ff251cdcf4745a7643a966f14d10e2532 + + + com.lambdaworks:scrypt:1.4.0:jar:null:compile:906506b74f30c8c20bccd9ed4a11112d8941fe87 + + + com.madgag.spongycastle:core:1.51.0.0:jar:null:compile:0f642963312ea0e615ad65f28adc5a5b3a2a0862 + + + com.squareup.okhttp:okhttp:2.2.0:jar:null:compile:959c454243581fdf730abfd4f4745441724bcf2c + + + com.squareup.okio:okio:1.2.0:jar:null:compile:c0b52915a48fa91b1b94a28d4a2997bac5f524df + + + commons-codec:commons-codec:1.9:jar:null:compile:9ce04e34240f674bc72680f8b843b1457383161a + + + commons-io:commons-io:2.4:jar:null:compile:b1b6ea3b7e4aa4f492509a4952029cd8e48019ad + + + commons-logging:commons-logging:1.1.3:jar:null:compile:f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f + + + de.jensd:fontawesomefx:8.0.0:jar:null:compile:b42d82b8889fb77858d1f17e69dbdc24beb2ad25 + + + javax.inject:javax.inject:1:jar:null:compile:6975da39a7040257bd51d21a231b76c915872d38 + + junit:junit:4.11:jar:null:test:4e031bb61df09069aeb2bffb4019e7a5034a4ee0 + + + net.bytebuddy:byte-buddy-agent:1.6.5:jar:null:test:1a1e2189a7dcca6e861a4d71ffbda621f74072d6 + + + net.bytebuddy:byte-buddy:1.6.5:jar:null:test:25cf61dea06b7402a91bd8435af4ecfc0dd5935b + + + net.glxn:qrgen:1.3:jar:null:compile:e581726a5bffa3a5d624506ae145acbac3cc4a17 + + + net.jcip:jcip-annotations:1.0:jar:null:compile:afba4942caaeaf46aab0b976afd57cc7c181467e + + + net.sf.jopt-simple:jopt-simple:4.8:jar:null:compile:457ac8fb446301588580604fa877cc56285ff74a + + + org.apache.commons:commons-lang3:3.4:jar:null:compile:5fe28b9518e58819180a43a850fbc0dd24b7c050 + + + org.apache.httpcomponents:httpclient:4.5:jar:null:compile:a1e6cbb3cc2c5f210dd1310ff9fcb2c09c0d1438 + + + org.apache.httpcomponents:httpcore:4.4.1:jar:null:compile:f5aa318bda4c6c8d688c9d00b90681dcd82ce636 + + + org.apache.maven.plugins:maven-clean-plugin:2.5:maven-plugin:null:runtime:75653decaefa85ca8114ff3a4f869bb2ee6d605d + + + org.apache.maven.plugins:maven-compiler-plugin:3.1:maven-plugin:null:runtime:9977a8d04e75609cf01badc4eb6a9c7198c4c5ea + + + org.apache.maven.plugins:maven-deploy-plugin:2.7:maven-plugin:null:runtime:6dadfb75679ca010b41286794f737088ebfe12fd + + + org.apache.maven.plugins:maven-enforcer-plugin:1.4.1:maven-plugin:null:runtime:e9bd7df541415bfe587ce082458f9a48bf9b55b4 + + + org.apache.maven.plugins:maven-install-plugin:2.4:maven-plugin:null:runtime:9d1316166fe4c313f56276935e08df11f45267c2 + + + org.apache.maven.plugins:maven-jar-plugin:2.4:maven-plugin:null:runtime:e3200bcf357b5c5e26df072d27df160546bb079a + + + org.apache.maven.plugins:maven-resources-plugin:2.6:maven-plugin:null:runtime:dd093ff6a4b680eae7ae83b5ab04310249fc6590 + + + org.apache.maven.plugins:maven-shade-plugin:2.3:maven-plugin:null:runtime:d136adc7abccc9c12adcad6ae7a9bc51b2b7184b + + + org.apache.maven.plugins:maven-site-plugin:3.3:maven-plugin:null:runtime:77ba1752b1ac4c4339d6f11554800960a56a4ae1 + + + org.apache.maven.plugins:maven-surefire-plugin:2.12.4:maven-plugin:null:runtime:2b435f7f77777d2e62354fdc690da3f1dc47a26b + + + org.bitcoinj:orchid:1.1.1:jar:null:compile:7898329eae76ec6bfdf27081234bb222d5be09df + + + org.bouncycastle:bcprov-jdk15on:1.56:jar:null:compile:a153c6f9744a3e9dd6feab5e210e1c9861362ec7 + + + org.controlsfx:controlsfx:8.0.6_20:jar:null:compile:5a4ca2765419fe12af0f0c7c5a8129c53bb661d9 + + + org.fxmisc.easybind:easybind:1.0.3:jar:null:compile:336c8226dfa775c714bc8c3410a1565feffcfb34 + + + org.hamcrest:hamcrest-core:1.3:jar:null:test:42a25dc3219429f0e5d060061f71acb49bf010a0 + + + org.jetbrains:annotations:13.0:jar:null:compile:919f0dfe192fb4e063e7dacadee7f8bb9a2672a9 + + + org.mockito:mockito-core:2.7.5:jar:null:test:24f0d023df553036db3e0cf949d1c4748b84bd69 + + + org.objenesis:objenesis:2.5:jar:null:test:612ecb799912ccf77cba9b3ed8c813da086076e9 + + + org.slf4j:slf4j-api:1.7.22:jar:null:compile:a1c83373863cec7ae8d89dc1c5722d8cb6ec0309 + + + org.springframework:spring-core:4.1.1.RELEASE:jar:null:compile:4b0c607ba83c95ad9ea3defd40c35ae47c5df7d0 + + + org.springframework:spring-test:4.1.1.RELEASE:jar:null:test:406ce9c05253f7dd75ac3f31170c71cca7419d8a + + + com.google.protobuf:protobuf-java:3.2.0:jar:null:compile:62ccf171a106ff6791507f2d5364c275f9a3131d + + + + + uk.co.froot.maven.enforcer:digest-enforcer-rules:0.0.1:jar:null:runtime:16a9e04f3fe4bb143c42782d07d5faf65b32106f + + + + + + + + + + + + + uk.co.froot.maven.enforcer + digest-enforcer-rules + 0.0.1 + + + + + @@ -82,100 +353,39 @@ jitpack.io https://jitpack.io - - sonatype-oss-snapshot - - https://oss.sonatype.org/content/repositories/snapshots - - - com.github.bisq-network.libdohj - libdohj-core - 01ae7770 - - - com.google.code.findbugs - jsr305 - - - org.slf4j - slf4j-api - - - com.google.guava - guava - - - com.google.protobuf - protobuf-java - - + io.bisq.exchange + core + 209fdff - - com.google.inject - guice - 4.1.0 - - - com.google.guava - guava - - + org.controlsfx + controlsfx + 8.0.6_20 - - - org.bouncycastle - bcpg-jdk15on - - - org.bouncycastle - bcpg-jdk16 + net.glxn + qrgen + 1.3 - - commons-io - commons-io - 2.4 + de.jensd + fontawesomefx + 8.0.0 + - org.apache.commons - commons-lang3 - 3.4 - - - com.google.guava - guava - 20.0 - - - org.fxmisc.easybind - easybind - 1.0.3 - - - org.reactfx - reactfx - 2.0-M3 - - - org.jetbrains - annotations - 13.0 - - - com.google.code.findbugs - jsr305 - 3.0.1 + com.googlecode.jcsv + jcsv + 1.4.0 + org.projectlombok lombok @@ -183,30 +393,23 @@ provided - - org.slf4j - slf4j-api - 1.7.22 + org.bouncycastle + bcprov-jdk15on + 1.56 - ch.qos.logback - logback-core - 1.1.10 + org.bouncycastle + bcpg-jdk15on + 1.56 - ch.qos.logback - logback-classic - 1.1.10 + org.bouncycastle + bcpg-jdk16 + 1.46 - - junit - junit - 4.12 - test - org.mockito mockito-core @@ -250,39 +453,4 @@ test - - - - - enable-strong-cipher-jdk9 - - [1.9,) - - - unlimited - - - - - - - - - org.bouncycastle - bcprov-jdk15on - 1.56 - - - org.bouncycastle - bcpg-jdk15on - 1.56 - - - org.bouncycastle - bcpg-jdk16 - 1.46 - - - - diff --git a/gui/src/main/java/io/bisq/gui/CandleStickChart.css b/src/main/java/io/bisq/gui/CandleStickChart.css similarity index 100% rename from gui/src/main/java/io/bisq/gui/CandleStickChart.css rename to src/main/java/io/bisq/gui/CandleStickChart.css diff --git a/gui/src/main/java/io/bisq/gui/GuiModule.java b/src/main/java/io/bisq/gui/GuiModule.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/GuiModule.java rename to src/main/java/io/bisq/gui/GuiModule.java diff --git a/gui/src/main/java/io/bisq/gui/Navigation.java b/src/main/java/io/bisq/gui/Navigation.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/Navigation.java rename to src/main/java/io/bisq/gui/Navigation.java diff --git a/gui/src/main/java/io/bisq/gui/SystemTray.java b/src/main/java/io/bisq/gui/SystemTray.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/SystemTray.java rename to src/main/java/io/bisq/gui/SystemTray.java diff --git a/gui/src/main/java/io/bisq/gui/app/BisqApp.java b/src/main/java/io/bisq/gui/app/BisqApp.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/app/BisqApp.java rename to src/main/java/io/bisq/gui/app/BisqApp.java diff --git a/gui/src/main/java/io/bisq/gui/app/BisqAppMain.java b/src/main/java/io/bisq/gui/app/BisqAppMain.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/app/BisqAppMain.java rename to src/main/java/io/bisq/gui/app/BisqAppMain.java diff --git a/gui/src/main/java/io/bisq/gui/app/BisqAppModule.java b/src/main/java/io/bisq/gui/app/BisqAppModule.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/app/BisqAppModule.java rename to src/main/java/io/bisq/gui/app/BisqAppModule.java diff --git a/gui/src/main/java/io/bisq/gui/bisq.css b/src/main/java/io/bisq/gui/bisq.css similarity index 100% rename from gui/src/main/java/io/bisq/gui/bisq.css rename to src/main/java/io/bisq/gui/bisq.css diff --git a/gui/src/main/java/io/bisq/gui/common/UITimer.java b/src/main/java/io/bisq/gui/common/UITimer.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/UITimer.java rename to src/main/java/io/bisq/gui/common/UITimer.java diff --git a/gui/src/main/java/io/bisq/gui/common/ViewfxException.java b/src/main/java/io/bisq/gui/common/ViewfxException.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/ViewfxException.java rename to src/main/java/io/bisq/gui/common/ViewfxException.java diff --git a/gui/src/main/java/io/bisq/gui/common/fxml/FxmlViewLoader.java b/src/main/java/io/bisq/gui/common/fxml/FxmlViewLoader.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/fxml/FxmlViewLoader.java rename to src/main/java/io/bisq/gui/common/fxml/FxmlViewLoader.java diff --git a/gui/src/main/java/io/bisq/gui/common/model/Activatable.java b/src/main/java/io/bisq/gui/common/model/Activatable.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/model/Activatable.java rename to src/main/java/io/bisq/gui/common/model/Activatable.java diff --git a/gui/src/main/java/io/bisq/gui/common/model/ActivatableDataModel.java b/src/main/java/io/bisq/gui/common/model/ActivatableDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/model/ActivatableDataModel.java rename to src/main/java/io/bisq/gui/common/model/ActivatableDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/common/model/ActivatableViewModel.java b/src/main/java/io/bisq/gui/common/model/ActivatableViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/model/ActivatableViewModel.java rename to src/main/java/io/bisq/gui/common/model/ActivatableViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/common/model/ActivatableWithDataModel.java b/src/main/java/io/bisq/gui/common/model/ActivatableWithDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/model/ActivatableWithDataModel.java rename to src/main/java/io/bisq/gui/common/model/ActivatableWithDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/common/model/DataModel.java b/src/main/java/io/bisq/gui/common/model/DataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/model/DataModel.java rename to src/main/java/io/bisq/gui/common/model/DataModel.java diff --git a/gui/src/main/java/io/bisq/gui/common/model/Model.java b/src/main/java/io/bisq/gui/common/model/Model.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/model/Model.java rename to src/main/java/io/bisq/gui/common/model/Model.java diff --git a/gui/src/main/java/io/bisq/gui/common/model/ViewModel.java b/src/main/java/io/bisq/gui/common/model/ViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/model/ViewModel.java rename to src/main/java/io/bisq/gui/common/model/ViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/common/model/WithDataModel.java b/src/main/java/io/bisq/gui/common/model/WithDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/model/WithDataModel.java rename to src/main/java/io/bisq/gui/common/model/WithDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/AbstractView.java b/src/main/java/io/bisq/gui/common/view/AbstractView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/AbstractView.java rename to src/main/java/io/bisq/gui/common/view/AbstractView.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/ActivatableView.java b/src/main/java/io/bisq/gui/common/view/ActivatableView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/ActivatableView.java rename to src/main/java/io/bisq/gui/common/view/ActivatableView.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/ActivatableViewAndModel.java b/src/main/java/io/bisq/gui/common/view/ActivatableViewAndModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/ActivatableViewAndModel.java rename to src/main/java/io/bisq/gui/common/view/ActivatableViewAndModel.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/CachingViewLoader.java b/src/main/java/io/bisq/gui/common/view/CachingViewLoader.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/CachingViewLoader.java rename to src/main/java/io/bisq/gui/common/view/CachingViewLoader.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/DefaultPathConvention.java b/src/main/java/io/bisq/gui/common/view/DefaultPathConvention.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/DefaultPathConvention.java rename to src/main/java/io/bisq/gui/common/view/DefaultPathConvention.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/FxmlView.java b/src/main/java/io/bisq/gui/common/view/FxmlView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/FxmlView.java rename to src/main/java/io/bisq/gui/common/view/FxmlView.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/InitializableView.java b/src/main/java/io/bisq/gui/common/view/InitializableView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/InitializableView.java rename to src/main/java/io/bisq/gui/common/view/InitializableView.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/View.java b/src/main/java/io/bisq/gui/common/view/View.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/View.java rename to src/main/java/io/bisq/gui/common/view/View.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/ViewFactory.java b/src/main/java/io/bisq/gui/common/view/ViewFactory.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/ViewFactory.java rename to src/main/java/io/bisq/gui/common/view/ViewFactory.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/ViewLoader.java b/src/main/java/io/bisq/gui/common/view/ViewLoader.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/ViewLoader.java rename to src/main/java/io/bisq/gui/common/view/ViewLoader.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/ViewPath.java b/src/main/java/io/bisq/gui/common/view/ViewPath.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/ViewPath.java rename to src/main/java/io/bisq/gui/common/view/ViewPath.java diff --git a/gui/src/main/java/io/bisq/gui/common/view/guice/InjectorViewFactory.java b/src/main/java/io/bisq/gui/common/view/guice/InjectorViewFactory.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/common/view/guice/InjectorViewFactory.java rename to src/main/java/io/bisq/gui/common/view/guice/InjectorViewFactory.java diff --git a/gui/src/main/java/io/bisq/gui/components/AddressTextField.java b/src/main/java/io/bisq/gui/components/AddressTextField.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/AddressTextField.java rename to src/main/java/io/bisq/gui/components/AddressTextField.java diff --git a/gui/src/main/java/io/bisq/gui/components/AddressWithIconAndDirection.java b/src/main/java/io/bisq/gui/components/AddressWithIconAndDirection.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/AddressWithIconAndDirection.java rename to src/main/java/io/bisq/gui/components/AddressWithIconAndDirection.java diff --git a/gui/src/main/java/io/bisq/gui/components/AutoTooltipButton.java b/src/main/java/io/bisq/gui/components/AutoTooltipButton.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/AutoTooltipButton.java rename to src/main/java/io/bisq/gui/components/AutoTooltipButton.java diff --git a/gui/src/main/java/io/bisq/gui/components/AutoTooltipCheckBox.java b/src/main/java/io/bisq/gui/components/AutoTooltipCheckBox.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/AutoTooltipCheckBox.java rename to src/main/java/io/bisq/gui/components/AutoTooltipCheckBox.java diff --git a/gui/src/main/java/io/bisq/gui/components/AutoTooltipLabel.java b/src/main/java/io/bisq/gui/components/AutoTooltipLabel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/AutoTooltipLabel.java rename to src/main/java/io/bisq/gui/components/AutoTooltipLabel.java diff --git a/gui/src/main/java/io/bisq/gui/components/AutoTooltipRadioButton.java b/src/main/java/io/bisq/gui/components/AutoTooltipRadioButton.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/AutoTooltipRadioButton.java rename to src/main/java/io/bisq/gui/components/AutoTooltipRadioButton.java diff --git a/gui/src/main/java/io/bisq/gui/components/AutoTooltipTableColumn.java b/src/main/java/io/bisq/gui/components/AutoTooltipTableColumn.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/AutoTooltipTableColumn.java rename to src/main/java/io/bisq/gui/components/AutoTooltipTableColumn.java diff --git a/gui/src/main/java/io/bisq/gui/components/AutoTooltipToggleButton.java b/src/main/java/io/bisq/gui/components/AutoTooltipToggleButton.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/AutoTooltipToggleButton.java rename to src/main/java/io/bisq/gui/components/AutoTooltipToggleButton.java diff --git a/gui/src/main/java/io/bisq/gui/components/BalanceTextField.java b/src/main/java/io/bisq/gui/components/BalanceTextField.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/BalanceTextField.java rename to src/main/java/io/bisq/gui/components/BalanceTextField.java diff --git a/gui/src/main/java/io/bisq/gui/components/BalanceWithConfirmationTextField.java b/src/main/java/io/bisq/gui/components/BalanceWithConfirmationTextField.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/BalanceWithConfirmationTextField.java rename to src/main/java/io/bisq/gui/components/BalanceWithConfirmationTextField.java diff --git a/gui/src/main/java/io/bisq/gui/components/BsqAddressTextField.java b/src/main/java/io/bisq/gui/components/BsqAddressTextField.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/BsqAddressTextField.java rename to src/main/java/io/bisq/gui/components/BsqAddressTextField.java diff --git a/gui/src/main/java/io/bisq/gui/components/BusyAnimation.java b/src/main/java/io/bisq/gui/components/BusyAnimation.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/BusyAnimation.java rename to src/main/java/io/bisq/gui/components/BusyAnimation.java diff --git a/gui/src/main/java/io/bisq/gui/components/ColoredDecimalPlacesWithZerosText.java b/src/main/java/io/bisq/gui/components/ColoredDecimalPlacesWithZerosText.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/ColoredDecimalPlacesWithZerosText.java rename to src/main/java/io/bisq/gui/components/ColoredDecimalPlacesWithZerosText.java diff --git a/gui/src/main/java/io/bisq/gui/components/FundsTextField.java b/src/main/java/io/bisq/gui/components/FundsTextField.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/FundsTextField.java rename to src/main/java/io/bisq/gui/components/FundsTextField.java diff --git a/gui/src/main/java/io/bisq/gui/components/HyperlinkWithIcon.java b/src/main/java/io/bisq/gui/components/HyperlinkWithIcon.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/HyperlinkWithIcon.java rename to src/main/java/io/bisq/gui/components/HyperlinkWithIcon.java diff --git a/gui/src/main/java/io/bisq/gui/components/InfoDisplay.java b/src/main/java/io/bisq/gui/components/InfoDisplay.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/InfoDisplay.java rename to src/main/java/io/bisq/gui/components/InfoDisplay.java diff --git a/gui/src/main/java/io/bisq/gui/components/InfoTextField.java b/src/main/java/io/bisq/gui/components/InfoTextField.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/InfoTextField.java rename to src/main/java/io/bisq/gui/components/InfoTextField.java diff --git a/gui/src/main/java/io/bisq/gui/components/InputTextField.java b/src/main/java/io/bisq/gui/components/InputTextField.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/InputTextField.java rename to src/main/java/io/bisq/gui/components/InputTextField.java diff --git a/gui/src/main/java/io/bisq/gui/components/PasswordTextField.java b/src/main/java/io/bisq/gui/components/PasswordTextField.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/PasswordTextField.java rename to src/main/java/io/bisq/gui/components/PasswordTextField.java diff --git a/gui/src/main/java/io/bisq/gui/components/PeerInfoIcon.java b/src/main/java/io/bisq/gui/components/PeerInfoIcon.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/PeerInfoIcon.java rename to src/main/java/io/bisq/gui/components/PeerInfoIcon.java diff --git a/gui/src/main/java/io/bisq/gui/components/SearchComboBox.java b/src/main/java/io/bisq/gui/components/SearchComboBox.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/SearchComboBox.java rename to src/main/java/io/bisq/gui/components/SearchComboBox.java diff --git a/gui/src/main/java/io/bisq/gui/components/SeparatedPhaseBars.java b/src/main/java/io/bisq/gui/components/SeparatedPhaseBars.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/SeparatedPhaseBars.java rename to src/main/java/io/bisq/gui/components/SeparatedPhaseBars.java diff --git a/gui/src/main/java/io/bisq/gui/components/TableGroupHeadline.java b/src/main/java/io/bisq/gui/components/TableGroupHeadline.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/TableGroupHeadline.java rename to src/main/java/io/bisq/gui/components/TableGroupHeadline.java diff --git a/gui/src/main/java/io/bisq/gui/components/TextFieldWithCopyIcon.java b/src/main/java/io/bisq/gui/components/TextFieldWithCopyIcon.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/TextFieldWithCopyIcon.java rename to src/main/java/io/bisq/gui/components/TextFieldWithCopyIcon.java diff --git a/gui/src/main/java/io/bisq/gui/components/TitledGroupBg.java b/src/main/java/io/bisq/gui/components/TitledGroupBg.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/TitledGroupBg.java rename to src/main/java/io/bisq/gui/components/TitledGroupBg.java diff --git a/gui/src/main/java/io/bisq/gui/components/TooltipUtil.java b/src/main/java/io/bisq/gui/components/TooltipUtil.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/TooltipUtil.java rename to src/main/java/io/bisq/gui/components/TooltipUtil.java diff --git a/gui/src/main/java/io/bisq/gui/components/TxIdTextField.java b/src/main/java/io/bisq/gui/components/TxIdTextField.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/TxIdTextField.java rename to src/main/java/io/bisq/gui/components/TxIdTextField.java diff --git a/gui/src/main/java/io/bisq/gui/components/indicator/TxConfidenceIndicator.java b/src/main/java/io/bisq/gui/components/indicator/TxConfidenceIndicator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/indicator/TxConfidenceIndicator.java rename to src/main/java/io/bisq/gui/components/indicator/TxConfidenceIndicator.java diff --git a/gui/src/main/java/io/bisq/gui/components/indicator/behavior/StaticProgressIndicatorBehavior.java b/src/main/java/io/bisq/gui/components/indicator/behavior/StaticProgressIndicatorBehavior.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/indicator/behavior/StaticProgressIndicatorBehavior.java rename to src/main/java/io/bisq/gui/components/indicator/behavior/StaticProgressIndicatorBehavior.java diff --git a/gui/src/main/java/io/bisq/gui/components/indicator/skin/StaticProgressIndicatorSkin.java b/src/main/java/io/bisq/gui/components/indicator/skin/StaticProgressIndicatorSkin.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/indicator/skin/StaticProgressIndicatorSkin.java rename to src/main/java/io/bisq/gui/components/indicator/skin/StaticProgressIndicatorSkin.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/AliPayForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/AliPayForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/AliPayForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/AliPayForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/BankForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/CashAppForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/CashAppForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/CashAppForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/CashAppForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/ChaseQuickPayForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/ChaseQuickPayForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/ChaseQuickPayForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/ChaseQuickPayForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/ClearXchangeForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/ClearXchangeForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/ClearXchangeForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/ClearXchangeForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/CryptoCurrencyForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/CryptoCurrencyForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/CryptoCurrencyForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/CryptoCurrencyForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/FasterPaymentsForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/InteracETransferForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/InteracETransferForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/InteracETransferForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/InteracETransferForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/MoneyBeamForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/MoneyBeamForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/MoneyBeamForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/MoneyBeamForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/NationalBankForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/NationalBankForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/NationalBankForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/NationalBankForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/PerfectMoneyForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/PerfectMoneyForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/PerfectMoneyForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/PerfectMoneyForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/PopmoneyForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/PopmoneyForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/PopmoneyForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/PopmoneyForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/RevolutForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/RevolutForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/RevolutForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/RevolutForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/SameBankForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/SameBankForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/SameBankForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/SameBankForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaInstantForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/SepaInstantForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaInstantForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/SepaInstantForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/SpecificBankForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/SpecificBankForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/SpecificBankForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/SpecificBankForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/SwishForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/SwishForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/SwishForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/SwishForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/USPostalMoneyOrderForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/USPostalMoneyOrderForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/USPostalMoneyOrderForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/USPostalMoneyOrderForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/UpholdForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/UpholdForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/UpholdForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/UpholdForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/VenmoForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/VenmoForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/VenmoForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/VenmoForm.java diff --git a/gui/src/main/java/io/bisq/gui/components/paymentmethods/WesternUnionForm.java b/src/main/java/io/bisq/gui/components/paymentmethods/WesternUnionForm.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/components/paymentmethods/WesternUnionForm.java rename to src/main/java/io/bisq/gui/components/paymentmethods/WesternUnionForm.java diff --git a/gui/src/main/java/io/bisq/gui/images.css b/src/main/java/io/bisq/gui/images.css similarity index 100% rename from gui/src/main/java/io/bisq/gui/images.css rename to src/main/java/io/bisq/gui/images.css diff --git a/gui/src/main/java/io/bisq/gui/main/MainView.fxml b/src/main/java/io/bisq/gui/main/MainView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/MainView.fxml rename to src/main/java/io/bisq/gui/main/MainView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/MainView.java b/src/main/java/io/bisq/gui/main/MainView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/MainView.java rename to src/main/java/io/bisq/gui/main/MainView.java diff --git a/gui/src/main/java/io/bisq/gui/main/MainViewModel.java b/src/main/java/io/bisq/gui/main/MainViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/MainViewModel.java rename to src/main/java/io/bisq/gui/main/MainViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/PriceFeedComboBoxItem.java b/src/main/java/io/bisq/gui/main/PriceFeedComboBoxItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/PriceFeedComboBoxItem.java rename to src/main/java/io/bisq/gui/main/PriceFeedComboBoxItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/AccountView.fxml b/src/main/java/io/bisq/gui/main/account/AccountView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/AccountView.fxml rename to src/main/java/io/bisq/gui/main/account/AccountView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/account/AccountView.java b/src/main/java/io/bisq/gui/main/account/AccountView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/AccountView.java rename to src/main/java/io/bisq/gui/main/account/AccountView.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/AccountViewModel.java b/src/main/java/io/bisq/gui/main/account/AccountViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/AccountViewModel.java rename to src/main/java/io/bisq/gui/main/account/AccountViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml b/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml rename to src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java b/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java rename to src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java b/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java rename to src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java b/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java rename to src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml b/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml rename to src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java b/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java rename to src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java b/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java rename to src/main/java/io/bisq/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorListItem.java b/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorListItem.java rename to src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml b/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml rename to src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java b/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java rename to src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java b/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java rename to src/main/java/io/bisq/gui/main/account/content/arbitratorselection/ArbitratorSelectionViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.fxml b/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.fxml rename to src/main/java/io/bisq/gui/main/account/content/backup/BackupView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.java b/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/backup/BackupView.java rename to src/main/java/io/bisq/gui/main/account/content/backup/BackupView.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java b/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java rename to src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.fxml b/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.fxml rename to src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.java b/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.java rename to src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsView.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java b/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java rename to src/main/java/io/bisq/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.fxml b/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.fxml rename to src/main/java/io/bisq/gui/main/account/content/password/PasswordView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java b/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java rename to src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.fxml b/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.fxml rename to src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java b/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java rename to src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java diff --git a/gui/src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.fxml b/src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.fxml rename to src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.java b/src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.java rename to src/main/java/io/bisq/gui/main/account/settings/AccountSettingsView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/DaoView.fxml b/src/main/java/io/bisq/gui/main/dao/DaoView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/DaoView.fxml rename to src/main/java/io/bisq/gui/main/dao/DaoView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/DaoView.java b/src/main/java/io/bisq/gui/main/dao/DaoView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/DaoView.java rename to src/main/java/io/bisq/gui/main/dao/DaoView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestDisplay.java b/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestDisplay.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestDisplay.java rename to src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestDisplay.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestListItem.java b/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestListItem.java rename to src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestView.java b/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestView.java rename to src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.fxml b/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.fxml rename to src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.java b/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.java rename to src/main/java/io/bisq/gui/main/dao/compensation/CompensationView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml b/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml rename to src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java b/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java rename to src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml b/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml rename to src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java b/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java rename to src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.fxml b/src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.fxml rename to src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.java b/src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.java rename to src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/voting/VotingView.fxml b/src/main/java/io/bisq/gui/main/dao/voting/VotingView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/voting/VotingView.fxml rename to src/main/java/io/bisq/gui/main/dao/voting/VotingView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/voting/VotingView.java b/src/main/java/io/bisq/gui/main/dao/voting/VotingView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/voting/VotingView.java rename to src/main/java/io/bisq/gui/main/dao/voting/VotingView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml b/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml rename to src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.java b/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.java rename to src/main/java/io/bisq/gui/main/dao/voting/dashboard/VotingDashboardView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.fxml b/src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.fxml rename to src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.java b/src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.java rename to src/main/java/io/bisq/gui/main/dao/voting/history/VotingHistoryView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java b/src/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java rename to src/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/voting/vote/ParameterViewItem.java b/src/main/java/io/bisq/gui/main/dao/voting/vote/ParameterViewItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/voting/vote/ParameterViewItem.java rename to src/main/java/io/bisq/gui/main/dao/voting/vote/ParameterViewItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.fxml b/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.fxml rename to src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java b/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java rename to src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqBalanceUtil.java b/src/main/java/io/bisq/gui/main/dao/wallet/BsqBalanceUtil.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqBalanceUtil.java rename to src/main/java/io/bisq/gui/main/dao/wallet/BsqBalanceUtil.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.fxml b/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.fxml rename to src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java b/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java rename to src/main/java/io/bisq/gui/main/dao/wallet/BsqWalletView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml b/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml rename to src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.java b/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.java rename to src/main/java/io/bisq/gui/main/dao/wallet/dashboard/BsqDashboardView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.fxml b/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.fxml rename to src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java b/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java rename to src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.fxml b/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.fxml rename to src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java b/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java rename to src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxListItem.java b/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxListItem.java rename to src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.fxml b/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.fxml rename to src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java b/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java rename to src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java diff --git a/gui/src/main/java/io/bisq/gui/main/debug/DebugView.fxml b/src/main/java/io/bisq/gui/main/debug/DebugView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/debug/DebugView.fxml rename to src/main/java/io/bisq/gui/main/debug/DebugView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/debug/DebugView.java b/src/main/java/io/bisq/gui/main/debug/DebugView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/debug/DebugView.java rename to src/main/java/io/bisq/gui/main/debug/DebugView.java diff --git a/gui/src/main/java/io/bisq/gui/main/disputes/DisputesView.fxml b/src/main/java/io/bisq/gui/main/disputes/DisputesView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/disputes/DisputesView.fxml rename to src/main/java/io/bisq/gui/main/disputes/DisputesView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/disputes/DisputesView.java b/src/main/java/io/bisq/gui/main/disputes/DisputesView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/disputes/DisputesView.java rename to src/main/java/io/bisq/gui/main/disputes/DisputesView.java diff --git a/gui/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml b/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml rename to src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java b/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java rename to src/main/java/io/bisq/gui/main/disputes/arbitrator/ArbitratorDisputeView.java diff --git a/gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.fxml b/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.fxml rename to src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java b/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java rename to src/main/java/io/bisq/gui/main/disputes/trader/TraderDisputeView.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/FundsView.fxml b/src/main/java/io/bisq/gui/main/funds/FundsView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/FundsView.fxml rename to src/main/java/io/bisq/gui/main/funds/FundsView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/funds/FundsView.java b/src/main/java/io/bisq/gui/main/funds/FundsView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/FundsView.java rename to src/main/java/io/bisq/gui/main/funds/FundsView.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositListItem.java b/src/main/java/io/bisq/gui/main/funds/deposit/DepositListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositListItem.java rename to src/main/java/io/bisq/gui/main/funds/deposit/DepositListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.fxml b/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.fxml rename to src/main/java/io/bisq/gui/main/funds/deposit/DepositView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.java b/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/deposit/DepositView.java rename to src/main/java/io/bisq/gui/main/funds/deposit/DepositView.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/locked/LockedListItem.java b/src/main/java/io/bisq/gui/main/funds/locked/LockedListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/locked/LockedListItem.java rename to src/main/java/io/bisq/gui/main/funds/locked/LockedListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.fxml b/src/main/java/io/bisq/gui/main/funds/locked/LockedView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.fxml rename to src/main/java/io/bisq/gui/main/funds/locked/LockedView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.java b/src/main/java/io/bisq/gui/main/funds/locked/LockedView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/locked/LockedView.java rename to src/main/java/io/bisq/gui/main/funds/locked/LockedView.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedListItem.java b/src/main/java/io/bisq/gui/main/funds/reserved/ReservedListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedListItem.java rename to src/main/java/io/bisq/gui/main/funds/reserved/ReservedListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.fxml b/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.fxml rename to src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.java b/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.java rename to src/main/java/io/bisq/gui/main/funds/reserved/ReservedView.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactions.java b/src/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactions.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactions.java rename to src/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactions.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsFactory.java b/src/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsFactory.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsFactory.java rename to src/main/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsFactory.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/DummyTransactionAwareTradable.java b/src/main/java/io/bisq/gui/main/funds/transactions/DummyTransactionAwareTradable.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/DummyTransactionAwareTradable.java rename to src/main/java/io/bisq/gui/main/funds/transactions/DummyTransactionAwareTradable.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/ObservableListDecorator.java b/src/main/java/io/bisq/gui/main/funds/transactions/ObservableListDecorator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/ObservableListDecorator.java rename to src/main/java/io/bisq/gui/main/funds/transactions/ObservableListDecorator.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/TradableRepository.java b/src/main/java/io/bisq/gui/main/funds/transactions/TradableRepository.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/TradableRepository.java rename to src/main/java/io/bisq/gui/main/funds/transactions/TradableRepository.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareOpenOffer.java b/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareOpenOffer.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareOpenOffer.java rename to src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareOpenOffer.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradable.java b/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradable.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradable.java rename to src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradable.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactory.java b/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactory.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactory.java rename to src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactory.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTrade.java b/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTrade.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTrade.java rename to src/main/java/io/bisq/gui/main/funds/transactions/TransactionAwareTrade.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionListItemFactory.java b/src/main/java/io/bisq/gui/main/funds/transactions/TransactionListItemFactory.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionListItemFactory.java rename to src/main/java/io/bisq/gui/main/funds/transactions/TransactionListItemFactory.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsListItem.java b/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsListItem.java rename to src/main/java/io/bisq/gui/main/funds/transactions/TransactionsListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.fxml b/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.fxml rename to src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java b/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java rename to src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalListItem.java b/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalListItem.java rename to src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.fxml b/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.fxml rename to src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java b/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java rename to src/main/java/io/bisq/gui/main/funds/withdrawal/WithdrawalView.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/MarketView.fxml b/src/main/java/io/bisq/gui/main/market/MarketView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/MarketView.fxml rename to src/main/java/io/bisq/gui/main/market/MarketView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/market/MarketView.java b/src/main/java/io/bisq/gui/main/market/MarketView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/MarketView.java rename to src/main/java/io/bisq/gui/main/market/MarketView.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.fxml b/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.fxml rename to src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.java b/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.java rename to src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java b/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java rename to src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferListItem.java b/src/main/java/io/bisq/gui/main/market/offerbook/OfferListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferListItem.java rename to src/main/java/io/bisq/gui/main/market/offerbook/OfferListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/spread/SpreadItem.java b/src/main/java/io/bisq/gui/main/market/spread/SpreadItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/spread/SpreadItem.java rename to src/main/java/io/bisq/gui/main/market/spread/SpreadItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.fxml b/src/main/java/io/bisq/gui/main/market/spread/SpreadView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.fxml rename to src/main/java/io/bisq/gui/main/market/spread/SpreadView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.java b/src/main/java/io/bisq/gui/main/market/spread/SpreadView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/spread/SpreadView.java rename to src/main/java/io/bisq/gui/main/market/spread/SpreadView.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/spread/SpreadViewModel.java b/src/main/java/io/bisq/gui/main/market/spread/SpreadViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/spread/SpreadViewModel.java rename to src/main/java/io/bisq/gui/main/market/spread/SpreadViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.fxml b/src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.fxml rename to src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.java b/src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.java rename to src/main/java/io/bisq/gui/main/market/trades/TradesChartsView.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java b/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java rename to src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/trades/charts/CandleData.java b/src/main/java/io/bisq/gui/main/market/trades/charts/CandleData.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/trades/charts/CandleData.java rename to src/main/java/io/bisq/gui/main/market/trades/charts/CandleData.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/Candle.java b/src/main/java/io/bisq/gui/main/market/trades/charts/price/Candle.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/Candle.java rename to src/main/java/io/bisq/gui/main/market/trades/charts/price/Candle.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleStickChart.java b/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleStickChart.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleStickChart.java rename to src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleStickChart.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleTooltip.java b/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleTooltip.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleTooltip.java rename to src/main/java/io/bisq/gui/main/market/trades/charts/price/CandleTooltip.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeBar.java b/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeBar.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeBar.java rename to src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeBar.java diff --git a/gui/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeChart.java b/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeChart.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeChart.java rename to src/main/java/io/bisq/gui/main/market/trades/charts/volume/VolumeChart.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/BuyOfferView.fxml b/src/main/java/io/bisq/gui/main/offer/BuyOfferView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/BuyOfferView.fxml rename to src/main/java/io/bisq/gui/main/offer/BuyOfferView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/offer/BuyOfferView.java b/src/main/java/io/bisq/gui/main/offer/BuyOfferView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/BuyOfferView.java rename to src/main/java/io/bisq/gui/main/offer/BuyOfferView.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/OfferDataModel.java b/src/main/java/io/bisq/gui/main/offer/OfferDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/OfferDataModel.java rename to src/main/java/io/bisq/gui/main/offer/OfferDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/OfferView.java b/src/main/java/io/bisq/gui/main/offer/OfferView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/OfferView.java rename to src/main/java/io/bisq/gui/main/offer/OfferView.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/SellOfferView.fxml b/src/main/java/io/bisq/gui/main/offer/SellOfferView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/SellOfferView.fxml rename to src/main/java/io/bisq/gui/main/offer/SellOfferView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/offer/SellOfferView.java b/src/main/java/io/bisq/gui/main/offer/SellOfferView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/SellOfferView.java rename to src/main/java/io/bisq/gui/main/offer/SellOfferView.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java b/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java rename to src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.fxml b/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.fxml rename to src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java b/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java rename to src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java b/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java rename to src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java b/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java rename to src/main/java/io/bisq/gui/main/offer/offerbook/OfferBook.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookListItem.java b/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookListItem.java rename to src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.fxml b/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.fxml rename to src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java b/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java rename to src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java b/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java rename to src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java b/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java rename to src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.fxml b/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.fxml rename to src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java b/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java rename to src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java diff --git a/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java b/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java rename to src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java b/src/main/java/io/bisq/gui/main/overlays/Overlay.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java rename to src/main/java/io/bisq/gui/main/overlays/Overlay.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java b/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java rename to src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/notifications/Notification.java b/src/main/java/io/bisq/gui/main/overlays/notifications/Notification.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/notifications/Notification.java rename to src/main/java/io/bisq/gui/main/overlays/notifications/Notification.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java b/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java rename to src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationManager.java b/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationManager.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationManager.java rename to src/main/java/io/bisq/gui/main/overlays/notifications/NotificationManager.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/popups/Popup.java b/src/main/java/io/bisq/gui/main/overlays/popups/Popup.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/popups/Popup.java rename to src/main/java/io/bisq/gui/main/overlays/popups/Popup.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/popups/PopupManager.java b/src/main/java/io/bisq/gui/main/overlays/popups/PopupManager.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/popups/PopupManager.java rename to src/main/java/io/bisq/gui/main/overlays/popups/PopupManager.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/DisplayAlertMessageWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/DisplayAlertMessageWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/DisplayAlertMessageWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/DisplayAlertMessageWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/EmptyWalletWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/FeeOptionWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/FeeOptionWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/FeeOptionWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/FeeOptionWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/FilterWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/FilterWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/FilterWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/FilterWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/ManualPayoutTxWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/ManualPayoutTxWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/ManualPayoutTxWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/ManualPayoutTxWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/QRCodeWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/QRCodeWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/QRCodeWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/QRCodeWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/SelectBaseCurrencyWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/SelectBaseCurrencyWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/SelectBaseCurrencyWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/SelectBaseCurrencyWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/SelectDepositTxWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/SelectDepositTxWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/SelectDepositTxWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/SelectDepositTxWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/SendAlertMessageWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/SendAlertMessageWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/SendAlertMessageWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/SendAlertMessageWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/SendPrivateNotificationWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/ShowWalletDataWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/ShowWalletDataWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/ShowWalletDataWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/ShowWalletDataWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/TacWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/TradeDetailsWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/TradeDetailsWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/TradeDetailsWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/TradeDetailsWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/UnlockArbitrationRegistrationWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/UnlockArbitrationRegistrationWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/UnlockArbitrationRegistrationWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/UnlockArbitrationRegistrationWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/BisqInstaller.java b/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/BisqInstaller.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/BisqInstaller.java rename to src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/BisqInstaller.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java b/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java rename to src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DownloadTask.java b/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DownloadTask.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DownloadTask.java rename to src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/DownloadTask.java diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/VerifyTask.java b/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/VerifyTask.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/VerifyTask.java rename to src/main/java/io/bisq/gui/main/overlays/windows/downloadupdate/VerifyTask.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.fxml b/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.fxml rename to src/main/java/io/bisq/gui/main/portfolio/PortfolioView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.java b/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/PortfolioView.java rename to src/main/java/io/bisq/gui/main/portfolio/PortfolioView.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradableListItem.java b/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradableListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradableListItem.java rename to src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradableListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java b/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java rename to src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml b/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml rename to src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java b/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java rename to src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java b/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java rename to src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesDataModel.java b/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesDataModel.java rename to src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesListItem.java b/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesListItem.java rename to src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml b/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml rename to src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.java b/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.java rename to src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java b/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java rename to src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOfferListItem.java b/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOfferListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOfferListItem.java rename to src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOfferListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersDataModel.java b/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersDataModel.java rename to src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml b/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml rename to src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java b/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java rename to src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java b/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java rename to src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/BuyerSubView.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/BuyerSubView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/BuyerSubView.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/BuyerSubView.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesListItem.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesListItem.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.fxml b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.fxml rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/SellerSubView.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/SellerSubView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/SellerSubView.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/SellerSubView.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/TradeSubView.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/TradeSubView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/TradeSubView.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/TradeSubView.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeStepView.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep3View.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep1View.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep2View.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java b/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java rename to src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep4View.java diff --git a/gui/src/main/java/io/bisq/gui/main/settings/SettingsView.fxml b/src/main/java/io/bisq/gui/main/settings/SettingsView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/settings/SettingsView.fxml rename to src/main/java/io/bisq/gui/main/settings/SettingsView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/settings/SettingsView.java b/src/main/java/io/bisq/gui/main/settings/SettingsView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/settings/SettingsView.java rename to src/main/java/io/bisq/gui/main/settings/SettingsView.java diff --git a/gui/src/main/java/io/bisq/gui/main/settings/about/AboutView.fxml b/src/main/java/io/bisq/gui/main/settings/about/AboutView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/settings/about/AboutView.fxml rename to src/main/java/io/bisq/gui/main/settings/about/AboutView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/settings/about/AboutView.java b/src/main/java/io/bisq/gui/main/settings/about/AboutView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/settings/about/AboutView.java rename to src/main/java/io/bisq/gui/main/settings/about/AboutView.java diff --git a/gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.fxml b/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.fxml rename to src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java b/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java rename to src/main/java/io/bisq/gui/main/settings/network/NetworkSettingsView.java diff --git a/gui/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java b/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java rename to src/main/java/io/bisq/gui/main/settings/network/P2pNetworkListItem.java diff --git a/gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.fxml b/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.fxml similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.fxml rename to src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.fxml diff --git a/gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java b/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java rename to src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java diff --git a/gui/src/main/java/io/bisq/gui/util/BSFormatter.java b/src/main/java/io/bisq/gui/util/BSFormatter.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/BSFormatter.java rename to src/main/java/io/bisq/gui/util/BSFormatter.java diff --git a/gui/src/main/java/io/bisq/gui/util/BsqFormatter.java b/src/main/java/io/bisq/gui/util/BsqFormatter.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/BsqFormatter.java rename to src/main/java/io/bisq/gui/util/BsqFormatter.java diff --git a/gui/src/main/java/io/bisq/gui/util/Colors.java b/src/main/java/io/bisq/gui/util/Colors.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/Colors.java rename to src/main/java/io/bisq/gui/util/Colors.java diff --git a/gui/src/main/java/io/bisq/gui/util/CurrencyList.java b/src/main/java/io/bisq/gui/util/CurrencyList.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/CurrencyList.java rename to src/main/java/io/bisq/gui/util/CurrencyList.java diff --git a/gui/src/main/java/io/bisq/gui/util/CurrencyListItem.java b/src/main/java/io/bisq/gui/util/CurrencyListItem.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/CurrencyListItem.java rename to src/main/java/io/bisq/gui/util/CurrencyListItem.java diff --git a/gui/src/main/java/io/bisq/gui/util/CurrencyPredicates.java b/src/main/java/io/bisq/gui/util/CurrencyPredicates.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/CurrencyPredicates.java rename to src/main/java/io/bisq/gui/util/CurrencyPredicates.java diff --git a/gui/src/main/java/io/bisq/gui/util/FormBuilder.java b/src/main/java/io/bisq/gui/util/FormBuilder.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/FormBuilder.java rename to src/main/java/io/bisq/gui/util/FormBuilder.java diff --git a/gui/src/main/java/io/bisq/gui/util/GUIProfiler.java b/src/main/java/io/bisq/gui/util/GUIProfiler.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/GUIProfiler.java rename to src/main/java/io/bisq/gui/util/GUIProfiler.java diff --git a/gui/src/main/java/io/bisq/gui/util/GUIUtil.java b/src/main/java/io/bisq/gui/util/GUIUtil.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/GUIUtil.java rename to src/main/java/io/bisq/gui/util/GUIUtil.java diff --git a/gui/src/main/java/io/bisq/gui/util/ImageUtil.java b/src/main/java/io/bisq/gui/util/ImageUtil.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/ImageUtil.java rename to src/main/java/io/bisq/gui/util/ImageUtil.java diff --git a/gui/src/main/java/io/bisq/gui/util/Layout.java b/src/main/java/io/bisq/gui/util/Layout.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/Layout.java rename to src/main/java/io/bisq/gui/util/Layout.java diff --git a/gui/src/main/java/io/bisq/gui/util/Transitions.java b/src/main/java/io/bisq/gui/util/Transitions.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/Transitions.java rename to src/main/java/io/bisq/gui/util/Transitions.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/AccountNrValidator.java b/src/main/java/io/bisq/gui/util/validation/AccountNrValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/AccountNrValidator.java rename to src/main/java/io/bisq/gui/util/validation/AccountNrValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/AliPayValidator.java b/src/main/java/io/bisq/gui/util/validation/AliPayValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/AliPayValidator.java rename to src/main/java/io/bisq/gui/util/validation/AliPayValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java b/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java rename to src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/AltcoinValidator.java b/src/main/java/io/bisq/gui/util/validation/AltcoinValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/AltcoinValidator.java rename to src/main/java/io/bisq/gui/util/validation/AltcoinValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/BICValidator.java b/src/main/java/io/bisq/gui/util/validation/BICValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/BICValidator.java rename to src/main/java/io/bisq/gui/util/validation/BICValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/BankIdValidator.java b/src/main/java/io/bisq/gui/util/validation/BankIdValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/BankIdValidator.java rename to src/main/java/io/bisq/gui/util/validation/BankIdValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/BankValidator.java b/src/main/java/io/bisq/gui/util/validation/BankValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/BankValidator.java rename to src/main/java/io/bisq/gui/util/validation/BankValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/BranchIdValidator.java b/src/main/java/io/bisq/gui/util/validation/BranchIdValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/BranchIdValidator.java rename to src/main/java/io/bisq/gui/util/validation/BranchIdValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/BsqAddressValidator.java b/src/main/java/io/bisq/gui/util/validation/BsqAddressValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/BsqAddressValidator.java rename to src/main/java/io/bisq/gui/util/validation/BsqAddressValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/BsqValidator.java b/src/main/java/io/bisq/gui/util/validation/BsqValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/BsqValidator.java rename to src/main/java/io/bisq/gui/util/validation/BsqValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/BtcAddressValidator.java b/src/main/java/io/bisq/gui/util/validation/BtcAddressValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/BtcAddressValidator.java rename to src/main/java/io/bisq/gui/util/validation/BtcAddressValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/BtcValidator.java b/src/main/java/io/bisq/gui/util/validation/BtcValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/BtcValidator.java rename to src/main/java/io/bisq/gui/util/validation/BtcValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/CashAppValidator.java b/src/main/java/io/bisq/gui/util/validation/CashAppValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/CashAppValidator.java rename to src/main/java/io/bisq/gui/util/validation/CashAppValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/ChaseQuickPayValidator.java b/src/main/java/io/bisq/gui/util/validation/ChaseQuickPayValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/ChaseQuickPayValidator.java rename to src/main/java/io/bisq/gui/util/validation/ChaseQuickPayValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/ClearXchangeValidator.java b/src/main/java/io/bisq/gui/util/validation/ClearXchangeValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/ClearXchangeValidator.java rename to src/main/java/io/bisq/gui/util/validation/ClearXchangeValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/EmailValidator.java b/src/main/java/io/bisq/gui/util/validation/EmailValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/EmailValidator.java rename to src/main/java/io/bisq/gui/util/validation/EmailValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/FiatPriceValidator.java b/src/main/java/io/bisq/gui/util/validation/FiatPriceValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/FiatPriceValidator.java rename to src/main/java/io/bisq/gui/util/validation/FiatPriceValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/FiatVolumeValidator.java b/src/main/java/io/bisq/gui/util/validation/FiatVolumeValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/FiatVolumeValidator.java rename to src/main/java/io/bisq/gui/util/validation/FiatVolumeValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/IBANValidator.java b/src/main/java/io/bisq/gui/util/validation/IBANValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/IBANValidator.java rename to src/main/java/io/bisq/gui/util/validation/IBANValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/InputValidator.java b/src/main/java/io/bisq/gui/util/validation/InputValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/InputValidator.java rename to src/main/java/io/bisq/gui/util/validation/InputValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/InteracETransferValidator.java b/src/main/java/io/bisq/gui/util/validation/InteracETransferValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/InteracETransferValidator.java rename to src/main/java/io/bisq/gui/util/validation/InteracETransferValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/MonetaryValidator.java b/src/main/java/io/bisq/gui/util/validation/MonetaryValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/MonetaryValidator.java rename to src/main/java/io/bisq/gui/util/validation/MonetaryValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/MoneyBeamValidator.java b/src/main/java/io/bisq/gui/util/validation/MoneyBeamValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/MoneyBeamValidator.java rename to src/main/java/io/bisq/gui/util/validation/MoneyBeamValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/NumberValidator.java b/src/main/java/io/bisq/gui/util/validation/NumberValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/NumberValidator.java rename to src/main/java/io/bisq/gui/util/validation/NumberValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/OKPayValidator.java b/src/main/java/io/bisq/gui/util/validation/OKPayValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/OKPayValidator.java rename to src/main/java/io/bisq/gui/util/validation/OKPayValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/PasswordValidator.java b/src/main/java/io/bisq/gui/util/validation/PasswordValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/PasswordValidator.java rename to src/main/java/io/bisq/gui/util/validation/PasswordValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/PerfectMoneyValidator.java b/src/main/java/io/bisq/gui/util/validation/PerfectMoneyValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/PerfectMoneyValidator.java rename to src/main/java/io/bisq/gui/util/validation/PerfectMoneyValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/PopmoneyValidator.java b/src/main/java/io/bisq/gui/util/validation/PopmoneyValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/PopmoneyValidator.java rename to src/main/java/io/bisq/gui/util/validation/PopmoneyValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/RevolutValidator.java b/src/main/java/io/bisq/gui/util/validation/RevolutValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/RevolutValidator.java rename to src/main/java/io/bisq/gui/util/validation/RevolutValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/SecurityDepositValidator.java b/src/main/java/io/bisq/gui/util/validation/SecurityDepositValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/SecurityDepositValidator.java rename to src/main/java/io/bisq/gui/util/validation/SecurityDepositValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/SwishValidator.java b/src/main/java/io/bisq/gui/util/validation/SwishValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/SwishValidator.java rename to src/main/java/io/bisq/gui/util/validation/SwishValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/USPostalMoneyOrderValidator.java b/src/main/java/io/bisq/gui/util/validation/USPostalMoneyOrderValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/USPostalMoneyOrderValidator.java rename to src/main/java/io/bisq/gui/util/validation/USPostalMoneyOrderValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/UpholdValidator.java b/src/main/java/io/bisq/gui/util/validation/UpholdValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/UpholdValidator.java rename to src/main/java/io/bisq/gui/util/validation/UpholdValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/VenmoValidator.java b/src/main/java/io/bisq/gui/util/validation/VenmoValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/VenmoValidator.java rename to src/main/java/io/bisq/gui/util/validation/VenmoValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/altcoins/ByteballAddressValidator.java b/src/main/java/io/bisq/gui/util/validation/altcoins/ByteballAddressValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/altcoins/ByteballAddressValidator.java rename to src/main/java/io/bisq/gui/util/validation/altcoins/ByteballAddressValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/altcoins/NxtReedSolomonValidator.java b/src/main/java/io/bisq/gui/util/validation/altcoins/NxtReedSolomonValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/altcoins/NxtReedSolomonValidator.java rename to src/main/java/io/bisq/gui/util/validation/altcoins/NxtReedSolomonValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/altcoins/OctocoinAddressValidator.java b/src/main/java/io/bisq/gui/util/validation/altcoins/OctocoinAddressValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/altcoins/OctocoinAddressValidator.java rename to src/main/java/io/bisq/gui/util/validation/altcoins/OctocoinAddressValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/altcoins/PNCAddressValidator.java b/src/main/java/io/bisq/gui/util/validation/altcoins/PNCAddressValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/altcoins/PNCAddressValidator.java rename to src/main/java/io/bisq/gui/util/validation/altcoins/PNCAddressValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/altcoins/WMCCAddressValidator.java b/src/main/java/io/bisq/gui/util/validation/altcoins/WMCCAddressValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/altcoins/WMCCAddressValidator.java rename to src/main/java/io/bisq/gui/util/validation/altcoins/WMCCAddressValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/altcoins/XCNAddressValidator.java b/src/main/java/io/bisq/gui/util/validation/altcoins/XCNAddressValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/altcoins/XCNAddressValidator.java rename to src/main/java/io/bisq/gui/util/validation/altcoins/XCNAddressValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/altcoins/YTNAddressValidator.java b/src/main/java/io/bisq/gui/util/validation/altcoins/YTNAddressValidator.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/altcoins/YTNAddressValidator.java rename to src/main/java/io/bisq/gui/util/validation/altcoins/YTNAddressValidator.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/ACHParams.java b/src/main/java/io/bisq/gui/util/validation/params/ACHParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/ACHParams.java rename to src/main/java/io/bisq/gui/util/validation/params/ACHParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/AlcParams.java b/src/main/java/io/bisq/gui/util/validation/params/AlcParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/AlcParams.java rename to src/main/java/io/bisq/gui/util/validation/params/AlcParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/CageParams.java b/src/main/java/io/bisq/gui/util/validation/params/CageParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/CageParams.java rename to src/main/java/io/bisq/gui/util/validation/params/CageParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/CreaParams.java b/src/main/java/io/bisq/gui/util/validation/params/CreaParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/CreaParams.java rename to src/main/java/io/bisq/gui/util/validation/params/CreaParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/IOPParams.java b/src/main/java/io/bisq/gui/util/validation/params/IOPParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/IOPParams.java rename to src/main/java/io/bisq/gui/util/validation/params/IOPParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/ODNParams.java b/src/main/java/io/bisq/gui/util/validation/params/ODNParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/ODNParams.java rename to src/main/java/io/bisq/gui/util/validation/params/ODNParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/OctocoinParams.java b/src/main/java/io/bisq/gui/util/validation/params/OctocoinParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/OctocoinParams.java rename to src/main/java/io/bisq/gui/util/validation/params/OctocoinParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/OnionParams.java b/src/main/java/io/bisq/gui/util/validation/params/OnionParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/OnionParams.java rename to src/main/java/io/bisq/gui/util/validation/params/OnionParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/PARTParams.java b/src/main/java/io/bisq/gui/util/validation/params/PARTParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/PARTParams.java rename to src/main/java/io/bisq/gui/util/validation/params/PARTParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/PNCParams.java b/src/main/java/io/bisq/gui/util/validation/params/PNCParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/PNCParams.java rename to src/main/java/io/bisq/gui/util/validation/params/PNCParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/PivxParams.java b/src/main/java/io/bisq/gui/util/validation/params/PivxParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/PivxParams.java rename to src/main/java/io/bisq/gui/util/validation/params/PivxParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/SpeedCashParams.java b/src/main/java/io/bisq/gui/util/validation/params/SpeedCashParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/SpeedCashParams.java rename to src/main/java/io/bisq/gui/util/validation/params/SpeedCashParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/StrayaParams.java b/src/main/java/io/bisq/gui/util/validation/params/StrayaParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/StrayaParams.java rename to src/main/java/io/bisq/gui/util/validation/params/StrayaParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/TerracoinParams.java b/src/main/java/io/bisq/gui/util/validation/params/TerracoinParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/TerracoinParams.java rename to src/main/java/io/bisq/gui/util/validation/params/TerracoinParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/WACoinsParams.java b/src/main/java/io/bisq/gui/util/validation/params/WACoinsParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/WACoinsParams.java rename to src/main/java/io/bisq/gui/util/validation/params/WACoinsParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/WMCCParams.java b/src/main/java/io/bisq/gui/util/validation/params/WMCCParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/WMCCParams.java rename to src/main/java/io/bisq/gui/util/validation/params/WMCCParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/XspecParams.java b/src/main/java/io/bisq/gui/util/validation/params/XspecParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/XspecParams.java rename to src/main/java/io/bisq/gui/util/validation/params/XspecParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/btc/AbstractBitcoinNetParams.java b/src/main/java/io/bisq/gui/util/validation/params/btc/AbstractBitcoinNetParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/btc/AbstractBitcoinNetParams.java rename to src/main/java/io/bisq/gui/util/validation/params/btc/AbstractBitcoinNetParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/btc/BTGParams.java b/src/main/java/io/bisq/gui/util/validation/params/btc/BTGParams.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/btc/BTGParams.java rename to src/main/java/io/bisq/gui/util/validation/params/btc/BTGParams.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/btc/BtcMainNetParamsForValidation.java b/src/main/java/io/bisq/gui/util/validation/params/btc/BtcMainNetParamsForValidation.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/btc/BtcMainNetParamsForValidation.java rename to src/main/java/io/bisq/gui/util/validation/params/btc/BtcMainNetParamsForValidation.java diff --git a/gui/src/main/java/io/bisq/gui/util/validation/params/btc/Networks.java b/src/main/java/io/bisq/gui/util/validation/params/btc/Networks.java similarity index 100% rename from gui/src/main/java/io/bisq/gui/util/validation/params/btc/Networks.java rename to src/main/java/io/bisq/gui/util/validation/params/btc/Networks.java diff --git a/gui/src/main/resources/fonts/Apache License.txt b/src/main/resources/fonts/Apache License.txt similarity index 100% rename from gui/src/main/resources/fonts/Apache License.txt rename to src/main/resources/fonts/Apache License.txt diff --git a/gui/src/main/resources/fonts/DroidSansMono.ttf b/src/main/resources/fonts/DroidSansMono.ttf similarity index 100% rename from gui/src/main/resources/fonts/DroidSansMono.ttf rename to src/main/resources/fonts/DroidSansMono.ttf diff --git a/gui/src/main/resources/fonts/Verdana.ttf b/src/main/resources/fonts/Verdana.ttf similarity index 100% rename from gui/src/main/resources/fonts/Verdana.ttf rename to src/main/resources/fonts/Verdana.ttf diff --git a/gui/src/main/resources/fonts/VerdanaBold.ttf b/src/main/resources/fonts/VerdanaBold.ttf similarity index 100% rename from gui/src/main/resources/fonts/VerdanaBold.ttf rename to src/main/resources/fonts/VerdanaBold.ttf diff --git a/gui/src/main/resources/images/alert_round.png b/src/main/resources/images/alert_round.png similarity index 100% rename from gui/src/main/resources/images/alert_round.png rename to src/main/resources/images/alert_round.png diff --git a/gui/src/main/resources/images/alert_round@2x.png b/src/main/resources/images/alert_round@2x.png similarity index 100% rename from gui/src/main/resources/images/alert_round@2x.png rename to src/main/resources/images/alert_round@2x.png diff --git a/gui/src/main/resources/images/arrow_blue.png b/src/main/resources/images/arrow_blue.png similarity index 100% rename from gui/src/main/resources/images/arrow_blue.png rename to src/main/resources/images/arrow_blue.png diff --git a/gui/src/main/resources/images/arrow_blue@2x.png b/src/main/resources/images/arrow_blue@2x.png similarity index 100% rename from gui/src/main/resources/images/arrow_blue@2x.png rename to src/main/resources/images/arrow_blue@2x.png diff --git a/gui/src/main/resources/images/arrow_grey.png b/src/main/resources/images/arrow_grey.png similarity index 100% rename from gui/src/main/resources/images/arrow_grey.png rename to src/main/resources/images/arrow_grey.png diff --git a/gui/src/main/resources/images/arrow_grey@2x.png b/src/main/resources/images/arrow_grey@2x.png similarity index 100% rename from gui/src/main/resources/images/arrow_grey@2x.png rename to src/main/resources/images/arrow_grey@2x.png diff --git a/gui/src/main/resources/images/attachment.png b/src/main/resources/images/attachment.png similarity index 100% rename from gui/src/main/resources/images/attachment.png rename to src/main/resources/images/attachment.png diff --git a/gui/src/main/resources/images/attachment@2x.png b/src/main/resources/images/attachment@2x.png similarity index 100% rename from gui/src/main/resources/images/attachment@2x.png rename to src/main/resources/images/attachment@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_1.png b/src/main/resources/images/avatars/avatar_1.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_1.png rename to src/main/resources/images/avatars/avatar_1.png diff --git a/gui/src/main/resources/images/avatars/avatar_10.png b/src/main/resources/images/avatars/avatar_10.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_10.png rename to src/main/resources/images/avatars/avatar_10.png diff --git a/gui/src/main/resources/images/avatars/avatar_10@2x.png b/src/main/resources/images/avatars/avatar_10@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_10@2x.png rename to src/main/resources/images/avatars/avatar_10@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_11.png b/src/main/resources/images/avatars/avatar_11.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_11.png rename to src/main/resources/images/avatars/avatar_11.png diff --git a/gui/src/main/resources/images/avatars/avatar_11@2x.png b/src/main/resources/images/avatars/avatar_11@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_11@2x.png rename to src/main/resources/images/avatars/avatar_11@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_12.png b/src/main/resources/images/avatars/avatar_12.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_12.png rename to src/main/resources/images/avatars/avatar_12.png diff --git a/gui/src/main/resources/images/avatars/avatar_12@2x.png b/src/main/resources/images/avatars/avatar_12@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_12@2x.png rename to src/main/resources/images/avatars/avatar_12@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_13.png b/src/main/resources/images/avatars/avatar_13.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_13.png rename to src/main/resources/images/avatars/avatar_13.png diff --git a/gui/src/main/resources/images/avatars/avatar_13@2x.png b/src/main/resources/images/avatars/avatar_13@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_13@2x.png rename to src/main/resources/images/avatars/avatar_13@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_14.png b/src/main/resources/images/avatars/avatar_14.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_14.png rename to src/main/resources/images/avatars/avatar_14.png diff --git a/gui/src/main/resources/images/avatars/avatar_14@2x.png b/src/main/resources/images/avatars/avatar_14@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_14@2x.png rename to src/main/resources/images/avatars/avatar_14@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_15.png b/src/main/resources/images/avatars/avatar_15.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_15.png rename to src/main/resources/images/avatars/avatar_15.png diff --git a/gui/src/main/resources/images/avatars/avatar_15@2x.png b/src/main/resources/images/avatars/avatar_15@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_15@2x.png rename to src/main/resources/images/avatars/avatar_15@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_1@2x.png b/src/main/resources/images/avatars/avatar_1@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_1@2x.png rename to src/main/resources/images/avatars/avatar_1@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_2.png b/src/main/resources/images/avatars/avatar_2.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_2.png rename to src/main/resources/images/avatars/avatar_2.png diff --git a/gui/src/main/resources/images/avatars/avatar_2@2x.png b/src/main/resources/images/avatars/avatar_2@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_2@2x.png rename to src/main/resources/images/avatars/avatar_2@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_3.png b/src/main/resources/images/avatars/avatar_3.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_3.png rename to src/main/resources/images/avatars/avatar_3.png diff --git a/gui/src/main/resources/images/avatars/avatar_3@2x.png b/src/main/resources/images/avatars/avatar_3@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_3@2x.png rename to src/main/resources/images/avatars/avatar_3@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_4.png b/src/main/resources/images/avatars/avatar_4.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_4.png rename to src/main/resources/images/avatars/avatar_4.png diff --git a/gui/src/main/resources/images/avatars/avatar_4@2x.png b/src/main/resources/images/avatars/avatar_4@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_4@2x.png rename to src/main/resources/images/avatars/avatar_4@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_5.png b/src/main/resources/images/avatars/avatar_5.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_5.png rename to src/main/resources/images/avatars/avatar_5.png diff --git a/gui/src/main/resources/images/avatars/avatar_5@2x.png b/src/main/resources/images/avatars/avatar_5@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_5@2x.png rename to src/main/resources/images/avatars/avatar_5@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_6.png b/src/main/resources/images/avatars/avatar_6.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_6.png rename to src/main/resources/images/avatars/avatar_6.png diff --git a/gui/src/main/resources/images/avatars/avatar_6@2x.png b/src/main/resources/images/avatars/avatar_6@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_6@2x.png rename to src/main/resources/images/avatars/avatar_6@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_7.png b/src/main/resources/images/avatars/avatar_7.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_7.png rename to src/main/resources/images/avatars/avatar_7.png diff --git a/gui/src/main/resources/images/avatars/avatar_7@2x.png b/src/main/resources/images/avatars/avatar_7@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_7@2x.png rename to src/main/resources/images/avatars/avatar_7@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_8.png b/src/main/resources/images/avatars/avatar_8.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_8.png rename to src/main/resources/images/avatars/avatar_8.png diff --git a/gui/src/main/resources/images/avatars/avatar_8@2x.png b/src/main/resources/images/avatars/avatar_8@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_8@2x.png rename to src/main/resources/images/avatars/avatar_8@2x.png diff --git a/gui/src/main/resources/images/avatars/avatar_9.png b/src/main/resources/images/avatars/avatar_9.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_9.png rename to src/main/resources/images/avatars/avatar_9.png diff --git a/gui/src/main/resources/images/avatars/avatar_9@2x.png b/src/main/resources/images/avatars/avatar_9@2x.png similarity index 100% rename from gui/src/main/resources/images/avatars/avatar_9@2x.png rename to src/main/resources/images/avatars/avatar_9@2x.png diff --git a/gui/src/main/resources/images/blue_circle.png b/src/main/resources/images/blue_circle.png similarity index 100% rename from gui/src/main/resources/images/blue_circle.png rename to src/main/resources/images/blue_circle.png diff --git a/gui/src/main/resources/images/blue_circle@2x.png b/src/main/resources/images/blue_circle@2x.png similarity index 100% rename from gui/src/main/resources/images/blue_circle@2x.png rename to src/main/resources/images/blue_circle@2x.png diff --git a/gui/src/main/resources/images/btcaverage.png b/src/main/resources/images/btcaverage.png similarity index 100% rename from gui/src/main/resources/images/btcaverage.png rename to src/main/resources/images/btcaverage.png diff --git a/gui/src/main/resources/images/btcaverage@2x.png b/src/main/resources/images/btcaverage@2x.png similarity index 100% rename from gui/src/main/resources/images/btcaverage@2x.png rename to src/main/resources/images/btcaverage@2x.png diff --git a/gui/src/main/resources/images/bubble_arrow_blue_left.png b/src/main/resources/images/bubble_arrow_blue_left.png similarity index 100% rename from gui/src/main/resources/images/bubble_arrow_blue_left.png rename to src/main/resources/images/bubble_arrow_blue_left.png diff --git a/gui/src/main/resources/images/bubble_arrow_blue_left@2x.png b/src/main/resources/images/bubble_arrow_blue_left@2x.png similarity index 100% rename from gui/src/main/resources/images/bubble_arrow_blue_left@2x.png rename to src/main/resources/images/bubble_arrow_blue_left@2x.png diff --git a/gui/src/main/resources/images/bubble_arrow_blue_right.png b/src/main/resources/images/bubble_arrow_blue_right.png similarity index 100% rename from gui/src/main/resources/images/bubble_arrow_blue_right.png rename to src/main/resources/images/bubble_arrow_blue_right.png diff --git a/gui/src/main/resources/images/bubble_arrow_blue_right@2x.png b/src/main/resources/images/bubble_arrow_blue_right@2x.png similarity index 100% rename from gui/src/main/resources/images/bubble_arrow_blue_right@2x.png rename to src/main/resources/images/bubble_arrow_blue_right@2x.png diff --git a/gui/src/main/resources/images/bubble_arrow_grey_left.png b/src/main/resources/images/bubble_arrow_grey_left.png similarity index 100% rename from gui/src/main/resources/images/bubble_arrow_grey_left.png rename to src/main/resources/images/bubble_arrow_grey_left.png diff --git a/gui/src/main/resources/images/bubble_arrow_grey_left@2x.png b/src/main/resources/images/bubble_arrow_grey_left@2x.png similarity index 100% rename from gui/src/main/resources/images/bubble_arrow_grey_left@2x.png rename to src/main/resources/images/bubble_arrow_grey_left@2x.png diff --git a/gui/src/main/resources/images/bubble_arrow_grey_right.png b/src/main/resources/images/bubble_arrow_grey_right.png similarity index 100% rename from gui/src/main/resources/images/bubble_arrow_grey_right.png rename to src/main/resources/images/bubble_arrow_grey_right.png diff --git a/gui/src/main/resources/images/bubble_arrow_grey_right@2x.png b/src/main/resources/images/bubble_arrow_grey_right@2x.png similarity index 100% rename from gui/src/main/resources/images/bubble_arrow_grey_right@2x.png rename to src/main/resources/images/bubble_arrow_grey_right@2x.png diff --git a/gui/src/main/resources/images/buy.png b/src/main/resources/images/buy.png similarity index 100% rename from gui/src/main/resources/images/buy.png rename to src/main/resources/images/buy.png diff --git a/gui/src/main/resources/images/buy@2x.png b/src/main/resources/images/buy@2x.png similarity index 100% rename from gui/src/main/resources/images/buy@2x.png rename to src/main/resources/images/buy@2x.png diff --git a/gui/src/main/resources/images/buy_large.png b/src/main/resources/images/buy_large.png similarity index 100% rename from gui/src/main/resources/images/buy_large.png rename to src/main/resources/images/buy_large.png diff --git a/gui/src/main/resources/images/buy_large@2x.png b/src/main/resources/images/buy_large@2x.png similarity index 100% rename from gui/src/main/resources/images/buy_large@2x.png rename to src/main/resources/images/buy_large@2x.png diff --git a/gui/src/main/resources/images/buy_white.png b/src/main/resources/images/buy_white.png similarity index 100% rename from gui/src/main/resources/images/buy_white.png rename to src/main/resources/images/buy_white.png diff --git a/gui/src/main/resources/images/buy_white@2x.png b/src/main/resources/images/buy_white@2x.png similarity index 100% rename from gui/src/main/resources/images/buy_white@2x.png rename to src/main/resources/images/buy_white@2x.png diff --git a/gui/src/main/resources/images/collapse.png b/src/main/resources/images/collapse.png similarity index 100% rename from gui/src/main/resources/images/collapse.png rename to src/main/resources/images/collapse.png diff --git a/gui/src/main/resources/images/collapse@2x.png b/src/main/resources/images/collapse@2x.png similarity index 100% rename from gui/src/main/resources/images/collapse@2x.png rename to src/main/resources/images/collapse@2x.png diff --git a/gui/src/main/resources/images/connection/direct.png b/src/main/resources/images/connection/direct.png similarity index 100% rename from gui/src/main/resources/images/connection/direct.png rename to src/main/resources/images/connection/direct.png diff --git a/gui/src/main/resources/images/connection/direct@2x.png b/src/main/resources/images/connection/direct@2x.png similarity index 100% rename from gui/src/main/resources/images/connection/direct@2x.png rename to src/main/resources/images/connection/direct@2x.png diff --git a/gui/src/main/resources/images/connection/nat.png b/src/main/resources/images/connection/nat.png similarity index 100% rename from gui/src/main/resources/images/connection/nat.png rename to src/main/resources/images/connection/nat.png diff --git a/gui/src/main/resources/images/connection/nat@2x.png b/src/main/resources/images/connection/nat@2x.png similarity index 100% rename from gui/src/main/resources/images/connection/nat@2x.png rename to src/main/resources/images/connection/nat@2x.png diff --git a/gui/src/main/resources/images/connection/relay.png b/src/main/resources/images/connection/relay.png similarity index 100% rename from gui/src/main/resources/images/connection/relay.png rename to src/main/resources/images/connection/relay.png diff --git a/gui/src/main/resources/images/connection/relay@2x.png b/src/main/resources/images/connection/relay@2x.png similarity index 100% rename from gui/src/main/resources/images/connection/relay@2x.png rename to src/main/resources/images/connection/relay@2x.png diff --git a/gui/src/main/resources/images/connection/synced.png b/src/main/resources/images/connection/synced.png similarity index 100% rename from gui/src/main/resources/images/connection/synced.png rename to src/main/resources/images/connection/synced.png diff --git a/gui/src/main/resources/images/connection/synced@2x.png b/src/main/resources/images/connection/synced@2x.png similarity index 100% rename from gui/src/main/resources/images/connection/synced@2x.png rename to src/main/resources/images/connection/synced@2x.png diff --git a/gui/src/main/resources/images/connection/tor.png b/src/main/resources/images/connection/tor.png similarity index 100% rename from gui/src/main/resources/images/connection/tor.png rename to src/main/resources/images/connection/tor.png diff --git a/gui/src/main/resources/images/connection/tor@2x.png b/src/main/resources/images/connection/tor@2x.png similarity index 100% rename from gui/src/main/resources/images/connection/tor@2x.png rename to src/main/resources/images/connection/tor@2x.png diff --git a/gui/src/main/resources/images/countries/ad.png b/src/main/resources/images/countries/ad.png similarity index 100% rename from gui/src/main/resources/images/countries/ad.png rename to src/main/resources/images/countries/ad.png diff --git a/gui/src/main/resources/images/countries/ae.png b/src/main/resources/images/countries/ae.png similarity index 100% rename from gui/src/main/resources/images/countries/ae.png rename to src/main/resources/images/countries/ae.png diff --git a/gui/src/main/resources/images/countries/af.png b/src/main/resources/images/countries/af.png similarity index 100% rename from gui/src/main/resources/images/countries/af.png rename to src/main/resources/images/countries/af.png diff --git a/gui/src/main/resources/images/countries/ag.png b/src/main/resources/images/countries/ag.png similarity index 100% rename from gui/src/main/resources/images/countries/ag.png rename to src/main/resources/images/countries/ag.png diff --git a/gui/src/main/resources/images/countries/ai.png b/src/main/resources/images/countries/ai.png similarity index 100% rename from gui/src/main/resources/images/countries/ai.png rename to src/main/resources/images/countries/ai.png diff --git a/gui/src/main/resources/images/countries/al.png b/src/main/resources/images/countries/al.png similarity index 100% rename from gui/src/main/resources/images/countries/al.png rename to src/main/resources/images/countries/al.png diff --git a/gui/src/main/resources/images/countries/am.png b/src/main/resources/images/countries/am.png similarity index 100% rename from gui/src/main/resources/images/countries/am.png rename to src/main/resources/images/countries/am.png diff --git a/gui/src/main/resources/images/countries/an.png b/src/main/resources/images/countries/an.png similarity index 100% rename from gui/src/main/resources/images/countries/an.png rename to src/main/resources/images/countries/an.png diff --git a/gui/src/main/resources/images/countries/ao.png b/src/main/resources/images/countries/ao.png similarity index 100% rename from gui/src/main/resources/images/countries/ao.png rename to src/main/resources/images/countries/ao.png diff --git a/gui/src/main/resources/images/countries/ar.png b/src/main/resources/images/countries/ar.png similarity index 100% rename from gui/src/main/resources/images/countries/ar.png rename to src/main/resources/images/countries/ar.png diff --git a/gui/src/main/resources/images/countries/as.png b/src/main/resources/images/countries/as.png similarity index 100% rename from gui/src/main/resources/images/countries/as.png rename to src/main/resources/images/countries/as.png diff --git a/gui/src/main/resources/images/countries/at.png b/src/main/resources/images/countries/at.png similarity index 100% rename from gui/src/main/resources/images/countries/at.png rename to src/main/resources/images/countries/at.png diff --git a/gui/src/main/resources/images/countries/au.png b/src/main/resources/images/countries/au.png similarity index 100% rename from gui/src/main/resources/images/countries/au.png rename to src/main/resources/images/countries/au.png diff --git a/gui/src/main/resources/images/countries/aw.png b/src/main/resources/images/countries/aw.png similarity index 100% rename from gui/src/main/resources/images/countries/aw.png rename to src/main/resources/images/countries/aw.png diff --git a/gui/src/main/resources/images/countries/ax.png b/src/main/resources/images/countries/ax.png similarity index 100% rename from gui/src/main/resources/images/countries/ax.png rename to src/main/resources/images/countries/ax.png diff --git a/gui/src/main/resources/images/countries/az.png b/src/main/resources/images/countries/az.png similarity index 100% rename from gui/src/main/resources/images/countries/az.png rename to src/main/resources/images/countries/az.png diff --git a/gui/src/main/resources/images/countries/ba.png b/src/main/resources/images/countries/ba.png similarity index 100% rename from gui/src/main/resources/images/countries/ba.png rename to src/main/resources/images/countries/ba.png diff --git a/gui/src/main/resources/images/countries/bb.png b/src/main/resources/images/countries/bb.png similarity index 100% rename from gui/src/main/resources/images/countries/bb.png rename to src/main/resources/images/countries/bb.png diff --git a/gui/src/main/resources/images/countries/bd.png b/src/main/resources/images/countries/bd.png similarity index 100% rename from gui/src/main/resources/images/countries/bd.png rename to src/main/resources/images/countries/bd.png diff --git a/gui/src/main/resources/images/countries/be.png b/src/main/resources/images/countries/be.png similarity index 100% rename from gui/src/main/resources/images/countries/be.png rename to src/main/resources/images/countries/be.png diff --git a/gui/src/main/resources/images/countries/bf.png b/src/main/resources/images/countries/bf.png similarity index 100% rename from gui/src/main/resources/images/countries/bf.png rename to src/main/resources/images/countries/bf.png diff --git a/gui/src/main/resources/images/countries/bg.png b/src/main/resources/images/countries/bg.png similarity index 100% rename from gui/src/main/resources/images/countries/bg.png rename to src/main/resources/images/countries/bg.png diff --git a/gui/src/main/resources/images/countries/bh.png b/src/main/resources/images/countries/bh.png similarity index 100% rename from gui/src/main/resources/images/countries/bh.png rename to src/main/resources/images/countries/bh.png diff --git a/gui/src/main/resources/images/countries/bi.png b/src/main/resources/images/countries/bi.png similarity index 100% rename from gui/src/main/resources/images/countries/bi.png rename to src/main/resources/images/countries/bi.png diff --git a/gui/src/main/resources/images/countries/bj.png b/src/main/resources/images/countries/bj.png similarity index 100% rename from gui/src/main/resources/images/countries/bj.png rename to src/main/resources/images/countries/bj.png diff --git a/gui/src/main/resources/images/countries/bm.png b/src/main/resources/images/countries/bm.png similarity index 100% rename from gui/src/main/resources/images/countries/bm.png rename to src/main/resources/images/countries/bm.png diff --git a/gui/src/main/resources/images/countries/bn.png b/src/main/resources/images/countries/bn.png similarity index 100% rename from gui/src/main/resources/images/countries/bn.png rename to src/main/resources/images/countries/bn.png diff --git a/gui/src/main/resources/images/countries/bo.png b/src/main/resources/images/countries/bo.png similarity index 100% rename from gui/src/main/resources/images/countries/bo.png rename to src/main/resources/images/countries/bo.png diff --git a/gui/src/main/resources/images/countries/br.png b/src/main/resources/images/countries/br.png similarity index 100% rename from gui/src/main/resources/images/countries/br.png rename to src/main/resources/images/countries/br.png diff --git a/gui/src/main/resources/images/countries/bs.png b/src/main/resources/images/countries/bs.png similarity index 100% rename from gui/src/main/resources/images/countries/bs.png rename to src/main/resources/images/countries/bs.png diff --git a/gui/src/main/resources/images/countries/bt.png b/src/main/resources/images/countries/bt.png similarity index 100% rename from gui/src/main/resources/images/countries/bt.png rename to src/main/resources/images/countries/bt.png diff --git a/gui/src/main/resources/images/countries/bv.png b/src/main/resources/images/countries/bv.png similarity index 100% rename from gui/src/main/resources/images/countries/bv.png rename to src/main/resources/images/countries/bv.png diff --git a/gui/src/main/resources/images/countries/bw.png b/src/main/resources/images/countries/bw.png similarity index 100% rename from gui/src/main/resources/images/countries/bw.png rename to src/main/resources/images/countries/bw.png diff --git a/gui/src/main/resources/images/countries/by.png b/src/main/resources/images/countries/by.png similarity index 100% rename from gui/src/main/resources/images/countries/by.png rename to src/main/resources/images/countries/by.png diff --git a/gui/src/main/resources/images/countries/bz.png b/src/main/resources/images/countries/bz.png similarity index 100% rename from gui/src/main/resources/images/countries/bz.png rename to src/main/resources/images/countries/bz.png diff --git a/gui/src/main/resources/images/countries/ca.png b/src/main/resources/images/countries/ca.png similarity index 100% rename from gui/src/main/resources/images/countries/ca.png rename to src/main/resources/images/countries/ca.png diff --git a/gui/src/main/resources/images/countries/catalonia.png b/src/main/resources/images/countries/catalonia.png similarity index 100% rename from gui/src/main/resources/images/countries/catalonia.png rename to src/main/resources/images/countries/catalonia.png diff --git a/gui/src/main/resources/images/countries/cc.png b/src/main/resources/images/countries/cc.png similarity index 100% rename from gui/src/main/resources/images/countries/cc.png rename to src/main/resources/images/countries/cc.png diff --git a/gui/src/main/resources/images/countries/cd.png b/src/main/resources/images/countries/cd.png similarity index 100% rename from gui/src/main/resources/images/countries/cd.png rename to src/main/resources/images/countries/cd.png diff --git a/gui/src/main/resources/images/countries/cf.png b/src/main/resources/images/countries/cf.png similarity index 100% rename from gui/src/main/resources/images/countries/cf.png rename to src/main/resources/images/countries/cf.png diff --git a/gui/src/main/resources/images/countries/cg.png b/src/main/resources/images/countries/cg.png similarity index 100% rename from gui/src/main/resources/images/countries/cg.png rename to src/main/resources/images/countries/cg.png diff --git a/gui/src/main/resources/images/countries/ch.png b/src/main/resources/images/countries/ch.png similarity index 100% rename from gui/src/main/resources/images/countries/ch.png rename to src/main/resources/images/countries/ch.png diff --git a/gui/src/main/resources/images/countries/ci.png b/src/main/resources/images/countries/ci.png similarity index 100% rename from gui/src/main/resources/images/countries/ci.png rename to src/main/resources/images/countries/ci.png diff --git a/gui/src/main/resources/images/countries/ck.png b/src/main/resources/images/countries/ck.png similarity index 100% rename from gui/src/main/resources/images/countries/ck.png rename to src/main/resources/images/countries/ck.png diff --git a/gui/src/main/resources/images/countries/cl.png b/src/main/resources/images/countries/cl.png similarity index 100% rename from gui/src/main/resources/images/countries/cl.png rename to src/main/resources/images/countries/cl.png diff --git a/gui/src/main/resources/images/countries/cm.png b/src/main/resources/images/countries/cm.png similarity index 100% rename from gui/src/main/resources/images/countries/cm.png rename to src/main/resources/images/countries/cm.png diff --git a/gui/src/main/resources/images/countries/cn.png b/src/main/resources/images/countries/cn.png similarity index 100% rename from gui/src/main/resources/images/countries/cn.png rename to src/main/resources/images/countries/cn.png diff --git a/gui/src/main/resources/images/countries/co.png b/src/main/resources/images/countries/co.png similarity index 100% rename from gui/src/main/resources/images/countries/co.png rename to src/main/resources/images/countries/co.png diff --git a/gui/src/main/resources/images/countries/cr.png b/src/main/resources/images/countries/cr.png similarity index 100% rename from gui/src/main/resources/images/countries/cr.png rename to src/main/resources/images/countries/cr.png diff --git a/gui/src/main/resources/images/countries/cs.png b/src/main/resources/images/countries/cs.png similarity index 100% rename from gui/src/main/resources/images/countries/cs.png rename to src/main/resources/images/countries/cs.png diff --git a/gui/src/main/resources/images/countries/cu.png b/src/main/resources/images/countries/cu.png similarity index 100% rename from gui/src/main/resources/images/countries/cu.png rename to src/main/resources/images/countries/cu.png diff --git a/gui/src/main/resources/images/countries/cv.png b/src/main/resources/images/countries/cv.png similarity index 100% rename from gui/src/main/resources/images/countries/cv.png rename to src/main/resources/images/countries/cv.png diff --git a/gui/src/main/resources/images/countries/cx.png b/src/main/resources/images/countries/cx.png similarity index 100% rename from gui/src/main/resources/images/countries/cx.png rename to src/main/resources/images/countries/cx.png diff --git a/gui/src/main/resources/images/countries/cy.png b/src/main/resources/images/countries/cy.png similarity index 100% rename from gui/src/main/resources/images/countries/cy.png rename to src/main/resources/images/countries/cy.png diff --git a/gui/src/main/resources/images/countries/cz.png b/src/main/resources/images/countries/cz.png similarity index 100% rename from gui/src/main/resources/images/countries/cz.png rename to src/main/resources/images/countries/cz.png diff --git a/gui/src/main/resources/images/countries/de.png b/src/main/resources/images/countries/de.png similarity index 100% rename from gui/src/main/resources/images/countries/de.png rename to src/main/resources/images/countries/de.png diff --git a/gui/src/main/resources/images/countries/dj.png b/src/main/resources/images/countries/dj.png similarity index 100% rename from gui/src/main/resources/images/countries/dj.png rename to src/main/resources/images/countries/dj.png diff --git a/gui/src/main/resources/images/countries/dk.png b/src/main/resources/images/countries/dk.png similarity index 100% rename from gui/src/main/resources/images/countries/dk.png rename to src/main/resources/images/countries/dk.png diff --git a/gui/src/main/resources/images/countries/dm.png b/src/main/resources/images/countries/dm.png similarity index 100% rename from gui/src/main/resources/images/countries/dm.png rename to src/main/resources/images/countries/dm.png diff --git a/gui/src/main/resources/images/countries/do.png b/src/main/resources/images/countries/do.png similarity index 100% rename from gui/src/main/resources/images/countries/do.png rename to src/main/resources/images/countries/do.png diff --git a/gui/src/main/resources/images/countries/dz.png b/src/main/resources/images/countries/dz.png similarity index 100% rename from gui/src/main/resources/images/countries/dz.png rename to src/main/resources/images/countries/dz.png diff --git a/gui/src/main/resources/images/countries/ec.png b/src/main/resources/images/countries/ec.png similarity index 100% rename from gui/src/main/resources/images/countries/ec.png rename to src/main/resources/images/countries/ec.png diff --git a/gui/src/main/resources/images/countries/ee.png b/src/main/resources/images/countries/ee.png similarity index 100% rename from gui/src/main/resources/images/countries/ee.png rename to src/main/resources/images/countries/ee.png diff --git a/gui/src/main/resources/images/countries/eg.png b/src/main/resources/images/countries/eg.png similarity index 100% rename from gui/src/main/resources/images/countries/eg.png rename to src/main/resources/images/countries/eg.png diff --git a/gui/src/main/resources/images/countries/eh.png b/src/main/resources/images/countries/eh.png similarity index 100% rename from gui/src/main/resources/images/countries/eh.png rename to src/main/resources/images/countries/eh.png diff --git a/gui/src/main/resources/images/countries/england.png b/src/main/resources/images/countries/england.png similarity index 100% rename from gui/src/main/resources/images/countries/england.png rename to src/main/resources/images/countries/england.png diff --git a/gui/src/main/resources/images/countries/er.png b/src/main/resources/images/countries/er.png similarity index 100% rename from gui/src/main/resources/images/countries/er.png rename to src/main/resources/images/countries/er.png diff --git a/gui/src/main/resources/images/countries/es.png b/src/main/resources/images/countries/es.png similarity index 100% rename from gui/src/main/resources/images/countries/es.png rename to src/main/resources/images/countries/es.png diff --git a/gui/src/main/resources/images/countries/et.png b/src/main/resources/images/countries/et.png similarity index 100% rename from gui/src/main/resources/images/countries/et.png rename to src/main/resources/images/countries/et.png diff --git a/gui/src/main/resources/images/countries/eu.png b/src/main/resources/images/countries/eu.png similarity index 100% rename from gui/src/main/resources/images/countries/eu.png rename to src/main/resources/images/countries/eu.png diff --git a/gui/src/main/resources/images/countries/fam.png b/src/main/resources/images/countries/fam.png similarity index 100% rename from gui/src/main/resources/images/countries/fam.png rename to src/main/resources/images/countries/fam.png diff --git a/gui/src/main/resources/images/countries/fi.png b/src/main/resources/images/countries/fi.png similarity index 100% rename from gui/src/main/resources/images/countries/fi.png rename to src/main/resources/images/countries/fi.png diff --git a/gui/src/main/resources/images/countries/fj.png b/src/main/resources/images/countries/fj.png similarity index 100% rename from gui/src/main/resources/images/countries/fj.png rename to src/main/resources/images/countries/fj.png diff --git a/gui/src/main/resources/images/countries/fk.png b/src/main/resources/images/countries/fk.png similarity index 100% rename from gui/src/main/resources/images/countries/fk.png rename to src/main/resources/images/countries/fk.png diff --git a/gui/src/main/resources/images/countries/fm.png b/src/main/resources/images/countries/fm.png similarity index 100% rename from gui/src/main/resources/images/countries/fm.png rename to src/main/resources/images/countries/fm.png diff --git a/gui/src/main/resources/images/countries/fo.png b/src/main/resources/images/countries/fo.png similarity index 100% rename from gui/src/main/resources/images/countries/fo.png rename to src/main/resources/images/countries/fo.png diff --git a/gui/src/main/resources/images/countries/fr.png b/src/main/resources/images/countries/fr.png similarity index 100% rename from gui/src/main/resources/images/countries/fr.png rename to src/main/resources/images/countries/fr.png diff --git a/gui/src/main/resources/images/countries/ga.png b/src/main/resources/images/countries/ga.png similarity index 100% rename from gui/src/main/resources/images/countries/ga.png rename to src/main/resources/images/countries/ga.png diff --git a/gui/src/main/resources/images/countries/gd.png b/src/main/resources/images/countries/gd.png similarity index 100% rename from gui/src/main/resources/images/countries/gd.png rename to src/main/resources/images/countries/gd.png diff --git a/gui/src/main/resources/images/countries/ge.png b/src/main/resources/images/countries/ge.png similarity index 100% rename from gui/src/main/resources/images/countries/ge.png rename to src/main/resources/images/countries/ge.png diff --git a/gui/src/main/resources/images/countries/gf.png b/src/main/resources/images/countries/gf.png similarity index 100% rename from gui/src/main/resources/images/countries/gf.png rename to src/main/resources/images/countries/gf.png diff --git a/gui/src/main/resources/images/countries/gh.png b/src/main/resources/images/countries/gh.png similarity index 100% rename from gui/src/main/resources/images/countries/gh.png rename to src/main/resources/images/countries/gh.png diff --git a/gui/src/main/resources/images/countries/gi.png b/src/main/resources/images/countries/gi.png similarity index 100% rename from gui/src/main/resources/images/countries/gi.png rename to src/main/resources/images/countries/gi.png diff --git a/gui/src/main/resources/images/countries/gl.png b/src/main/resources/images/countries/gl.png similarity index 100% rename from gui/src/main/resources/images/countries/gl.png rename to src/main/resources/images/countries/gl.png diff --git a/gui/src/main/resources/images/countries/gm.png b/src/main/resources/images/countries/gm.png similarity index 100% rename from gui/src/main/resources/images/countries/gm.png rename to src/main/resources/images/countries/gm.png diff --git a/gui/src/main/resources/images/countries/gn.png b/src/main/resources/images/countries/gn.png similarity index 100% rename from gui/src/main/resources/images/countries/gn.png rename to src/main/resources/images/countries/gn.png diff --git a/gui/src/main/resources/images/countries/gp.png b/src/main/resources/images/countries/gp.png similarity index 100% rename from gui/src/main/resources/images/countries/gp.png rename to src/main/resources/images/countries/gp.png diff --git a/gui/src/main/resources/images/countries/gq.png b/src/main/resources/images/countries/gq.png similarity index 100% rename from gui/src/main/resources/images/countries/gq.png rename to src/main/resources/images/countries/gq.png diff --git a/gui/src/main/resources/images/countries/gr.png b/src/main/resources/images/countries/gr.png similarity index 100% rename from gui/src/main/resources/images/countries/gr.png rename to src/main/resources/images/countries/gr.png diff --git a/gui/src/main/resources/images/countries/gs.png b/src/main/resources/images/countries/gs.png similarity index 100% rename from gui/src/main/resources/images/countries/gs.png rename to src/main/resources/images/countries/gs.png diff --git a/gui/src/main/resources/images/countries/gt.png b/src/main/resources/images/countries/gt.png similarity index 100% rename from gui/src/main/resources/images/countries/gt.png rename to src/main/resources/images/countries/gt.png diff --git a/gui/src/main/resources/images/countries/gu.png b/src/main/resources/images/countries/gu.png similarity index 100% rename from gui/src/main/resources/images/countries/gu.png rename to src/main/resources/images/countries/gu.png diff --git a/gui/src/main/resources/images/countries/gw.png b/src/main/resources/images/countries/gw.png similarity index 100% rename from gui/src/main/resources/images/countries/gw.png rename to src/main/resources/images/countries/gw.png diff --git a/gui/src/main/resources/images/countries/gy.png b/src/main/resources/images/countries/gy.png similarity index 100% rename from gui/src/main/resources/images/countries/gy.png rename to src/main/resources/images/countries/gy.png diff --git a/gui/src/main/resources/images/countries/hk.png b/src/main/resources/images/countries/hk.png similarity index 100% rename from gui/src/main/resources/images/countries/hk.png rename to src/main/resources/images/countries/hk.png diff --git a/gui/src/main/resources/images/countries/hm.png b/src/main/resources/images/countries/hm.png similarity index 100% rename from gui/src/main/resources/images/countries/hm.png rename to src/main/resources/images/countries/hm.png diff --git a/gui/src/main/resources/images/countries/hn.png b/src/main/resources/images/countries/hn.png similarity index 100% rename from gui/src/main/resources/images/countries/hn.png rename to src/main/resources/images/countries/hn.png diff --git a/gui/src/main/resources/images/countries/hr.png b/src/main/resources/images/countries/hr.png similarity index 100% rename from gui/src/main/resources/images/countries/hr.png rename to src/main/resources/images/countries/hr.png diff --git a/gui/src/main/resources/images/countries/ht.png b/src/main/resources/images/countries/ht.png similarity index 100% rename from gui/src/main/resources/images/countries/ht.png rename to src/main/resources/images/countries/ht.png diff --git a/gui/src/main/resources/images/countries/hu.png b/src/main/resources/images/countries/hu.png similarity index 100% rename from gui/src/main/resources/images/countries/hu.png rename to src/main/resources/images/countries/hu.png diff --git a/gui/src/main/resources/images/countries/id.png b/src/main/resources/images/countries/id.png similarity index 100% rename from gui/src/main/resources/images/countries/id.png rename to src/main/resources/images/countries/id.png diff --git a/gui/src/main/resources/images/countries/ie.png b/src/main/resources/images/countries/ie.png similarity index 100% rename from gui/src/main/resources/images/countries/ie.png rename to src/main/resources/images/countries/ie.png diff --git a/gui/src/main/resources/images/countries/il.png b/src/main/resources/images/countries/il.png similarity index 100% rename from gui/src/main/resources/images/countries/il.png rename to src/main/resources/images/countries/il.png diff --git a/gui/src/main/resources/images/countries/in.png b/src/main/resources/images/countries/in.png similarity index 100% rename from gui/src/main/resources/images/countries/in.png rename to src/main/resources/images/countries/in.png diff --git a/gui/src/main/resources/images/countries/io.png b/src/main/resources/images/countries/io.png similarity index 100% rename from gui/src/main/resources/images/countries/io.png rename to src/main/resources/images/countries/io.png diff --git a/gui/src/main/resources/images/countries/iq.png b/src/main/resources/images/countries/iq.png similarity index 100% rename from gui/src/main/resources/images/countries/iq.png rename to src/main/resources/images/countries/iq.png diff --git a/gui/src/main/resources/images/countries/ir.png b/src/main/resources/images/countries/ir.png similarity index 100% rename from gui/src/main/resources/images/countries/ir.png rename to src/main/resources/images/countries/ir.png diff --git a/gui/src/main/resources/images/countries/is.png b/src/main/resources/images/countries/is.png similarity index 100% rename from gui/src/main/resources/images/countries/is.png rename to src/main/resources/images/countries/is.png diff --git a/gui/src/main/resources/images/countries/it.png b/src/main/resources/images/countries/it.png similarity index 100% rename from gui/src/main/resources/images/countries/it.png rename to src/main/resources/images/countries/it.png diff --git a/gui/src/main/resources/images/countries/jm.png b/src/main/resources/images/countries/jm.png similarity index 100% rename from gui/src/main/resources/images/countries/jm.png rename to src/main/resources/images/countries/jm.png diff --git a/gui/src/main/resources/images/countries/jo.png b/src/main/resources/images/countries/jo.png similarity index 100% rename from gui/src/main/resources/images/countries/jo.png rename to src/main/resources/images/countries/jo.png diff --git a/gui/src/main/resources/images/countries/jp.png b/src/main/resources/images/countries/jp.png similarity index 100% rename from gui/src/main/resources/images/countries/jp.png rename to src/main/resources/images/countries/jp.png diff --git a/gui/src/main/resources/images/countries/ke.png b/src/main/resources/images/countries/ke.png similarity index 100% rename from gui/src/main/resources/images/countries/ke.png rename to src/main/resources/images/countries/ke.png diff --git a/gui/src/main/resources/images/countries/kg.png b/src/main/resources/images/countries/kg.png similarity index 100% rename from gui/src/main/resources/images/countries/kg.png rename to src/main/resources/images/countries/kg.png diff --git a/gui/src/main/resources/images/countries/kh.png b/src/main/resources/images/countries/kh.png similarity index 100% rename from gui/src/main/resources/images/countries/kh.png rename to src/main/resources/images/countries/kh.png diff --git a/gui/src/main/resources/images/countries/ki.png b/src/main/resources/images/countries/ki.png similarity index 100% rename from gui/src/main/resources/images/countries/ki.png rename to src/main/resources/images/countries/ki.png diff --git a/gui/src/main/resources/images/countries/km.png b/src/main/resources/images/countries/km.png similarity index 100% rename from gui/src/main/resources/images/countries/km.png rename to src/main/resources/images/countries/km.png diff --git a/gui/src/main/resources/images/countries/kn.png b/src/main/resources/images/countries/kn.png similarity index 100% rename from gui/src/main/resources/images/countries/kn.png rename to src/main/resources/images/countries/kn.png diff --git a/gui/src/main/resources/images/countries/kp.png b/src/main/resources/images/countries/kp.png similarity index 100% rename from gui/src/main/resources/images/countries/kp.png rename to src/main/resources/images/countries/kp.png diff --git a/gui/src/main/resources/images/countries/kr.png b/src/main/resources/images/countries/kr.png similarity index 100% rename from gui/src/main/resources/images/countries/kr.png rename to src/main/resources/images/countries/kr.png diff --git a/gui/src/main/resources/images/countries/kw.png b/src/main/resources/images/countries/kw.png similarity index 100% rename from gui/src/main/resources/images/countries/kw.png rename to src/main/resources/images/countries/kw.png diff --git a/gui/src/main/resources/images/countries/ky.png b/src/main/resources/images/countries/ky.png similarity index 100% rename from gui/src/main/resources/images/countries/ky.png rename to src/main/resources/images/countries/ky.png diff --git a/gui/src/main/resources/images/countries/kz.png b/src/main/resources/images/countries/kz.png similarity index 100% rename from gui/src/main/resources/images/countries/kz.png rename to src/main/resources/images/countries/kz.png diff --git a/gui/src/main/resources/images/countries/la.png b/src/main/resources/images/countries/la.png similarity index 100% rename from gui/src/main/resources/images/countries/la.png rename to src/main/resources/images/countries/la.png diff --git a/gui/src/main/resources/images/countries/lb.png b/src/main/resources/images/countries/lb.png similarity index 100% rename from gui/src/main/resources/images/countries/lb.png rename to src/main/resources/images/countries/lb.png diff --git a/gui/src/main/resources/images/countries/lc.png b/src/main/resources/images/countries/lc.png similarity index 100% rename from gui/src/main/resources/images/countries/lc.png rename to src/main/resources/images/countries/lc.png diff --git a/gui/src/main/resources/images/countries/li.png b/src/main/resources/images/countries/li.png similarity index 100% rename from gui/src/main/resources/images/countries/li.png rename to src/main/resources/images/countries/li.png diff --git a/gui/src/main/resources/images/countries/lk.png b/src/main/resources/images/countries/lk.png similarity index 100% rename from gui/src/main/resources/images/countries/lk.png rename to src/main/resources/images/countries/lk.png diff --git a/gui/src/main/resources/images/countries/lr.png b/src/main/resources/images/countries/lr.png similarity index 100% rename from gui/src/main/resources/images/countries/lr.png rename to src/main/resources/images/countries/lr.png diff --git a/gui/src/main/resources/images/countries/ls.png b/src/main/resources/images/countries/ls.png similarity index 100% rename from gui/src/main/resources/images/countries/ls.png rename to src/main/resources/images/countries/ls.png diff --git a/gui/src/main/resources/images/countries/lt.png b/src/main/resources/images/countries/lt.png similarity index 100% rename from gui/src/main/resources/images/countries/lt.png rename to src/main/resources/images/countries/lt.png diff --git a/gui/src/main/resources/images/countries/lu.png b/src/main/resources/images/countries/lu.png similarity index 100% rename from gui/src/main/resources/images/countries/lu.png rename to src/main/resources/images/countries/lu.png diff --git a/gui/src/main/resources/images/countries/lv.png b/src/main/resources/images/countries/lv.png similarity index 100% rename from gui/src/main/resources/images/countries/lv.png rename to src/main/resources/images/countries/lv.png diff --git a/gui/src/main/resources/images/countries/ly.png b/src/main/resources/images/countries/ly.png similarity index 100% rename from gui/src/main/resources/images/countries/ly.png rename to src/main/resources/images/countries/ly.png diff --git a/gui/src/main/resources/images/countries/ma.png b/src/main/resources/images/countries/ma.png similarity index 100% rename from gui/src/main/resources/images/countries/ma.png rename to src/main/resources/images/countries/ma.png diff --git a/gui/src/main/resources/images/countries/mc.png b/src/main/resources/images/countries/mc.png similarity index 100% rename from gui/src/main/resources/images/countries/mc.png rename to src/main/resources/images/countries/mc.png diff --git a/gui/src/main/resources/images/countries/md.png b/src/main/resources/images/countries/md.png similarity index 100% rename from gui/src/main/resources/images/countries/md.png rename to src/main/resources/images/countries/md.png diff --git a/gui/src/main/resources/images/countries/me.png b/src/main/resources/images/countries/me.png similarity index 100% rename from gui/src/main/resources/images/countries/me.png rename to src/main/resources/images/countries/me.png diff --git a/gui/src/main/resources/images/countries/mg.png b/src/main/resources/images/countries/mg.png similarity index 100% rename from gui/src/main/resources/images/countries/mg.png rename to src/main/resources/images/countries/mg.png diff --git a/gui/src/main/resources/images/countries/mh.png b/src/main/resources/images/countries/mh.png similarity index 100% rename from gui/src/main/resources/images/countries/mh.png rename to src/main/resources/images/countries/mh.png diff --git a/gui/src/main/resources/images/countries/mk.png b/src/main/resources/images/countries/mk.png similarity index 100% rename from gui/src/main/resources/images/countries/mk.png rename to src/main/resources/images/countries/mk.png diff --git a/gui/src/main/resources/images/countries/ml.png b/src/main/resources/images/countries/ml.png similarity index 100% rename from gui/src/main/resources/images/countries/ml.png rename to src/main/resources/images/countries/ml.png diff --git a/gui/src/main/resources/images/countries/mm.png b/src/main/resources/images/countries/mm.png similarity index 100% rename from gui/src/main/resources/images/countries/mm.png rename to src/main/resources/images/countries/mm.png diff --git a/gui/src/main/resources/images/countries/mn.png b/src/main/resources/images/countries/mn.png similarity index 100% rename from gui/src/main/resources/images/countries/mn.png rename to src/main/resources/images/countries/mn.png diff --git a/gui/src/main/resources/images/countries/mo.png b/src/main/resources/images/countries/mo.png similarity index 100% rename from gui/src/main/resources/images/countries/mo.png rename to src/main/resources/images/countries/mo.png diff --git a/gui/src/main/resources/images/countries/mp.png b/src/main/resources/images/countries/mp.png similarity index 100% rename from gui/src/main/resources/images/countries/mp.png rename to src/main/resources/images/countries/mp.png diff --git a/gui/src/main/resources/images/countries/mq.png b/src/main/resources/images/countries/mq.png similarity index 100% rename from gui/src/main/resources/images/countries/mq.png rename to src/main/resources/images/countries/mq.png diff --git a/gui/src/main/resources/images/countries/mr.png b/src/main/resources/images/countries/mr.png similarity index 100% rename from gui/src/main/resources/images/countries/mr.png rename to src/main/resources/images/countries/mr.png diff --git a/gui/src/main/resources/images/countries/ms.png b/src/main/resources/images/countries/ms.png similarity index 100% rename from gui/src/main/resources/images/countries/ms.png rename to src/main/resources/images/countries/ms.png diff --git a/gui/src/main/resources/images/countries/mt.png b/src/main/resources/images/countries/mt.png similarity index 100% rename from gui/src/main/resources/images/countries/mt.png rename to src/main/resources/images/countries/mt.png diff --git a/gui/src/main/resources/images/countries/mu.png b/src/main/resources/images/countries/mu.png similarity index 100% rename from gui/src/main/resources/images/countries/mu.png rename to src/main/resources/images/countries/mu.png diff --git a/gui/src/main/resources/images/countries/mv.png b/src/main/resources/images/countries/mv.png similarity index 100% rename from gui/src/main/resources/images/countries/mv.png rename to src/main/resources/images/countries/mv.png diff --git a/gui/src/main/resources/images/countries/mw.png b/src/main/resources/images/countries/mw.png similarity index 100% rename from gui/src/main/resources/images/countries/mw.png rename to src/main/resources/images/countries/mw.png diff --git a/gui/src/main/resources/images/countries/mx.png b/src/main/resources/images/countries/mx.png similarity index 100% rename from gui/src/main/resources/images/countries/mx.png rename to src/main/resources/images/countries/mx.png diff --git a/gui/src/main/resources/images/countries/my.png b/src/main/resources/images/countries/my.png similarity index 100% rename from gui/src/main/resources/images/countries/my.png rename to src/main/resources/images/countries/my.png diff --git a/gui/src/main/resources/images/countries/mz.png b/src/main/resources/images/countries/mz.png similarity index 100% rename from gui/src/main/resources/images/countries/mz.png rename to src/main/resources/images/countries/mz.png diff --git a/gui/src/main/resources/images/countries/na.png b/src/main/resources/images/countries/na.png similarity index 100% rename from gui/src/main/resources/images/countries/na.png rename to src/main/resources/images/countries/na.png diff --git a/gui/src/main/resources/images/countries/nc.png b/src/main/resources/images/countries/nc.png similarity index 100% rename from gui/src/main/resources/images/countries/nc.png rename to src/main/resources/images/countries/nc.png diff --git a/gui/src/main/resources/images/countries/ne.png b/src/main/resources/images/countries/ne.png similarity index 100% rename from gui/src/main/resources/images/countries/ne.png rename to src/main/resources/images/countries/ne.png diff --git a/gui/src/main/resources/images/countries/nf.png b/src/main/resources/images/countries/nf.png similarity index 100% rename from gui/src/main/resources/images/countries/nf.png rename to src/main/resources/images/countries/nf.png diff --git a/gui/src/main/resources/images/countries/ng.png b/src/main/resources/images/countries/ng.png similarity index 100% rename from gui/src/main/resources/images/countries/ng.png rename to src/main/resources/images/countries/ng.png diff --git a/gui/src/main/resources/images/countries/ni.png b/src/main/resources/images/countries/ni.png similarity index 100% rename from gui/src/main/resources/images/countries/ni.png rename to src/main/resources/images/countries/ni.png diff --git a/gui/src/main/resources/images/countries/nl.png b/src/main/resources/images/countries/nl.png similarity index 100% rename from gui/src/main/resources/images/countries/nl.png rename to src/main/resources/images/countries/nl.png diff --git a/gui/src/main/resources/images/countries/no.png b/src/main/resources/images/countries/no.png similarity index 100% rename from gui/src/main/resources/images/countries/no.png rename to src/main/resources/images/countries/no.png diff --git a/gui/src/main/resources/images/countries/np.png b/src/main/resources/images/countries/np.png similarity index 100% rename from gui/src/main/resources/images/countries/np.png rename to src/main/resources/images/countries/np.png diff --git a/gui/src/main/resources/images/countries/nr.png b/src/main/resources/images/countries/nr.png similarity index 100% rename from gui/src/main/resources/images/countries/nr.png rename to src/main/resources/images/countries/nr.png diff --git a/gui/src/main/resources/images/countries/nu.png b/src/main/resources/images/countries/nu.png similarity index 100% rename from gui/src/main/resources/images/countries/nu.png rename to src/main/resources/images/countries/nu.png diff --git a/gui/src/main/resources/images/countries/nz.png b/src/main/resources/images/countries/nz.png similarity index 100% rename from gui/src/main/resources/images/countries/nz.png rename to src/main/resources/images/countries/nz.png diff --git a/gui/src/main/resources/images/countries/om.png b/src/main/resources/images/countries/om.png similarity index 100% rename from gui/src/main/resources/images/countries/om.png rename to src/main/resources/images/countries/om.png diff --git a/gui/src/main/resources/images/countries/pa.png b/src/main/resources/images/countries/pa.png similarity index 100% rename from gui/src/main/resources/images/countries/pa.png rename to src/main/resources/images/countries/pa.png diff --git a/gui/src/main/resources/images/countries/pe.png b/src/main/resources/images/countries/pe.png similarity index 100% rename from gui/src/main/resources/images/countries/pe.png rename to src/main/resources/images/countries/pe.png diff --git a/gui/src/main/resources/images/countries/pf.png b/src/main/resources/images/countries/pf.png similarity index 100% rename from gui/src/main/resources/images/countries/pf.png rename to src/main/resources/images/countries/pf.png diff --git a/gui/src/main/resources/images/countries/pg.png b/src/main/resources/images/countries/pg.png similarity index 100% rename from gui/src/main/resources/images/countries/pg.png rename to src/main/resources/images/countries/pg.png diff --git a/gui/src/main/resources/images/countries/ph.png b/src/main/resources/images/countries/ph.png similarity index 100% rename from gui/src/main/resources/images/countries/ph.png rename to src/main/resources/images/countries/ph.png diff --git a/gui/src/main/resources/images/countries/pk.png b/src/main/resources/images/countries/pk.png similarity index 100% rename from gui/src/main/resources/images/countries/pk.png rename to src/main/resources/images/countries/pk.png diff --git a/gui/src/main/resources/images/countries/pl.png b/src/main/resources/images/countries/pl.png similarity index 100% rename from gui/src/main/resources/images/countries/pl.png rename to src/main/resources/images/countries/pl.png diff --git a/gui/src/main/resources/images/countries/pm.png b/src/main/resources/images/countries/pm.png similarity index 100% rename from gui/src/main/resources/images/countries/pm.png rename to src/main/resources/images/countries/pm.png diff --git a/gui/src/main/resources/images/countries/pn.png b/src/main/resources/images/countries/pn.png similarity index 100% rename from gui/src/main/resources/images/countries/pn.png rename to src/main/resources/images/countries/pn.png diff --git a/gui/src/main/resources/images/countries/pr.png b/src/main/resources/images/countries/pr.png similarity index 100% rename from gui/src/main/resources/images/countries/pr.png rename to src/main/resources/images/countries/pr.png diff --git a/gui/src/main/resources/images/countries/ps.png b/src/main/resources/images/countries/ps.png similarity index 100% rename from gui/src/main/resources/images/countries/ps.png rename to src/main/resources/images/countries/ps.png diff --git a/gui/src/main/resources/images/countries/pt.png b/src/main/resources/images/countries/pt.png similarity index 100% rename from gui/src/main/resources/images/countries/pt.png rename to src/main/resources/images/countries/pt.png diff --git a/gui/src/main/resources/images/countries/pw.png b/src/main/resources/images/countries/pw.png similarity index 100% rename from gui/src/main/resources/images/countries/pw.png rename to src/main/resources/images/countries/pw.png diff --git a/gui/src/main/resources/images/countries/py.png b/src/main/resources/images/countries/py.png similarity index 100% rename from gui/src/main/resources/images/countries/py.png rename to src/main/resources/images/countries/py.png diff --git a/gui/src/main/resources/images/countries/qa.png b/src/main/resources/images/countries/qa.png similarity index 100% rename from gui/src/main/resources/images/countries/qa.png rename to src/main/resources/images/countries/qa.png diff --git a/gui/src/main/resources/images/countries/re.png b/src/main/resources/images/countries/re.png similarity index 100% rename from gui/src/main/resources/images/countries/re.png rename to src/main/resources/images/countries/re.png diff --git a/gui/src/main/resources/images/countries/ro.png b/src/main/resources/images/countries/ro.png similarity index 100% rename from gui/src/main/resources/images/countries/ro.png rename to src/main/resources/images/countries/ro.png diff --git a/gui/src/main/resources/images/countries/rs.png b/src/main/resources/images/countries/rs.png similarity index 100% rename from gui/src/main/resources/images/countries/rs.png rename to src/main/resources/images/countries/rs.png diff --git a/gui/src/main/resources/images/countries/ru.png b/src/main/resources/images/countries/ru.png similarity index 100% rename from gui/src/main/resources/images/countries/ru.png rename to src/main/resources/images/countries/ru.png diff --git a/gui/src/main/resources/images/countries/rw.png b/src/main/resources/images/countries/rw.png similarity index 100% rename from gui/src/main/resources/images/countries/rw.png rename to src/main/resources/images/countries/rw.png diff --git a/gui/src/main/resources/images/countries/sa.png b/src/main/resources/images/countries/sa.png similarity index 100% rename from gui/src/main/resources/images/countries/sa.png rename to src/main/resources/images/countries/sa.png diff --git a/gui/src/main/resources/images/countries/sb.png b/src/main/resources/images/countries/sb.png similarity index 100% rename from gui/src/main/resources/images/countries/sb.png rename to src/main/resources/images/countries/sb.png diff --git a/gui/src/main/resources/images/countries/sc.png b/src/main/resources/images/countries/sc.png similarity index 100% rename from gui/src/main/resources/images/countries/sc.png rename to src/main/resources/images/countries/sc.png diff --git a/gui/src/main/resources/images/countries/scotland.png b/src/main/resources/images/countries/scotland.png similarity index 100% rename from gui/src/main/resources/images/countries/scotland.png rename to src/main/resources/images/countries/scotland.png diff --git a/gui/src/main/resources/images/countries/sd.png b/src/main/resources/images/countries/sd.png similarity index 100% rename from gui/src/main/resources/images/countries/sd.png rename to src/main/resources/images/countries/sd.png diff --git a/gui/src/main/resources/images/countries/se.png b/src/main/resources/images/countries/se.png similarity index 100% rename from gui/src/main/resources/images/countries/se.png rename to src/main/resources/images/countries/se.png diff --git a/gui/src/main/resources/images/countries/sg.png b/src/main/resources/images/countries/sg.png similarity index 100% rename from gui/src/main/resources/images/countries/sg.png rename to src/main/resources/images/countries/sg.png diff --git a/gui/src/main/resources/images/countries/sh.png b/src/main/resources/images/countries/sh.png similarity index 100% rename from gui/src/main/resources/images/countries/sh.png rename to src/main/resources/images/countries/sh.png diff --git a/gui/src/main/resources/images/countries/si.png b/src/main/resources/images/countries/si.png similarity index 100% rename from gui/src/main/resources/images/countries/si.png rename to src/main/resources/images/countries/si.png diff --git a/gui/src/main/resources/images/countries/sj.png b/src/main/resources/images/countries/sj.png similarity index 100% rename from gui/src/main/resources/images/countries/sj.png rename to src/main/resources/images/countries/sj.png diff --git a/gui/src/main/resources/images/countries/sk.png b/src/main/resources/images/countries/sk.png similarity index 100% rename from gui/src/main/resources/images/countries/sk.png rename to src/main/resources/images/countries/sk.png diff --git a/gui/src/main/resources/images/countries/sl.png b/src/main/resources/images/countries/sl.png similarity index 100% rename from gui/src/main/resources/images/countries/sl.png rename to src/main/resources/images/countries/sl.png diff --git a/gui/src/main/resources/images/countries/sm.png b/src/main/resources/images/countries/sm.png similarity index 100% rename from gui/src/main/resources/images/countries/sm.png rename to src/main/resources/images/countries/sm.png diff --git a/gui/src/main/resources/images/countries/sn.png b/src/main/resources/images/countries/sn.png similarity index 100% rename from gui/src/main/resources/images/countries/sn.png rename to src/main/resources/images/countries/sn.png diff --git a/gui/src/main/resources/images/countries/so.png b/src/main/resources/images/countries/so.png similarity index 100% rename from gui/src/main/resources/images/countries/so.png rename to src/main/resources/images/countries/so.png diff --git a/gui/src/main/resources/images/countries/sr.png b/src/main/resources/images/countries/sr.png similarity index 100% rename from gui/src/main/resources/images/countries/sr.png rename to src/main/resources/images/countries/sr.png diff --git a/gui/src/main/resources/images/countries/st.png b/src/main/resources/images/countries/st.png similarity index 100% rename from gui/src/main/resources/images/countries/st.png rename to src/main/resources/images/countries/st.png diff --git a/gui/src/main/resources/images/countries/sv.png b/src/main/resources/images/countries/sv.png similarity index 100% rename from gui/src/main/resources/images/countries/sv.png rename to src/main/resources/images/countries/sv.png diff --git a/gui/src/main/resources/images/countries/sy.png b/src/main/resources/images/countries/sy.png similarity index 100% rename from gui/src/main/resources/images/countries/sy.png rename to src/main/resources/images/countries/sy.png diff --git a/gui/src/main/resources/images/countries/sz.png b/src/main/resources/images/countries/sz.png similarity index 100% rename from gui/src/main/resources/images/countries/sz.png rename to src/main/resources/images/countries/sz.png diff --git a/gui/src/main/resources/images/countries/tc.png b/src/main/resources/images/countries/tc.png similarity index 100% rename from gui/src/main/resources/images/countries/tc.png rename to src/main/resources/images/countries/tc.png diff --git a/gui/src/main/resources/images/countries/td.png b/src/main/resources/images/countries/td.png similarity index 100% rename from gui/src/main/resources/images/countries/td.png rename to src/main/resources/images/countries/td.png diff --git a/gui/src/main/resources/images/countries/tf.png b/src/main/resources/images/countries/tf.png similarity index 100% rename from gui/src/main/resources/images/countries/tf.png rename to src/main/resources/images/countries/tf.png diff --git a/gui/src/main/resources/images/countries/tg.png b/src/main/resources/images/countries/tg.png similarity index 100% rename from gui/src/main/resources/images/countries/tg.png rename to src/main/resources/images/countries/tg.png diff --git a/gui/src/main/resources/images/countries/th.png b/src/main/resources/images/countries/th.png similarity index 100% rename from gui/src/main/resources/images/countries/th.png rename to src/main/resources/images/countries/th.png diff --git a/gui/src/main/resources/images/countries/tj.png b/src/main/resources/images/countries/tj.png similarity index 100% rename from gui/src/main/resources/images/countries/tj.png rename to src/main/resources/images/countries/tj.png diff --git a/gui/src/main/resources/images/countries/tk.png b/src/main/resources/images/countries/tk.png similarity index 100% rename from gui/src/main/resources/images/countries/tk.png rename to src/main/resources/images/countries/tk.png diff --git a/gui/src/main/resources/images/countries/tl.png b/src/main/resources/images/countries/tl.png similarity index 100% rename from gui/src/main/resources/images/countries/tl.png rename to src/main/resources/images/countries/tl.png diff --git a/gui/src/main/resources/images/countries/tm.png b/src/main/resources/images/countries/tm.png similarity index 100% rename from gui/src/main/resources/images/countries/tm.png rename to src/main/resources/images/countries/tm.png diff --git a/gui/src/main/resources/images/countries/tn.png b/src/main/resources/images/countries/tn.png similarity index 100% rename from gui/src/main/resources/images/countries/tn.png rename to src/main/resources/images/countries/tn.png diff --git a/gui/src/main/resources/images/countries/to.png b/src/main/resources/images/countries/to.png similarity index 100% rename from gui/src/main/resources/images/countries/to.png rename to src/main/resources/images/countries/to.png diff --git a/gui/src/main/resources/images/countries/tr.png b/src/main/resources/images/countries/tr.png similarity index 100% rename from gui/src/main/resources/images/countries/tr.png rename to src/main/resources/images/countries/tr.png diff --git a/gui/src/main/resources/images/countries/tt.png b/src/main/resources/images/countries/tt.png similarity index 100% rename from gui/src/main/resources/images/countries/tt.png rename to src/main/resources/images/countries/tt.png diff --git a/gui/src/main/resources/images/countries/tv.png b/src/main/resources/images/countries/tv.png similarity index 100% rename from gui/src/main/resources/images/countries/tv.png rename to src/main/resources/images/countries/tv.png diff --git a/gui/src/main/resources/images/countries/tw.png b/src/main/resources/images/countries/tw.png similarity index 100% rename from gui/src/main/resources/images/countries/tw.png rename to src/main/resources/images/countries/tw.png diff --git a/gui/src/main/resources/images/countries/tz.png b/src/main/resources/images/countries/tz.png similarity index 100% rename from gui/src/main/resources/images/countries/tz.png rename to src/main/resources/images/countries/tz.png diff --git a/gui/src/main/resources/images/countries/ua.png b/src/main/resources/images/countries/ua.png similarity index 100% rename from gui/src/main/resources/images/countries/ua.png rename to src/main/resources/images/countries/ua.png diff --git a/gui/src/main/resources/images/countries/ug.png b/src/main/resources/images/countries/ug.png similarity index 100% rename from gui/src/main/resources/images/countries/ug.png rename to src/main/resources/images/countries/ug.png diff --git a/gui/src/main/resources/images/countries/uk.png b/src/main/resources/images/countries/uk.png similarity index 100% rename from gui/src/main/resources/images/countries/uk.png rename to src/main/resources/images/countries/uk.png diff --git a/gui/src/main/resources/images/countries/um.png b/src/main/resources/images/countries/um.png similarity index 100% rename from gui/src/main/resources/images/countries/um.png rename to src/main/resources/images/countries/um.png diff --git a/gui/src/main/resources/images/countries/us.png b/src/main/resources/images/countries/us.png similarity index 100% rename from gui/src/main/resources/images/countries/us.png rename to src/main/resources/images/countries/us.png diff --git a/gui/src/main/resources/images/countries/uy.png b/src/main/resources/images/countries/uy.png similarity index 100% rename from gui/src/main/resources/images/countries/uy.png rename to src/main/resources/images/countries/uy.png diff --git a/gui/src/main/resources/images/countries/uz.png b/src/main/resources/images/countries/uz.png similarity index 100% rename from gui/src/main/resources/images/countries/uz.png rename to src/main/resources/images/countries/uz.png diff --git a/gui/src/main/resources/images/countries/va.png b/src/main/resources/images/countries/va.png similarity index 100% rename from gui/src/main/resources/images/countries/va.png rename to src/main/resources/images/countries/va.png diff --git a/gui/src/main/resources/images/countries/vc.png b/src/main/resources/images/countries/vc.png similarity index 100% rename from gui/src/main/resources/images/countries/vc.png rename to src/main/resources/images/countries/vc.png diff --git a/gui/src/main/resources/images/countries/ve.png b/src/main/resources/images/countries/ve.png similarity index 100% rename from gui/src/main/resources/images/countries/ve.png rename to src/main/resources/images/countries/ve.png diff --git a/gui/src/main/resources/images/countries/vg.png b/src/main/resources/images/countries/vg.png similarity index 100% rename from gui/src/main/resources/images/countries/vg.png rename to src/main/resources/images/countries/vg.png diff --git a/gui/src/main/resources/images/countries/vi.png b/src/main/resources/images/countries/vi.png similarity index 100% rename from gui/src/main/resources/images/countries/vi.png rename to src/main/resources/images/countries/vi.png diff --git a/gui/src/main/resources/images/countries/vn.png b/src/main/resources/images/countries/vn.png similarity index 100% rename from gui/src/main/resources/images/countries/vn.png rename to src/main/resources/images/countries/vn.png diff --git a/gui/src/main/resources/images/countries/vu.png b/src/main/resources/images/countries/vu.png similarity index 100% rename from gui/src/main/resources/images/countries/vu.png rename to src/main/resources/images/countries/vu.png diff --git a/gui/src/main/resources/images/countries/wales.png b/src/main/resources/images/countries/wales.png similarity index 100% rename from gui/src/main/resources/images/countries/wales.png rename to src/main/resources/images/countries/wales.png diff --git a/gui/src/main/resources/images/countries/wf.png b/src/main/resources/images/countries/wf.png similarity index 100% rename from gui/src/main/resources/images/countries/wf.png rename to src/main/resources/images/countries/wf.png diff --git a/gui/src/main/resources/images/countries/ws.png b/src/main/resources/images/countries/ws.png similarity index 100% rename from gui/src/main/resources/images/countries/ws.png rename to src/main/resources/images/countries/ws.png diff --git a/gui/src/main/resources/images/countries/ye.png b/src/main/resources/images/countries/ye.png similarity index 100% rename from gui/src/main/resources/images/countries/ye.png rename to src/main/resources/images/countries/ye.png diff --git a/gui/src/main/resources/images/countries/yt.png b/src/main/resources/images/countries/yt.png similarity index 100% rename from gui/src/main/resources/images/countries/yt.png rename to src/main/resources/images/countries/yt.png diff --git a/gui/src/main/resources/images/countries/za.png b/src/main/resources/images/countries/za.png similarity index 100% rename from gui/src/main/resources/images/countries/za.png rename to src/main/resources/images/countries/za.png diff --git a/gui/src/main/resources/images/countries/zm.png b/src/main/resources/images/countries/zm.png similarity index 100% rename from gui/src/main/resources/images/countries/zm.png rename to src/main/resources/images/countries/zm.png diff --git a/gui/src/main/resources/images/countries/zw.png b/src/main/resources/images/countries/zw.png similarity index 100% rename from gui/src/main/resources/images/countries/zw.png rename to src/main/resources/images/countries/zw.png diff --git a/gui/src/main/resources/images/expand.png b/src/main/resources/images/expand.png similarity index 100% rename from gui/src/main/resources/images/expand.png rename to src/main/resources/images/expand.png diff --git a/gui/src/main/resources/images/expand@2x.png b/src/main/resources/images/expand@2x.png similarity index 100% rename from gui/src/main/resources/images/expand@2x.png rename to src/main/resources/images/expand@2x.png diff --git a/gui/src/main/resources/images/green_circle.png b/src/main/resources/images/green_circle.png similarity index 100% rename from gui/src/main/resources/images/green_circle.png rename to src/main/resources/images/green_circle.png diff --git a/gui/src/main/resources/images/green_circle@2x.png b/src/main/resources/images/green_circle@2x.png similarity index 100% rename from gui/src/main/resources/images/green_circle@2x.png rename to src/main/resources/images/green_circle@2x.png diff --git a/gui/src/main/resources/images/info.png b/src/main/resources/images/info.png similarity index 100% rename from gui/src/main/resources/images/info.png rename to src/main/resources/images/info.png diff --git a/gui/src/main/resources/images/info@2x.png b/src/main/resources/images/info@2x.png similarity index 100% rename from gui/src/main/resources/images/info@2x.png rename to src/main/resources/images/info@2x.png diff --git a/gui/src/main/resources/images/invert.png b/src/main/resources/images/invert.png similarity index 100% rename from gui/src/main/resources/images/invert.png rename to src/main/resources/images/invert.png diff --git a/gui/src/main/resources/images/invert@2x.png b/src/main/resources/images/invert@2x.png similarity index 100% rename from gui/src/main/resources/images/invert@2x.png rename to src/main/resources/images/invert@2x.png diff --git a/gui/src/main/resources/images/light_close.png b/src/main/resources/images/light_close.png similarity index 100% rename from gui/src/main/resources/images/light_close.png rename to src/main/resources/images/light_close.png diff --git a/gui/src/main/resources/images/light_close@2x.png b/src/main/resources/images/light_close@2x.png similarity index 100% rename from gui/src/main/resources/images/light_close@2x.png rename to src/main/resources/images/light_close@2x.png diff --git a/gui/src/main/resources/images/link.png b/src/main/resources/images/link.png similarity index 100% rename from gui/src/main/resources/images/link.png rename to src/main/resources/images/link.png diff --git a/gui/src/main/resources/images/link@2x.png b/src/main/resources/images/link@2x.png similarity index 100% rename from gui/src/main/resources/images/link@2x.png rename to src/main/resources/images/link@2x.png diff --git a/gui/src/main/resources/images/logo_splash.png b/src/main/resources/images/logo_splash.png similarity index 100% rename from gui/src/main/resources/images/logo_splash.png rename to src/main/resources/images/logo_splash.png diff --git a/gui/src/main/resources/images/logo_splash@2x.png b/src/main/resources/images/logo_splash@2x.png similarity index 100% rename from gui/src/main/resources/images/logo_splash@2x.png rename to src/main/resources/images/logo_splash@2x.png diff --git a/gui/src/main/resources/images/nav/account.png b/src/main/resources/images/nav/account.png similarity index 100% rename from gui/src/main/resources/images/nav/account.png rename to src/main/resources/images/nav/account.png diff --git a/gui/src/main/resources/images/nav/account@2x.png b/src/main/resources/images/nav/account@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/account@2x.png rename to src/main/resources/images/nav/account@2x.png diff --git a/gui/src/main/resources/images/nav/account_active.png b/src/main/resources/images/nav/account_active.png similarity index 100% rename from gui/src/main/resources/images/nav/account_active.png rename to src/main/resources/images/nav/account_active.png diff --git a/gui/src/main/resources/images/nav/account_active@2x.png b/src/main/resources/images/nav/account_active@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/account_active@2x.png rename to src/main/resources/images/nav/account_active@2x.png diff --git a/gui/src/main/resources/images/nav/buyoffer.png b/src/main/resources/images/nav/buyoffer.png similarity index 100% rename from gui/src/main/resources/images/nav/buyoffer.png rename to src/main/resources/images/nav/buyoffer.png diff --git a/gui/src/main/resources/images/nav/buyoffer@2x.png b/src/main/resources/images/nav/buyoffer@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/buyoffer@2x.png rename to src/main/resources/images/nav/buyoffer@2x.png diff --git a/gui/src/main/resources/images/nav/buyoffer_active.png b/src/main/resources/images/nav/buyoffer_active.png similarity index 100% rename from gui/src/main/resources/images/nav/buyoffer_active.png rename to src/main/resources/images/nav/buyoffer_active.png diff --git a/gui/src/main/resources/images/nav/buyoffer_active@2x.png b/src/main/resources/images/nav/buyoffer_active@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/buyoffer_active@2x.png rename to src/main/resources/images/nav/buyoffer_active@2x.png diff --git a/gui/src/main/resources/images/nav/dao.png b/src/main/resources/images/nav/dao.png similarity index 100% rename from gui/src/main/resources/images/nav/dao.png rename to src/main/resources/images/nav/dao.png diff --git a/gui/src/main/resources/images/nav/dao@2x.png b/src/main/resources/images/nav/dao@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/dao@2x.png rename to src/main/resources/images/nav/dao@2x.png diff --git a/gui/src/main/resources/images/nav/dao_active.png b/src/main/resources/images/nav/dao_active.png similarity index 100% rename from gui/src/main/resources/images/nav/dao_active.png rename to src/main/resources/images/nav/dao_active.png diff --git a/gui/src/main/resources/images/nav/dao_active@2x.png b/src/main/resources/images/nav/dao_active@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/dao_active@2x.png rename to src/main/resources/images/nav/dao_active@2x.png diff --git a/gui/src/main/resources/images/nav/disputes.png b/src/main/resources/images/nav/disputes.png similarity index 100% rename from gui/src/main/resources/images/nav/disputes.png rename to src/main/resources/images/nav/disputes.png diff --git a/gui/src/main/resources/images/nav/disputes@2x.png b/src/main/resources/images/nav/disputes@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/disputes@2x.png rename to src/main/resources/images/nav/disputes@2x.png diff --git a/gui/src/main/resources/images/nav/disputes_active.png b/src/main/resources/images/nav/disputes_active.png similarity index 100% rename from gui/src/main/resources/images/nav/disputes_active.png rename to src/main/resources/images/nav/disputes_active.png diff --git a/gui/src/main/resources/images/nav/disputes_active@2x.png b/src/main/resources/images/nav/disputes_active@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/disputes_active@2x.png rename to src/main/resources/images/nav/disputes_active@2x.png diff --git a/gui/src/main/resources/images/nav/funds.png b/src/main/resources/images/nav/funds.png similarity index 100% rename from gui/src/main/resources/images/nav/funds.png rename to src/main/resources/images/nav/funds.png diff --git a/gui/src/main/resources/images/nav/funds@2x.png b/src/main/resources/images/nav/funds@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/funds@2x.png rename to src/main/resources/images/nav/funds@2x.png diff --git a/gui/src/main/resources/images/nav/funds_active.png b/src/main/resources/images/nav/funds_active.png similarity index 100% rename from gui/src/main/resources/images/nav/funds_active.png rename to src/main/resources/images/nav/funds_active.png diff --git a/gui/src/main/resources/images/nav/funds_active@2x.png b/src/main/resources/images/nav/funds_active@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/funds_active@2x.png rename to src/main/resources/images/nav/funds_active@2x.png diff --git a/gui/src/main/resources/images/nav/market.png b/src/main/resources/images/nav/market.png similarity index 100% rename from gui/src/main/resources/images/nav/market.png rename to src/main/resources/images/nav/market.png diff --git a/gui/src/main/resources/images/nav/market@2x.png b/src/main/resources/images/nav/market@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/market@2x.png rename to src/main/resources/images/nav/market@2x.png diff --git a/gui/src/main/resources/images/nav/market_active.png b/src/main/resources/images/nav/market_active.png similarity index 100% rename from gui/src/main/resources/images/nav/market_active.png rename to src/main/resources/images/nav/market_active.png diff --git a/gui/src/main/resources/images/nav/market_active@2x.png b/src/main/resources/images/nav/market_active@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/market_active@2x.png rename to src/main/resources/images/nav/market_active@2x.png diff --git a/gui/src/main/resources/images/nav/portfolio.png b/src/main/resources/images/nav/portfolio.png similarity index 100% rename from gui/src/main/resources/images/nav/portfolio.png rename to src/main/resources/images/nav/portfolio.png diff --git a/gui/src/main/resources/images/nav/portfolio@2x.png b/src/main/resources/images/nav/portfolio@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/portfolio@2x.png rename to src/main/resources/images/nav/portfolio@2x.png diff --git a/gui/src/main/resources/images/nav/portfolio_active.png b/src/main/resources/images/nav/portfolio_active.png similarity index 100% rename from gui/src/main/resources/images/nav/portfolio_active.png rename to src/main/resources/images/nav/portfolio_active.png diff --git a/gui/src/main/resources/images/nav/portfolio_active@2x.png b/src/main/resources/images/nav/portfolio_active@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/portfolio_active@2x.png rename to src/main/resources/images/nav/portfolio_active@2x.png diff --git a/gui/src/main/resources/images/nav/selloffer.png b/src/main/resources/images/nav/selloffer.png similarity index 100% rename from gui/src/main/resources/images/nav/selloffer.png rename to src/main/resources/images/nav/selloffer.png diff --git a/gui/src/main/resources/images/nav/selloffer@2x.png b/src/main/resources/images/nav/selloffer@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/selloffer@2x.png rename to src/main/resources/images/nav/selloffer@2x.png diff --git a/gui/src/main/resources/images/nav/selloffer_active.png b/src/main/resources/images/nav/selloffer_active.png similarity index 100% rename from gui/src/main/resources/images/nav/selloffer_active.png rename to src/main/resources/images/nav/selloffer_active.png diff --git a/gui/src/main/resources/images/nav/selloffer_active@2x.png b/src/main/resources/images/nav/selloffer_active@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/selloffer_active@2x.png rename to src/main/resources/images/nav/selloffer_active@2x.png diff --git a/gui/src/main/resources/images/nav/settings.png b/src/main/resources/images/nav/settings.png similarity index 100% rename from gui/src/main/resources/images/nav/settings.png rename to src/main/resources/images/nav/settings.png diff --git a/gui/src/main/resources/images/nav/settings@2x.png b/src/main/resources/images/nav/settings@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/settings@2x.png rename to src/main/resources/images/nav/settings@2x.png diff --git a/gui/src/main/resources/images/nav/settings_active.png b/src/main/resources/images/nav/settings_active.png similarity index 100% rename from gui/src/main/resources/images/nav/settings_active.png rename to src/main/resources/images/nav/settings_active.png diff --git a/gui/src/main/resources/images/nav/settings_active@2x.png b/src/main/resources/images/nav/settings_active@2x.png similarity index 100% rename from gui/src/main/resources/images/nav/settings_active@2x.png rename to src/main/resources/images/nav/settings_active@2x.png diff --git a/gui/src/main/resources/images/offer/offer_state_available.png b/src/main/resources/images/offer/offer_state_available.png similarity index 100% rename from gui/src/main/resources/images/offer/offer_state_available.png rename to src/main/resources/images/offer/offer_state_available.png diff --git a/gui/src/main/resources/images/offer/offer_state_available@2x.png b/src/main/resources/images/offer/offer_state_available@2x.png similarity index 100% rename from gui/src/main/resources/images/offer/offer_state_available@2x.png rename to src/main/resources/images/offer/offer_state_available@2x.png diff --git a/gui/src/main/resources/images/offer/offer_state_not_available.png b/src/main/resources/images/offer/offer_state_not_available.png similarity index 100% rename from gui/src/main/resources/images/offer/offer_state_not_available.png rename to src/main/resources/images/offer/offer_state_not_available.png diff --git a/gui/src/main/resources/images/offer/offer_state_not_available@2x.png b/src/main/resources/images/offer/offer_state_not_available@2x.png similarity index 100% rename from gui/src/main/resources/images/offer/offer_state_not_available@2x.png rename to src/main/resources/images/offer/offer_state_not_available@2x.png diff --git a/gui/src/main/resources/images/offer/offer_state_unknown.png b/src/main/resources/images/offer/offer_state_unknown.png similarity index 100% rename from gui/src/main/resources/images/offer/offer_state_unknown.png rename to src/main/resources/images/offer/offer_state_unknown.png diff --git a/gui/src/main/resources/images/offer/offer_state_unknown@2x.png b/src/main/resources/images/offer/offer_state_unknown@2x.png similarity index 100% rename from gui/src/main/resources/images/offer/offer_state_unknown@2x.png rename to src/main/resources/images/offer/offer_state_unknown@2x.png diff --git a/gui/src/main/resources/images/poloniex.png b/src/main/resources/images/poloniex.png similarity index 100% rename from gui/src/main/resources/images/poloniex.png rename to src/main/resources/images/poloniex.png diff --git a/gui/src/main/resources/images/poloniex@2x.png b/src/main/resources/images/poloniex@2x.png similarity index 100% rename from gui/src/main/resources/images/poloniex@2x.png rename to src/main/resources/images/poloniex@2x.png diff --git a/gui/src/main/resources/images/remove.png b/src/main/resources/images/remove.png similarity index 100% rename from gui/src/main/resources/images/remove.png rename to src/main/resources/images/remove.png diff --git a/gui/src/main/resources/images/remove@2x.png b/src/main/resources/images/remove@2x.png similarity index 100% rename from gui/src/main/resources/images/remove@2x.png rename to src/main/resources/images/remove@2x.png diff --git a/gui/src/main/resources/images/sell.png b/src/main/resources/images/sell.png similarity index 100% rename from gui/src/main/resources/images/sell.png rename to src/main/resources/images/sell.png diff --git a/gui/src/main/resources/images/sell@2x.png b/src/main/resources/images/sell@2x.png similarity index 100% rename from gui/src/main/resources/images/sell@2x.png rename to src/main/resources/images/sell@2x.png diff --git a/gui/src/main/resources/images/sell_large.png b/src/main/resources/images/sell_large.png similarity index 100% rename from gui/src/main/resources/images/sell_large.png rename to src/main/resources/images/sell_large.png diff --git a/gui/src/main/resources/images/sell_large@2x.png b/src/main/resources/images/sell_large@2x.png similarity index 100% rename from gui/src/main/resources/images/sell_large@2x.png rename to src/main/resources/images/sell_large@2x.png diff --git a/gui/src/main/resources/images/sell_white.png b/src/main/resources/images/sell_white.png similarity index 100% rename from gui/src/main/resources/images/sell_white.png rename to src/main/resources/images/sell_white.png diff --git a/gui/src/main/resources/images/sell_white@2x.png b/src/main/resources/images/sell_white@2x.png similarity index 100% rename from gui/src/main/resources/images/sell_white@2x.png rename to src/main/resources/images/sell_white@2x.png diff --git a/gui/src/main/resources/images/spinner.png b/src/main/resources/images/spinner.png similarity index 100% rename from gui/src/main/resources/images/spinner.png rename to src/main/resources/images/spinner.png diff --git a/gui/src/main/resources/images/spinner@2x.png b/src/main/resources/images/spinner@2x.png similarity index 100% rename from gui/src/main/resources/images/spinner@2x.png rename to src/main/resources/images/spinner@2x.png diff --git a/gui/src/main/resources/images/system_tray_icon.png b/src/main/resources/images/system_tray_icon.png similarity index 100% rename from gui/src/main/resources/images/system_tray_icon.png rename to src/main/resources/images/system_tray_icon.png diff --git a/gui/src/main/resources/images/system_tray_icon@2x.png b/src/main/resources/images/system_tray_icon@2x.png similarity index 100% rename from gui/src/main/resources/images/system_tray_icon@2x.png rename to src/main/resources/images/system_tray_icon@2x.png diff --git a/gui/src/main/resources/images/system_tray_icon_linux.png b/src/main/resources/images/system_tray_icon_linux.png similarity index 100% rename from gui/src/main/resources/images/system_tray_icon_linux.png rename to src/main/resources/images/system_tray_icon_linux.png diff --git a/gui/src/main/resources/images/system_tray_icon_windows.png b/src/main/resources/images/system_tray_icon_windows.png similarity index 100% rename from gui/src/main/resources/images/system_tray_icon_windows.png rename to src/main/resources/images/system_tray_icon_windows.png diff --git a/gui/src/main/resources/images/task_bar_icon_linux.png b/src/main/resources/images/task_bar_icon_linux.png similarity index 100% rename from gui/src/main/resources/images/task_bar_icon_linux.png rename to src/main/resources/images/task_bar_icon_linux.png diff --git a/gui/src/main/resources/images/task_bar_icon_windows.png b/src/main/resources/images/task_bar_icon_windows.png similarity index 100% rename from gui/src/main/resources/images/task_bar_icon_windows.png rename to src/main/resources/images/task_bar_icon_windows.png diff --git a/gui/src/main/resources/images/tick.png b/src/main/resources/images/tick.png similarity index 100% rename from gui/src/main/resources/images/tick.png rename to src/main/resources/images/tick.png diff --git a/gui/src/main/resources/images/tick@2x.png b/src/main/resources/images/tick@2x.png similarity index 100% rename from gui/src/main/resources/images/tick@2x.png rename to src/main/resources/images/tick@2x.png diff --git a/gui/src/main/resources/images/update/update_available.png b/src/main/resources/images/update/update_available.png similarity index 100% rename from gui/src/main/resources/images/update/update_available.png rename to src/main/resources/images/update/update_available.png diff --git a/gui/src/main/resources/images/update/update_available@2x.png b/src/main/resources/images/update/update_available@2x.png similarity index 100% rename from gui/src/main/resources/images/update/update_available@2x.png rename to src/main/resources/images/update/update_available@2x.png diff --git a/gui/src/main/resources/images/update/update_failed.png b/src/main/resources/images/update/update_failed.png similarity index 100% rename from gui/src/main/resources/images/update/update_failed.png rename to src/main/resources/images/update/update_failed.png diff --git a/gui/src/main/resources/images/update/update_failed@2x.png b/src/main/resources/images/update/update_failed@2x.png similarity index 100% rename from gui/src/main/resources/images/update/update_failed@2x.png rename to src/main/resources/images/update/update_failed@2x.png diff --git a/gui/src/main/resources/images/update/update_in_progress.png b/src/main/resources/images/update/update_in_progress.png similarity index 100% rename from gui/src/main/resources/images/update/update_in_progress.png rename to src/main/resources/images/update/update_in_progress.png diff --git a/gui/src/main/resources/images/update/update_in_progress@2x.png b/src/main/resources/images/update/update_in_progress@2x.png similarity index 100% rename from gui/src/main/resources/images/update/update_in_progress@2x.png rename to src/main/resources/images/update/update_in_progress@2x.png diff --git a/gui/src/main/resources/images/update/update_up_to_date.png b/src/main/resources/images/update/update_up_to_date.png similarity index 100% rename from gui/src/main/resources/images/update/update_up_to_date.png rename to src/main/resources/images/update/update_up_to_date.png diff --git a/gui/src/main/resources/images/update/update_up_to_date@2x.png b/src/main/resources/images/update/update_up_to_date@2x.png similarity index 100% rename from gui/src/main/resources/images/update/update_up_to_date@2x.png rename to src/main/resources/images/update/update_up_to_date@2x.png diff --git a/gui/src/main/resources/images/window_icon.png b/src/main/resources/images/window_icon.png similarity index 100% rename from gui/src/main/resources/images/window_icon.png rename to src/main/resources/images/window_icon.png diff --git a/gui/src/main/resources/images/window_icon@2x.png b/src/main/resources/images/window_icon@2x.png similarity index 100% rename from gui/src/main/resources/images/window_icon@2x.png rename to src/main/resources/images/window_icon@2x.png diff --git a/gui/src/main/resources/keys/29CDFD3B.asc b/src/main/resources/keys/29CDFD3B.asc similarity index 100% rename from gui/src/main/resources/keys/29CDFD3B.asc rename to src/main/resources/keys/29CDFD3B.asc diff --git a/gui/src/main/resources/keys/5BC5ED73.asc b/src/main/resources/keys/5BC5ED73.asc similarity index 100% rename from gui/src/main/resources/keys/5BC5ED73.asc rename to src/main/resources/keys/5BC5ED73.asc diff --git a/gui/src/main/resources/keys/F379A1C6.asc b/src/main/resources/keys/F379A1C6.asc similarity index 100% rename from gui/src/main/resources/keys/F379A1C6.asc rename to src/main/resources/keys/F379A1C6.asc diff --git a/gui/src/main/resources/logback.xml b/src/main/resources/logback.xml similarity index 100% rename from gui/src/main/resources/logback.xml rename to src/main/resources/logback.xml diff --git a/gui/src/test/java/io/bisq/common/locale/TradeCurrencyMakers.java b/src/test/java/io/bisq/common/locale/TradeCurrencyMakers.java similarity index 100% rename from gui/src/test/java/io/bisq/common/locale/TradeCurrencyMakers.java rename to src/test/java/io/bisq/common/locale/TradeCurrencyMakers.java diff --git a/gui/src/test/java/io/bisq/common/monetary/PriceMaker.java b/src/test/java/io/bisq/common/monetary/PriceMaker.java similarity index 100% rename from gui/src/test/java/io/bisq/common/monetary/PriceMaker.java rename to src/test/java/io/bisq/common/monetary/PriceMaker.java diff --git a/gui/src/test/java/io/bisq/common/monetary/VolumeMaker.java b/src/test/java/io/bisq/common/monetary/VolumeMaker.java similarity index 100% rename from gui/src/test/java/io/bisq/common/monetary/VolumeMaker.java rename to src/test/java/io/bisq/common/monetary/VolumeMaker.java diff --git a/gui/src/test/java/io/bisq/core/offer/OfferMaker.java b/src/test/java/io/bisq/core/offer/OfferMaker.java similarity index 100% rename from gui/src/test/java/io/bisq/core/offer/OfferMaker.java rename to src/test/java/io/bisq/core/offer/OfferMaker.java diff --git a/gui/src/test/java/io/bisq/core/user/PreferenceMakers.java b/src/test/java/io/bisq/core/user/PreferenceMakers.java similarity index 100% rename from gui/src/test/java/io/bisq/core/user/PreferenceMakers.java rename to src/test/java/io/bisq/core/user/PreferenceMakers.java diff --git a/gui/src/test/java/io/bisq/gui/AwesomeFontDemo.java b/src/test/java/io/bisq/gui/AwesomeFontDemo.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/AwesomeFontDemo.java rename to src/test/java/io/bisq/gui/AwesomeFontDemo.java diff --git a/gui/src/test/java/io/bisq/gui/BindingTest.java b/src/test/java/io/bisq/gui/BindingTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/BindingTest.java rename to src/test/java/io/bisq/gui/BindingTest.java diff --git a/gui/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$Malformed.fxml b/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$Malformed.fxml similarity index 100% rename from gui/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$Malformed.fxml rename to src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$Malformed.fxml diff --git a/gui/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml b/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml similarity index 100% rename from gui/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml rename to src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml diff --git a/gui/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml b/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml similarity index 100% rename from gui/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml rename to src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml diff --git a/gui/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$WellFormed.fxml b/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$WellFormed.fxml similarity index 100% rename from gui/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$WellFormed.fxml rename to src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests$WellFormed.fxml diff --git a/gui/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests.java b/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests.java rename to src/test/java/io/bisq/gui/common/fxml/FxmlViewLoaderTests.java diff --git a/gui/src/test/java/io/bisq/gui/common/support/CachingViewLoaderTests.java b/src/test/java/io/bisq/gui/common/support/CachingViewLoaderTests.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/common/support/CachingViewLoaderTests.java rename to src/test/java/io/bisq/gui/common/support/CachingViewLoaderTests.java diff --git a/gui/src/test/java/io/bisq/gui/components/ColoredDecimalPlacesWithZerosTextTest.java b/src/test/java/io/bisq/gui/components/ColoredDecimalPlacesWithZerosTextTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/components/ColoredDecimalPlacesWithZerosTextTest.java rename to src/test/java/io/bisq/gui/components/ColoredDecimalPlacesWithZerosTextTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsTest.java b/src/test/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsTest.java rename to src/test/java/io/bisq/gui/main/funds/transactions/DisplayedTransactionsTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/funds/transactions/ObservableListDecoratorTest.java b/src/test/java/io/bisq/gui/main/funds/transactions/ObservableListDecoratorTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/funds/transactions/ObservableListDecoratorTest.java rename to src/test/java/io/bisq/gui/main/funds/transactions/ObservableListDecoratorTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactoryTest.java b/src/test/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactoryTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactoryTest.java rename to src/test/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradableFactoryTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradeTest.java b/src/test/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradeTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradeTest.java rename to src/test/java/io/bisq/gui/main/funds/transactions/TransactionAwareTradeTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModelTest.java b/src/test/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModelTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModelTest.java rename to src/test/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModelTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/market/spread/SpreadViewModelTest.java b/src/test/java/io/bisq/gui/main/market/spread/SpreadViewModelTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/market/spread/SpreadViewModelTest.java rename to src/test/java/io/bisq/gui/main/market/spread/SpreadViewModelTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java b/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java rename to src/test/java/io/bisq/gui/main/market/trades/TradesChartsViewModelTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModelTest.java b/src/test/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModelTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModelTest.java rename to src/test/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModelTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookListItemMaker.java b/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookListItemMaker.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookListItemMaker.java rename to src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookListItemMaker.java diff --git a/gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java b/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java rename to src/test/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModelTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/overlays/windows/downloadupdate/BisqInstallerTest.java b/src/test/java/io/bisq/gui/main/overlays/windows/downloadupdate/BisqInstallerTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/overlays/windows/downloadupdate/BisqInstallerTest.java rename to src/test/java/io/bisq/gui/main/overlays/windows/downloadupdate/BisqInstallerTest.java diff --git a/gui/src/test/java/io/bisq/gui/main/overlays/windows/downloadupdate/VerifyTaskTest.java b/src/test/java/io/bisq/gui/main/overlays/windows/downloadupdate/VerifyTaskTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/main/overlays/windows/downloadupdate/VerifyTaskTest.java rename to src/test/java/io/bisq/gui/main/overlays/windows/downloadupdate/VerifyTaskTest.java diff --git a/gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java b/src/test/java/io/bisq/gui/util/BSFormatterTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java rename to src/test/java/io/bisq/gui/util/BSFormatterTest.java diff --git a/gui/src/test/java/io/bisq/gui/util/CurrencyListItemMakers.java b/src/test/java/io/bisq/gui/util/CurrencyListItemMakers.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/util/CurrencyListItemMakers.java rename to src/test/java/io/bisq/gui/util/CurrencyListItemMakers.java diff --git a/gui/src/test/java/io/bisq/gui/util/CurrencyListTest.java b/src/test/java/io/bisq/gui/util/CurrencyListTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/util/CurrencyListTest.java rename to src/test/java/io/bisq/gui/util/CurrencyListTest.java diff --git a/gui/src/test/java/io/bisq/gui/util/GUIUtilTest.java b/src/test/java/io/bisq/gui/util/GUIUtilTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/util/GUIUtilTest.java rename to src/test/java/io/bisq/gui/util/GUIUtilTest.java diff --git a/gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java b/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java rename to src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java diff --git a/gui/src/test/java/io/bisq/gui/util/validation/BtcValidatorTest.java b/src/test/java/io/bisq/gui/util/validation/BtcValidatorTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/util/validation/BtcValidatorTest.java rename to src/test/java/io/bisq/gui/util/validation/BtcValidatorTest.java diff --git a/gui/src/test/java/io/bisq/gui/util/validation/FiatVolumeValidatorTest.java b/src/test/java/io/bisq/gui/util/validation/FiatVolumeValidatorTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/util/validation/FiatVolumeValidatorTest.java rename to src/test/java/io/bisq/gui/util/validation/FiatVolumeValidatorTest.java diff --git a/gui/src/test/java/io/bisq/gui/util/validation/InteracETransferValidatorTest.java b/src/test/java/io/bisq/gui/util/validation/InteracETransferValidatorTest.java similarity index 100% rename from gui/src/test/java/io/bisq/gui/util/validation/InteracETransferValidatorTest.java rename to src/test/java/io/bisq/gui/util/validation/InteracETransferValidatorTest.java diff --git a/gui/src/test/java/org/bitcoinj/core/CoinMaker.java b/src/test/java/org/bitcoinj/core/CoinMaker.java similarity index 100% rename from gui/src/test/java/org/bitcoinj/core/CoinMaker.java rename to src/test/java/org/bitcoinj/core/CoinMaker.java diff --git a/gui/src/test/resources/downloadUpdate/F379A1C6.asc b/src/test/resources/downloadUpdate/F379A1C6.asc similarity index 100% rename from gui/src/test/resources/downloadUpdate/F379A1C6.asc rename to src/test/resources/downloadUpdate/F379A1C6.asc diff --git a/gui/src/test/resources/downloadUpdate/test.txt b/src/test/resources/downloadUpdate/test.txt similarity index 100% rename from gui/src/test/resources/downloadUpdate/test.txt rename to src/test/resources/downloadUpdate/test.txt diff --git a/gui/src/test/resources/downloadUpdate/test.txt.asc b/src/test/resources/downloadUpdate/test.txt.asc similarity index 100% rename from gui/src/test/resources/downloadUpdate/test.txt.asc rename to src/test/resources/downloadUpdate/test.txt.asc diff --git a/gui/src/test/resources/downloadUpdate/test_bad.txt b/src/test/resources/downloadUpdate/test_bad.txt similarity index 100% rename from gui/src/test/resources/downloadUpdate/test_bad.txt rename to src/test/resources/downloadUpdate/test_bad.txt diff --git a/gui/src/test/resources/downloadUpdate/test_bad.txt.asc b/src/test/resources/downloadUpdate/test_bad.txt.asc similarity index 100% rename from gui/src/test/resources/downloadUpdate/test_bad.txt.asc rename to src/test/resources/downloadUpdate/test_bad.txt.asc