Change package structure

src/main/java/io/bitsquare/gui/CachedCodeBehind.java

@@ -1,6 +1,4 @@
-package io.bitsquare.gui.view;
+package io.bitsquare.gui;
-
-import io.bitsquare.gui.pm.PresentationModel;
 
 import java.net.URL;
 

src/main/java/io/bitsquare/gui/CodeBehind.java

@@ -1,7 +1,4 @@
-package io.bitsquare.gui.view;
+package io.bitsquare.gui;
-
-import io.bitsquare.gui.NavigationItem;
-import io.bitsquare.gui.pm.PresentationModel;
 
 import java.net.URL;
 

src/main/java/io/bitsquare/gui/NavigationItem.java

@@ -25,21 +25,21 @@ public enum NavigationItem {
     // Application
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    MAIN(0, "/io/bitsquare/gui/view/MainView.fxml"),
+    MAIN(0, "/io/bitsquare/gui/main/MainView.fxml"),
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Main menu screens
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    HOME(1, "/io/bitsquare/gui/home/HomeView.fxml", ImageUtil.HOME, ImageUtil.HOME_ACTIVE),
+    HOME(1, "/io/bitsquare/gui/main/home/HomeView.fxml", ImageUtil.HOME, ImageUtil.HOME_ACTIVE),
-    BUY(1, "/io/bitsquare/gui/trade/BuyView.fxml", ImageUtil.NAV_BUY, ImageUtil.NAV_BUY_ACTIVE),
+    BUY(1, "/io/bitsquare/gui/main/trade/BuyView.fxml", ImageUtil.NAV_BUY, ImageUtil.NAV_BUY_ACTIVE),
-    SELL(1, "/io/bitsquare/gui/trade/SellView.fxml", ImageUtil.NAV_SELL, ImageUtil.NAV_SELL_ACTIVE),
+    SELL(1, "/io/bitsquare/gui/main/trade/SellView.fxml", ImageUtil.NAV_SELL, ImageUtil.NAV_SELL_ACTIVE),
-    ORDERS(1, "/io/bitsquare/gui/orders/OrdersView.fxml", ImageUtil.ORDERS, ImageUtil.ORDERS_ACTIVE),
+    ORDERS(1, "/io/bitsquare/gui/main/orders/OrdersView.fxml", ImageUtil.ORDERS, ImageUtil.ORDERS_ACTIVE),
-    FUNDS(1, "/io/bitsquare/gui/funds/FundsView.fxml", ImageUtil.FUNDS, ImageUtil.FUNDS_ACTIVE),
+    FUNDS(1, "/io/bitsquare/gui/main/funds/FundsView.fxml", ImageUtil.FUNDS, ImageUtil.FUNDS_ACTIVE),
-    MSG(1, "/io/bitsquare/gui/msg/MsgView.fxml", ImageUtil.MSG, ImageUtil.MSG_ACTIVE),
+    MSG(1, "/io/bitsquare/gui/main/msg/MsgView.fxml", ImageUtil.MSG, ImageUtil.MSG_ACTIVE),
-    SETTINGS(1, "/io/bitsquare/gui/settings/SettingsView.fxml", ImageUtil.SETTINGS, ImageUtil.SETTINGS_ACTIVE),
+    SETTINGS(1, "/io/bitsquare/gui/main/settings/SettingsView.fxml", ImageUtil.SETTINGS, ImageUtil.SETTINGS_ACTIVE),
-    ACCOUNT(1, "/io/bitsquare/gui/view/AccountView.fxml", ImageUtil.ACCOUNT, ImageUtil.ACCOUNT_ACTIVE),
+    ACCOUNT(1, "/io/bitsquare/gui/main/account/AccountView.fxml", ImageUtil.ACCOUNT, ImageUtil.ACCOUNT_ACTIVE),
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -47,23 +47,23 @@ public enum NavigationItem {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     // buy/sell (trade)
-    ORDER_BOOK(2, "/io/bitsquare/gui/trade/orderbook/OrderBookView.fxml"),
+    ORDER_BOOK(2, "/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml"),
-    CREATE_OFFER(2, "/io/bitsquare/gui/view/trade/CreateOfferView.fxml"),
+    CREATE_OFFER(2, "/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml"),
-    TAKE_OFFER(2, "/io/bitsquare/gui/trade/takeoffer/TakeOfferView.fxml"),
+    TAKE_OFFER(2, "/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml"),
 
     // orders
-    OFFER(2, "/io/bitsquare/gui/orders/offer/OfferView.fxml"),
+    OFFER(2, "/io/bitsquare/gui/main/orders/offer/OfferView.fxml"),
-    PENDING_TRADE(2, "/io/bitsquare/gui/orders/pending/PendingTradeView.fxml"),
+    PENDING_TRADE(2, "/io/bitsquare/gui/main/orders/pending/PendingTradeView.fxml"),
-    CLOSED_TRADE(2, "/io/bitsquare/gui/orders/closed/ClosedTradeView.fxml"),
+    CLOSED_TRADE(2, "/io/bitsquare/gui/main/orders/closed/ClosedTradeView.fxml"),
 
     // funds
-    DEPOSIT(2, "/io/bitsquare/gui/funds/deposit/DepositView.fxml"),
+    DEPOSIT(2, "/io/bitsquare/gui/main/funds/deposit/DepositView.fxml"),
-    WITHDRAWAL(2, "/io/bitsquare/gui/funds/withdrawal/WithdrawalView.fxml"),
+    WITHDRAWAL(2, "/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml"),
-    TRANSACTIONS(2, "/io/bitsquare/gui/funds/transactions/TransactionsView.fxml"),
+    TRANSACTIONS(2, "/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml"),
 
     // account
-    ACCOUNT_SETUP(2, "/io/bitsquare/gui/view/account/AccountSetupView.fxml"),
+    ACCOUNT_SETUP(2, "/io/bitsquare/gui/main/account/AccountSetupView.fxml"),
-    ACCOUNT_SETTINGS(2, "/io/bitsquare/gui/view/account/AccountSettingsView.fxml"),
+    ACCOUNT_SETTINGS(2, "/io/bitsquare/gui/main/account/AccountSettingsView.fxml"),
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -71,12 +71,12 @@ public enum NavigationItem {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     // account content
-    SEED_WORDS(3, "/io/bitsquare/gui/view/account/content/SeedWordsView.fxml"),
+    SEED_WORDS(3, "/io/bitsquare/gui/main/account/content/SeedWordsView.fxml"),
-    ADD_PASSWORD(3, "/io/bitsquare/gui/view/account/content/PasswordView.fxml"),
+    ADD_PASSWORD(3, "/io/bitsquare/gui/main/account/content/PasswordView.fxml"),
-    CHANGE_PASSWORD(3, "/io/bitsquare/gui/view/account/content/PasswordView.fxml"),
+    CHANGE_PASSWORD(3, "/io/bitsquare/gui/main/account/content/PasswordView.fxml"),
-    RESTRICTIONS(3, "/io/bitsquare/gui/view/account/content/RestrictionsView.fxml"),
+    RESTRICTIONS(3, "/io/bitsquare/gui/main/account/content/RestrictionsView.fxml"),
-    REGISTRATION(3, "/io/bitsquare/gui/view/account/content/RegistrationView.fxml"),
+    REGISTRATION(3, "/io/bitsquare/gui/main/account/content/RegistrationView.fxml"),
-    FIAT_ACCOUNT(3, "/io/bitsquare/gui/view/account/content/FiatAccountView.fxml"),
+    FIAT_ACCOUNT(3, "/io/bitsquare/gui/main/account/content/FiatAccountView.fxml"),
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -84,9 +84,9 @@ public enum NavigationItem {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     // arbitrator
-    ARBITRATOR_PROFILE(2, "/io/bitsquare/gui/arbitrators/profile/ArbitratorProfileView.fxml"),
+    ARBITRATOR_PROFILE(2, "/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml"),
-    ARBITRATOR_BROWSER(-1, "/io/bitsquare/gui/arbitrators/browser/ArbitratorBrowserView.fxml"),
+    ARBITRATOR_BROWSER(-1, "/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml"),
-    ARBITRATOR_REGISTRATION(-1, "/io/bitsquare/gui/arbitrators/registration/ArbitratorRegistrationView.fxml");
+    ARBITRATOR_REGISTRATION(-1, "/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml");
 
 
     private int level;

src/main/java/io/bitsquare/gui/PresentationModel.java

@@ -1,6 +1,4 @@
-package io.bitsquare.gui.pm;
+package io.bitsquare.gui;
-
-import io.bitsquare.gui.model.UIModel;
 
 public class PresentationModel<T extends UIModel> {
 

src/main/java/io/bitsquare/gui/UIModel.java

@@ -1,4 +1,4 @@
-package io.bitsquare.gui.model;
+package io.bitsquare.gui;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/io/bitsquare/gui/ViewController.java

@@ -17,8 +17,6 @@
 
 package io.bitsquare.gui;
 
-import io.bitsquare.gui.view.CodeBehind;
-
 import java.net.URL;
 
 import java.util.ResourceBundle;

src/main/java/io/bitsquare/gui/main/MainModel.java

@@ -15,12 +15,13 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model;
+package io.bitsquare.gui.main;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.gui.NavigationItem;
+import io.bitsquare.gui.UIModel;
 import io.bitsquare.gui.util.Profiler;
 import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.msg.listeners.BootstrapListener;

src/main/java/io/bitsquare/gui/main/MainPM.java

@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm;
+package io.bitsquare.gui.main;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.gui.NavigationItem;
-import io.bitsquare.gui.model.MainModel;
+import io.bitsquare.gui.PresentationModel;
 import io.bitsquare.gui.util.BSFormatter;
 
 import com.google.inject.Inject;

src/main/java/io/bitsquare/gui/main/MainView.fxml

@@ -17,7 +17,7 @@
   -->
 
 <?import javafx.scene.layout.*?>
-<StackPane fx:id="root" fx:controller="io.bitsquare.gui.view.MainViewCB"
+<StackPane fx:id="root" fx:controller="io.bitsquare.gui.main.MainViewCB"
            prefHeight="750" prefWidth="1000" stylesheets="/io/bitsquare/gui/bitsquare.css"
            xmlns:fx="http://javafx.com/fxml">
 </StackPane>

src/main/java/io/bitsquare/gui/main/MainViewCB.java

@@ -15,15 +15,15 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view;
+package io.bitsquare.gui.main;
 
 import io.bitsquare.bank.BankAccount;
+import io.bitsquare.gui.CodeBehind;
 import io.bitsquare.gui.NavigationController;
 import io.bitsquare.gui.NavigationItem;
 import io.bitsquare.gui.OverlayController;
 import io.bitsquare.gui.components.NetworkSyncPane;
 import io.bitsquare.gui.components.Popups;
-import io.bitsquare.gui.pm.MainPM;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.gui.util.Profiler;
 import io.bitsquare.gui.util.Transitions;

src/main/java/io/bitsquare/gui/main/account/AccountModel.java

@@ -15,8 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model;
+package io.bitsquare.gui.main.account;
 
+import io.bitsquare.gui.UIModel;
 import io.bitsquare.user.User;
 
 import com.google.inject.Inject;

src/main/java/io/bitsquare/gui/main/account/AccountPM.java

@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm;
+package io.bitsquare.gui.main.account;
 
-import io.bitsquare.gui.model.AccountModel;
+import io.bitsquare.gui.PresentationModel;
 
 import com.google.inject.Inject;
 

src/main/java/io/bitsquare/gui/main/account/AccountSettingsModel.java

@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model.account;
+package io.bitsquare.gui.main.account;
 
-import io.bitsquare.gui.model.UIModel;
+import io.bitsquare.gui.UIModel;
 
 import com.google.inject.Inject;
 

src/main/java/io/bitsquare/gui/main/account/AccountSettingsPM.java

@@ -15,10 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm.account;
+package io.bitsquare.gui.main.account;
 
-import io.bitsquare.gui.model.account.AccountSettingsModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.PresentationModel;
 
 import com.google.inject.Inject;
 

src/main/java/io/bitsquare/gui/main/account/AccountSettingsView.fxml

@@ -19,7 +19,7 @@
 
 
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.AccountSettingsViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.AccountSettingsViewCB"
             prefHeight="660.0" prefWidth="1000.0"
             xmlns:fx="http://javafx.com/fxml">
 

src/main/java/io/bitsquare/gui/main/account/AccountSettingsViewCB.java

@@ -15,15 +15,14 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view.account;
+package io.bitsquare.gui.main.account;
 
+import io.bitsquare.gui.CachedCodeBehind;
+import io.bitsquare.gui.CodeBehind;
 import io.bitsquare.gui.NavigationController;
 import io.bitsquare.gui.NavigationItem;
-import io.bitsquare.gui.pm.PresentationModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.account.AccountSettingsPM;
+import io.bitsquare.gui.main.account.content.ContextAware;
-import io.bitsquare.gui.view.CachedCodeBehind;
-import io.bitsquare.gui.view.CodeBehind;
-import io.bitsquare.gui.view.account.content.ContextAware;
 import io.bitsquare.util.BSFXMLLoader;
 
 import java.io.IOException;

src/main/java/io/bitsquare/gui/main/account/AccountSetupModel.java

@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model.account;
+package io.bitsquare.gui.main.account;
 
-import io.bitsquare.gui.model.UIModel;
+import io.bitsquare.gui.UIModel;
 
 import com.google.inject.Inject;
 

src/main/java/io/bitsquare/gui/main/account/AccountSetupPM.java

@@ -15,10 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm.account;
+package io.bitsquare.gui.main.account;
 
-import io.bitsquare.gui.model.account.AccountSetupModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.PresentationModel;
 
 import com.google.inject.Inject;
 

src/main/java/io/bitsquare/gui/main/account/AccountSetupView.fxml

@@ -19,7 +19,7 @@
 
 
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.AccountSetupViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.AccountSetupViewCB"
             xmlns:fx="http://javafx.com/fxml">
 
     <VBox fx:id="leftVBox" spacing="5" prefWidth="300" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="20"

src/main/java/io/bitsquare/gui/main/account/AccountSetupViewCB.java

@@ -15,20 +15,19 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view.account;
+package io.bitsquare.gui.main.account;
 
+import io.bitsquare.gui.CachedCodeBehind;
+import io.bitsquare.gui.CodeBehind;
 import io.bitsquare.gui.NavigationItem;
-import io.bitsquare.gui.pm.PresentationModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.account.AccountSetupPM;
+import io.bitsquare.gui.main.account.content.ContextAware;
+import io.bitsquare.gui.main.account.content.FiatAccountViewCB;
+import io.bitsquare.gui.main.account.content.PasswordViewCB;
+import io.bitsquare.gui.main.account.content.RegistrationViewCB;
+import io.bitsquare.gui.main.account.content.RestrictionsViewCB;
+import io.bitsquare.gui.main.account.content.SeedWordsViewCB;
 import io.bitsquare.gui.util.ImageUtil;
-import io.bitsquare.gui.view.CachedCodeBehind;
-import io.bitsquare.gui.view.CodeBehind;
-import io.bitsquare.gui.view.account.content.ContextAware;
-import io.bitsquare.gui.view.account.content.FiatAccountViewCB;
-import io.bitsquare.gui.view.account.content.PasswordViewCB;
-import io.bitsquare.gui.view.account.content.RegistrationViewCB;
-import io.bitsquare.gui.view.account.content.RestrictionsViewCB;
-import io.bitsquare.gui.view.account.content.SeedWordsViewCB;
 import io.bitsquare.util.BSFXMLLoader;
 
 import java.io.IOException;

src/main/java/io/bitsquare/gui/main/account/AccountView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.view.AccountViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.AccountViewCB"
          prefHeight="630.0" prefWidth="1000.0"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"

src/main/java/io/bitsquare/gui/main/account/AccountViewCB.java

@@ -15,12 +15,12 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view;
+package io.bitsquare.gui.main.account;
 
+import io.bitsquare.gui.CachedCodeBehind;
+import io.bitsquare.gui.CodeBehind;
 import io.bitsquare.gui.NavigationController;
 import io.bitsquare.gui.NavigationItem;
-import io.bitsquare.gui.pm.AccountPM;
-import io.bitsquare.gui.view.account.AccountSetupViewCB;
 import io.bitsquare.util.BSFXMLLoader;
 
 import java.io.IOException;

src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordModel.java

@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model.account.content;
+package io.bitsquare.gui.main.account.content;
 
-import io.bitsquare.gui.model.UIModel;
+import io.bitsquare.gui.UIModel;
 
 import com.google.inject.Inject;
 

src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordPM.java

@@ -15,10 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm.account.content;
+package io.bitsquare.gui.main.account.content;
 
-import io.bitsquare.gui.model.account.content.ChangePasswordModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.PresentationModel;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
 

src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.ChangePasswordViewCB" hgap="5.0" vgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.ChangePasswordViewCB" hgap="5.0" vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
           xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/account/content/ChangePasswordViewCB.java

@@ -15,13 +15,12 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view.account.content;
+package io.bitsquare.gui.main.account.content;
 
-import io.bitsquare.gui.help.Help;
+import io.bitsquare.gui.CachedCodeBehind;
-import io.bitsquare.gui.help.HelpId;
+import io.bitsquare.gui.main.account.AccountSetupViewCB;
-import io.bitsquare.gui.pm.account.content.ChangePasswordPM;
+import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.view.CachedCodeBehind;
+import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.gui.view.account.AccountSetupViewCB;
 
 import java.net.URL;
 

src/main/java/io/bitsquare/gui/main/account/content/ContextAware.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view.account.content;
+package io.bitsquare.gui.main.account.content;
 
 public interface ContextAware {
     void useSettingsContext(boolean useSettingsContext);

src/main/java/io/bitsquare/gui/main/account/content/FiatAccountModel.java

@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model.account.content;
+package io.bitsquare.gui.main.account.content;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
-import io.bitsquare.gui.model.UIModel;
+import io.bitsquare.gui.UIModel;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.CurrencyUtil;

src/main/java/io/bitsquare/gui/main/account/content/FiatAccountPm.java

@@ -15,12 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm.account.content;
+package io.bitsquare.gui.main.account.content;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
-import io.bitsquare.gui.model.account.content.FiatAccountModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.PresentationModel;
 import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;

src/main/java/io/bitsquare/gui/main/account/content/FiatAccountView.fxml

@@ -23,7 +23,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.FiatAccountViewCB" hgap="5.0" vgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.FiatAccountViewCB" hgap="5.0" vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
           xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/account/content/FiatAccountViewCB.java

@@ -15,18 +15,17 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view.account.content;
+package io.bitsquare.gui.main.account.content;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.gui.CachedCodeBehind;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.Popups;
-import io.bitsquare.gui.help.Help;
+import io.bitsquare.gui.main.account.AccountSetupViewCB;
-import io.bitsquare.gui.help.HelpId;
+import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.pm.account.content.FiatAccountPm;
+import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.gui.util.validation.InputValidator;
-import io.bitsquare.gui.view.CachedCodeBehind;
-import io.bitsquare.gui.view.account.AccountSetupViewCB;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
 

src/main/java/io/bitsquare/gui/main/account/content/PasswordModel.java

@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model.account.content;
+package io.bitsquare.gui.main.account.content;
 
-import io.bitsquare.gui.model.UIModel;
+import io.bitsquare.gui.UIModel;
 
 import com.google.inject.Inject;
 

src/main/java/io/bitsquare/gui/main/account/content/PasswordPM.java

@@ -15,10 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm.account.content;
+package io.bitsquare.gui.main.account.content;
 
-import io.bitsquare.gui.model.account.content.PasswordModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.PresentationModel;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
 

src/main/java/io/bitsquare/gui/main/account/content/PasswordView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.PasswordViewCB" hgap="5.0" vgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.PasswordViewCB" hgap="5.0" vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
           xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/account/content/PasswordViewCB.java

@@ -15,13 +15,12 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view.account.content;
+package io.bitsquare.gui.main.account.content;
 
-import io.bitsquare.gui.help.Help;
+import io.bitsquare.gui.CachedCodeBehind;
-import io.bitsquare.gui.help.HelpId;
+import io.bitsquare.gui.main.account.AccountSetupViewCB;
-import io.bitsquare.gui.pm.account.content.PasswordPM;
+import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.view.CachedCodeBehind;
+import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.gui.view.account.AccountSetupViewCB;
 
 import java.net.URL;
 

src/main/java/io/bitsquare/gui/main/account/content/RegistrationModel.java

@@ -15,13 +15,13 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model.account.content;
+package io.bitsquare.gui.main.account.content;
 
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.gui.model.UIModel;
+import io.bitsquare.gui.UIModel;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
 

src/main/java/io/bitsquare/gui/main/account/content/RegistrationPM.java

@@ -15,11 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm.account.content;
+package io.bitsquare.gui.main.account.content;
 
 import io.bitsquare.btc.WalletFacade;
-import io.bitsquare.gui.model.account.content.RegistrationModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.PresentationModel;
 import io.bitsquare.locale.BSResources;
 
 import com.google.bitcoin.core.Address;

src/main/java/io/bitsquare/gui/main/account/content/RegistrationView.fxml

@@ -23,7 +23,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.RegistrationViewCB" hgap="5.0" vgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.RegistrationViewCB" hgap="5.0" vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
           xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/account/content/RegistrationViewCB.java

@@ -15,17 +15,16 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view.account.content;
+package io.bitsquare.gui.main.account.content;
 
+import io.bitsquare.gui.CachedCodeBehind;
 import io.bitsquare.gui.OverlayController;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.components.btc.AddressTextField;
 import io.bitsquare.gui.components.btc.BalanceTextField;
-import io.bitsquare.gui.help.Help;
+import io.bitsquare.gui.main.account.AccountSetupViewCB;
-import io.bitsquare.gui.help.HelpId;
+import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.pm.account.content.RegistrationPM;
+import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.gui.view.CachedCodeBehind;
-import io.bitsquare.gui.view.account.AccountSetupViewCB;
 import io.bitsquare.locale.BSResources;
 
 import java.net.URL;

src/main/java/io/bitsquare/gui/main/account/content/RestrictionsModel.java

@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model.account.content;
+package io.bitsquare.gui.main.account.content;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.arbitrator.Reputation;
-import io.bitsquare.gui.model.UIModel;
+import io.bitsquare.gui.UIModel;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.LanguageUtil;

src/main/java/io/bitsquare/gui/main/account/content/RestrictionsPM.java

@@ -15,11 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm.account.content;
+package io.bitsquare.gui.main.account.content;
 
 import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.gui.model.account.content.RestrictionsModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.PresentationModel;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
 

src/main/java/io/bitsquare/gui/main/account/content/RestrictionsView.fxml

@@ -20,7 +20,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.RestrictionsViewCB" hgap="5.0" vgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.RestrictionsViewCB" hgap="5.0" vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
           xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/account/content/RestrictionsViewCB.java

@@ -15,17 +15,16 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view.account.content;
+package io.bitsquare.gui.main.account.content;
 
 import io.bitsquare.BitSquare;
 import io.bitsquare.arbitrator.Arbitrator;
+import io.bitsquare.gui.CachedCodeBehind;
 import io.bitsquare.gui.NavigationItem;
-import io.bitsquare.gui.help.Help;
+import io.bitsquare.gui.main.account.AccountSetupViewCB;
-import io.bitsquare.gui.help.HelpId;
+import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.pm.account.content.RestrictionsPM;
+import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.gui.util.ImageUtil;
-import io.bitsquare.gui.view.CachedCodeBehind;
-import io.bitsquare.gui.view.account.AccountSetupViewCB;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
 import io.bitsquare.util.BSFXMLLoader;

src/main/java/io/bitsquare/gui/main/account/content/SeedWordsModel.java

@@ -15,10 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model.account.content;
+package io.bitsquare.gui.main.account.content;
 
 import io.bitsquare.btc.WalletFacade;
-import io.bitsquare.gui.model.UIModel;
+import io.bitsquare.gui.UIModel;
 
 import com.google.inject.Inject;
 

src/main/java/io/bitsquare/gui/main/account/content/SeedWordsPM.java

@@ -15,10 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm.account.content;
+package io.bitsquare.gui.main.account.content;
 
-import io.bitsquare.gui.model.account.content.SeedWordsModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.PresentationModel;
 import io.bitsquare.gui.util.BSFormatter;
 
 import com.google.inject.Inject;

src/main/java/io/bitsquare/gui/main/account/content/SeedWordsView.fxml

@@ -22,7 +22,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.view.account.content.SeedWordsViewCB" hgap="5.0" vgap="5.0"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.SeedWordsViewCB" hgap="5.0" vgap="5.0"
           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
           xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/account/content/SeedWordsViewCB.java

@@ -15,13 +15,12 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view.account.content;
+package io.bitsquare.gui.main.account.content;
 
-import io.bitsquare.gui.help.Help;
+import io.bitsquare.gui.CachedCodeBehind;
-import io.bitsquare.gui.help.HelpId;
+import io.bitsquare.gui.main.account.AccountSetupViewCB;
-import io.bitsquare.gui.pm.account.content.SeedWordsPM;
+import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.view.CachedCodeBehind;
+import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.gui.view.account.AccountSetupViewCB;
 
 import java.net.URL;
 

src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserController.java

@@ -15,13 +15,13 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.arbitrators.browser;
+package io.bitsquare.gui.main.arbitrators.browser;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.NavigationItem;
 import io.bitsquare.gui.ViewController;
-import io.bitsquare.gui.arbitrators.profile.ArbitratorProfileController;
+import io.bitsquare.gui.main.arbitrators.profile.ArbitratorProfileController;
 import io.bitsquare.locale.LanguageUtil;
 import io.bitsquare.msg.MessageFacade;
 import io.bitsquare.msg.listeners.ArbitratorListener;

src/main/java/io/bitsquare/gui/main/arbitrators/browser/ArbitratorBrowserView.fxml

@@ -18,7 +18,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.arbitrators.browser.ArbitratorBrowserController"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.arbitrators.browser.ArbitratorBrowserController"
             prefHeight="600" prefWidth="800" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="10.0"
             AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
             xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.arbitrators.profile;
+package io.bitsquare.gui.main.arbitrators.profile;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.gui.CachedViewController;

src/main/java/io/bitsquare/gui/main/arbitrators/profile/ArbitratorProfileView.fxml

@@ -19,7 +19,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.arbitrators.profile.ArbitratorProfileController"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.arbitrators.profile.ArbitratorProfileController"
           hgap="5.0" vgap="5.0" AnchorPane.bottomAnchor="80.0" AnchorPane.leftAnchor="10.0"
           AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
           xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.arbitrators.registration;
+package io.bitsquare.gui.main.arbitrators.registration;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.arbitrator.Reputation;
@@ -23,9 +23,9 @@ import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.NavigationItem;
 import io.bitsquare.gui.ViewController;
-import io.bitsquare.gui.arbitrators.profile.ArbitratorProfileController;
 import io.bitsquare.gui.components.ConfidenceDisplay;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
+import io.bitsquare.gui.main.arbitrators.profile.ArbitratorProfileController;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.BitSquareValidator;
 import io.bitsquare.locale.BSResources;

src/main/java/io/bitsquare/gui/main/arbitrators/registration/ArbitratorRegistrationView.fxml

@@ -20,7 +20,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.arbitrators.registration.ArbitratorRegistrationController"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.arbitrators.registration.ArbitratorRegistrationController"
             prefHeight="600" prefWidth="800" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="10.0"
             AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
             xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/funds/FundsController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.funds;
+package io.bitsquare.gui.main.funds;
 
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.NavigationItem;

src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml

@@ -19,7 +19,7 @@
 <?import io.bitsquare.gui.components.CachingTabPane?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<CachingTabPane fx:id="root" fx:controller="io.bitsquare.gui.funds.FundsController"
+<CachingTabPane fx:id="root" fx:controller="io.bitsquare.gui.main.funds.FundsController"
                 AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
                 AnchorPane.topAnchor="0.0"
                 xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/funds/deposit/DepositController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.funds.deposit;
+package io.bitsquare.gui.main.funds.deposit;
 
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.WalletFacade;

src/main/java/io/bitsquare/gui/main/funds/deposit/DepositListItem.java

@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.funds.deposit;
+package io.bitsquare.gui.main.funds.deposit;
 
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.WalletFacade;
-import io.bitsquare.gui.funds.withdrawal.WithdrawalListItem;
+import io.bitsquare.gui.main.funds.withdrawal.WithdrawalListItem;
 
 public class DepositListItem extends WithdrawalListItem {
     public DepositListItem(AddressEntry addressEntry, WalletFacade walletFacade) {

src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<VBox fx:id="root" fx:controller="io.bitsquare.gui.funds.deposit.DepositController"
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.deposit.DepositController"
       spacing="10" xmlns:fx="http://javafx.com/fxml">
     <padding>
         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>

src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.funds.transactions;
+package io.bitsquare.gui.main.funds.transactions;
 
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.CachedViewController;

src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.funds.transactions;
+package io.bitsquare.gui.main.funds.transactions;
 
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.btc.listeners.ConfidenceListener;

src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<VBox fx:id="root" fx:controller="io.bitsquare.gui.funds.transactions.TransactionsController"
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.transactions.TransactionsController"
       spacing="10" xmlns:fx="http://javafx.com/fxml">
     <padding>
         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>

src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.funds.withdrawal;
+package io.bitsquare.gui.main.funds.withdrawal;
 
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;

src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.funds.withdrawal;
+package io.bitsquare.gui.main.funds.withdrawal;
 
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.WalletFacade;

src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.layout.*?>
-<VBox fx:id="root" fx:controller="io.bitsquare.gui.funds.withdrawal.WithdrawalController"
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.funds.withdrawal.WithdrawalController"
       spacing="10" xmlns:fx="http://javafx.com/fxml">
     <padding>
         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>

src/main/java/io/bitsquare/gui/main/help/Help.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.help;
+package io.bitsquare.gui.main.help;
 
 import io.bitsquare.BitSquare;
 

src/main/java/io/bitsquare/gui/main/help/HelpId.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.help;
+package io.bitsquare.gui.main.help;
 
 public enum HelpId {
     CREATE_OFFER_GENERAL,

src/main/java/io/bitsquare/gui/main/home/HomeController.java

@@ -15,12 +15,12 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.home;
+package io.bitsquare.gui.main.home;
 
 import io.bitsquare.BitSquare;
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.NavigationItem;
-import io.bitsquare.gui.arbitrators.registration.ArbitratorRegistrationController;
+import io.bitsquare.gui.main.arbitrators.registration.ArbitratorRegistrationController;
 import io.bitsquare.util.BSFXMLLoader;
 
 import java.io.IOException;

src/main/java/io/bitsquare/gui/main/home/HomeView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.home.HomeController"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.home.HomeController"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/msg/MsgController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.msg;
+package io.bitsquare.gui.main.msg;
 
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.NavigationItem;

src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.msg.MsgController"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.msg.MsgController"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/orders/OrdersController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.orders;
+package io.bitsquare.gui.main.orders;
 
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.NavigationItem;

src/main/java/io/bitsquare/gui/main/orders/OrdersView.fxml

@@ -20,7 +20,7 @@
 <?import io.bitsquare.gui.components.CachingTabPane?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<CachingTabPane fx:id="root" fx:controller="io.bitsquare.gui.orders.OrdersController"
+<CachingTabPane fx:id="root" fx:controller="io.bitsquare.gui.main.orders.OrdersController"
                 AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
                 AnchorPane.topAnchor="0.0"
                 xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradeController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.orders.closed;
+package io.bitsquare.gui.main.orders.closed;
 
 import io.bitsquare.gui.CachedViewController;
 

src/main/java/io/bitsquare/gui/main/orders/closed/ClosedTradeView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.orders.closed.ClosedTradeController"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.orders.closed.ClosedTradeController"
             AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
             xmlns:fx="http://javafx.com/fxml">
     <VBox spacing="20" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"

src/main/java/io/bitsquare/gui/main/orders/offer/OfferController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.orders.offer;
+package io.bitsquare.gui.main.orders.offer;
 
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.util.ImageUtil;

src/main/java/io/bitsquare/gui/main/orders/offer/OfferListItem.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.orders.offer;
+package io.bitsquare.gui.main.orders.offer;
 
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.trade.Offer;

src/main/java/io/bitsquare/gui/main/orders/offer/OfferView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<VBox fx:id="root" fx:controller="io.bitsquare.gui.orders.offer.OfferController"
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.orders.offer.OfferController"
       spacing="10" xmlns:fx="http://javafx.com/fxml">
     <padding>
         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>

src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.orders.pending;
+package io.bitsquare.gui.main.orders.pending;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;

src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradeView.fxml

@@ -22,7 +22,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.layout.*?>
-<VBox fx:id="root" fx:controller="io.bitsquare.gui.orders.pending.PendingTradeController"
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.orders.pending.PendingTradeController"
       spacing="10" AnchorPane.bottomAnchor="0"
       AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
       xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesListItem.java

@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.orders.pending;
+package io.bitsquare.gui.main.orders.pending;
 
-import io.bitsquare.gui.trade.orderbook.OrderBookListItem;
+import io.bitsquare.gui.main.trade.orderbook.OrderBookListItem;
 import io.bitsquare.trade.Trade;
 
 import org.slf4j.Logger;

src/main/java/io/bitsquare/gui/main/settings/SettingsController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.settings;
+package io.bitsquare.gui.main.settings;
 
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.NavigationItem;

src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.settings.SettingsController"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.SettingsController"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/trade/BuyController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.trade;
+package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.trade.Direction;
 

src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.trade.BuyController"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.BuyController"
          AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
          AnchorPane.topAnchor="0.0"
          xmlns:fx="http://javafx.com/fxml"/>

src/main/java/io/bitsquare/gui/main/trade/SellController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.trade;
+package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.trade.Direction;
 

src/main/java/io/bitsquare/gui/main/trade/SellView.fxml

@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.trade.SellController"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.SellController"
          AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
          AnchorPane.topAnchor="0.0"
          xmlns:fx="http://javafx.com/fxml"/>

src/main/java/io/bitsquare/gui/main/trade/TradeController.java

@@ -15,14 +15,14 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.trade;
+package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.NavigationItem;
 import io.bitsquare.gui.components.InputTextField;
-import io.bitsquare.gui.trade.orderbook.OrderBookController;
+import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB;
-import io.bitsquare.gui.trade.takeoffer.TakeOfferController;
+import io.bitsquare.gui.main.trade.orderbook.OrderBookController;
-import io.bitsquare.gui.view.trade.CreateOfferViewCB;
+import io.bitsquare.gui.main.trade.takeoffer.TakeOfferController;
 import io.bitsquare.trade.Direction;
 import io.bitsquare.util.BSFXMLLoader;
 

src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.model.trade;
+package io.bitsquare.gui.main.trade.createoffer;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.bank.BankAccount;
@@ -23,7 +23,7 @@ import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.btc.listeners.BalanceListener;
-import io.bitsquare.gui.model.UIModel;
+import io.bitsquare.gui.UIModel;
 import io.bitsquare.locale.Country;
 import io.bitsquare.settings.Settings;
 import io.bitsquare.trade.Direction;

src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java

@@ -15,11 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.pm.trade;
+package io.bitsquare.gui.main.trade.createoffer;
 
 import io.bitsquare.btc.WalletFacade;
-import io.bitsquare.gui.model.trade.CreateOfferModel;
+import io.bitsquare.gui.PresentationModel;
-import io.bitsquare.gui.pm.PresentationModel;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcValidator;
 import io.bitsquare.gui.util.validation.FiatValidator;

src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml

@@ -26,7 +26,7 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.view.trade.CreateOfferViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB"
             AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0"
             AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0"
             xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java

@@ -15,8 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.view.trade;
+package io.bitsquare.gui.main.trade.createoffer;
 
+import io.bitsquare.gui.CachedCodeBehind;
 import io.bitsquare.gui.NavigationController;
 import io.bitsquare.gui.NavigationItem;
 import io.bitsquare.gui.OverlayController;
@@ -25,11 +26,9 @@ import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.components.btc.AddressTextField;
 import io.bitsquare.gui.components.btc.BalanceTextField;
-import io.bitsquare.gui.help.Help;
+import io.bitsquare.gui.main.help.Help;
-import io.bitsquare.gui.help.HelpId;
+import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.gui.pm.trade.CreateOfferPM;
 import io.bitsquare.gui.util.ImageUtil;
-import io.bitsquare.gui.view.CachedCodeBehind;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.trade.orderbook.OrderBookFilter;
 

src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookController.java

@@ -15,21 +15,21 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.trade.orderbook;
+package io.bitsquare.gui.main.trade.orderbook;
 
 import io.bitsquare.bank.BankAccountType;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.CachedViewController;
+import io.bitsquare.gui.CodeBehind;
 import io.bitsquare.gui.NavigationController;
 import io.bitsquare.gui.NavigationItem;
 import io.bitsquare.gui.OverlayController;
 import io.bitsquare.gui.ViewController;
 import io.bitsquare.gui.components.Popups;
-import io.bitsquare.gui.trade.takeoffer.TakeOfferController;
+import io.bitsquare.gui.main.trade.createoffer.CreateOfferViewCB;
+import io.bitsquare.gui.main.trade.takeoffer.TakeOfferController;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.ImageUtil;
-import io.bitsquare.gui.view.CodeBehind;
-import io.bitsquare.gui.view.trade.CreateOfferViewCB;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CurrencyUtil;

src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookListItem.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.trade.orderbook;
+package io.bitsquare.gui.main.trade.orderbook;
 
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.trade.Offer;

src/main/java/io/bitsquare/gui/main/trade/orderbook/OrderBookView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.trade.orderbook.OrderBookController"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.orderbook.OrderBookController"
             AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
             AnchorPane.topAnchor="0.0"
             xmlns:fx="http://javafx.com/fxml">

src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferController.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.trade.takeoffer;
+package io.bitsquare.gui.main.trade.takeoffer;
 
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
@@ -23,7 +23,7 @@ import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.components.ValidatedTextField;
-import io.bitsquare.gui.trade.TradeController;
+import io.bitsquare.gui.main.trade.TradeController;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.BitSquareValidator;
 import io.bitsquare.trade.Offer;

src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml

@@ -21,7 +21,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.trade.takeoffer.TakeOfferController"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.takeoffer.TakeOfferController"
             xmlns:fx="http://javafx.com/fxml">
     <Accordion fx:id="accordion" AnchorPane.bottomAnchor="30.0" AnchorPane.leftAnchor="10.0"
                AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0">

src/main/java/io/bitsquare/trade/orderbook/OrderBook.java

@@ -19,7 +19,7 @@ package io.bitsquare.trade.orderbook;
 
 import io.bitsquare.arbitrator.Arbitrator;
 import io.bitsquare.bank.BankAccount;
-import io.bitsquare.gui.trade.orderbook.OrderBookListItem;
+import io.bitsquare.gui.main.trade.orderbook.OrderBookListItem;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.msg.MessageFacade;

src/test/java/io/bitsquare/BitSquareTestSuite.java

@@ -18,7 +18,7 @@
 package io.bitsquare;
 
 import io.bitsquare.btc.RestrictionsTest;
-import io.bitsquare.gui.pm.trade.CreateOfferPMTest;
+import io.bitsquare.gui.main.trade.createoffer.CreateOfferPMTest;
 import io.bitsquare.gui.util.BSFormatterTest;
 import io.bitsquare.gui.util.BitSquareConverterTest;
 import io.bitsquare.gui.util.BitSquareNumberValidatorTest;

src/test/java/io/bitsquare/gui/main/account/AccountSettingsUITestRunner.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.account;
+package io.bitsquare.gui.main.account;
 
 import io.bitsquare.di.BitSquareModule;
 import io.bitsquare.util.BSFXMLLoader;
@@ -68,7 +68,7 @@ public class AccountSettingsUITestRunner extends Application {
         log.debug("re load");
         pane.getChildren().removeAll();
         BSFXMLLoader loader = new BSFXMLLoader(
-                getUrl("/io/bitsquare/gui/view/account/AccountSettingsView.fxml"), false);
+                getUrl("/io/bitsquare/gui/account/AccountSettingsView.fxml"), false);
         try {
             view = loader.load();
             pane.getChildren().setAll(view);

src/test/java/io/bitsquare/gui/main/account/AccountUITestRunner.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.account;
+package io.bitsquare.gui.main.account;
 
 import io.bitsquare.di.BitSquareModule;
 import io.bitsquare.util.BSFXMLLoader;
@@ -68,7 +68,7 @@ public class AccountUITestRunner extends Application {
         log.debug("re load");
         pane.getChildren().removeAll();
         BSFXMLLoader loader = new BSFXMLLoader(
-                getUrl("/io/bitsquare/gui/view/AccountView.fxml"), false);
+                getUrl("/io/bitsquare/gui/account/AccountView.fxml"), false);
         try {
             view = loader.load();
             pane.getChildren().setAll(view);