Introduce viewfx subpackages

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

@@ -29,7 +29,7 @@ import io.bitsquare.gui.util.Transitions;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import viewfx.ActivatableView;
+import viewfx.view.support.ActivatableView;
 
 import javafx.application.Platform;
 import javafx.geometry.Insets;

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

@@ -30,7 +30,7 @@ import io.bitsquare.user.User;
 
 import com.google.inject.Inject;
 
-import viewfx.ViewModel;
+import viewfx.model.ViewModel;
 
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;

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

@@ -22,7 +22,7 @@ import io.bitsquare.gui.ViewLoader;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableView;
+import viewfx.view.support.ActivatableView;
 
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;

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

@@ -21,7 +21,7 @@ import io.bitsquare.user.User;
 
 import com.google.inject.Inject;
 
-import viewfx.ViewModel;
+import viewfx.model.ViewModel;
 
 class AccountViewModel implements ViewModel {
 

src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java

@@ -23,7 +23,7 @@ import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrat
 
 import javax.inject.Inject;
 
-import viewfx.AbstractView;
+import viewfx.view.support.AbstractView;
 
 import javafx.fxml.FXML;
 import javafx.scene.*;

src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java

@@ -32,7 +32,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableView;
+import viewfx.view.support.ActivatableView;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;

src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java

@@ -24,7 +24,7 @@ import io.bitsquare.settings.Preferences;
 
 import javax.inject.Inject;
 
-import viewfx.AbstractView;
+import viewfx.view.support.AbstractView;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;

src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java

@@ -44,7 +44,7 @@ import java.util.Locale;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableView;
+import viewfx.view.support.ActivatableView;
 
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;

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

@@ -22,8 +22,8 @@ import io.bitsquare.gui.main.help.HelpId;
 
 import javax.inject.Inject;
 
-import viewfx.InitializableView;
-import viewfx.Wizard;
+import viewfx.view.support.InitializableView;
+import viewfx.view.Wizard;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;

src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java

@@ -22,7 +22,7 @@ import io.bitsquare.gui.util.validation.PasswordValidator;
 
 import com.google.inject.Inject;
 
-import viewfx.ViewModel;
+import viewfx.model.ViewModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;

src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java

@@ -31,8 +31,8 @@ import com.google.inject.Inject;
 
 import java.util.Currency;
 
-import viewfx.Activatable;
-import viewfx.DataModel;
+import viewfx.model.Activatable;
+import viewfx.model.DataModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;

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

@@ -35,8 +35,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
-import viewfx.Wizard;
+import viewfx.view.support.ActivatableViewAndModel;
+import viewfx.view.Wizard;
 
 import javafx.collections.ListChangeListener;
 import javafx.event.ActionEvent;

src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java

@@ -29,8 +29,8 @@ import com.google.inject.Inject;
 
 import java.util.Currency;
 
-import viewfx.ActivatableWithDelegate;
-import viewfx.ViewModel;
+import viewfx.model.support.ActivatableWithDelegate;
+import viewfx.model.ViewModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;

src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java

@@ -43,8 +43,8 @@ import java.util.Currency;
 import java.util.List;
 import java.util.Locale;
 
-import viewfx.Activatable;
-import viewfx.DataModel;
+import viewfx.model.Activatable;
+import viewfx.model.DataModel;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;

src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java

@@ -28,8 +28,8 @@ import java.util.Currency;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
-import viewfx.Wizard;
+import viewfx.view.support.ActivatableViewAndModel;
+import viewfx.view.Wizard;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;

src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java

@@ -27,8 +27,8 @@ import com.google.inject.Inject;
 
 import java.util.Currency;
 
-import viewfx.ActivatableWithDelegate;
-import viewfx.ViewModel;
+import viewfx.model.support.ActivatableWithDelegate;
+import viewfx.model.ViewModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;

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

@@ -22,8 +22,8 @@ import io.bitsquare.gui.main.help.HelpId;
 
 import javax.inject.Inject;
 
-import viewfx.InitializableView;
-import viewfx.Wizard;
+import viewfx.view.support.InitializableView;
+import viewfx.view.Wizard;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;

src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java

@@ -22,7 +22,7 @@ import io.bitsquare.gui.util.validation.PasswordValidator;
 
 import com.google.inject.Inject;
 
-import viewfx.ViewModel;
+import viewfx.model.ViewModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;

src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java

@@ -34,7 +34,7 @@ import com.google.inject.Inject;
 
 import javax.annotation.Nullable;
 
-import viewfx.DataModel;
+import viewfx.model.DataModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;

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

@@ -30,8 +30,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import viewfx.InitializableView;
-import viewfx.Wizard;
+import viewfx.view.support.InitializableView;
+import viewfx.view.Wizard;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;

src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java

@@ -26,8 +26,8 @@ import org.bitcoinj.core.Coin;
 
 import com.google.inject.Inject;
 
-import viewfx.ViewModel;
-import viewfx.WithDelegate;
+import viewfx.model.ViewModel;
+import viewfx.model.support.WithDelegate;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;

src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java

@@ -39,8 +39,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import viewfx.Activatable;
-import viewfx.DataModel;
+import viewfx.model.Activatable;
+import viewfx.model.DataModel;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;

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

@@ -30,9 +30,9 @@ import java.util.Locale;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
-import viewfx.View;
-import viewfx.Wizard;
+import viewfx.view.support.ActivatableViewAndModel;
+import viewfx.view.View;
+import viewfx.view.Wizard;
 
 import javafx.fxml.FXML;
 import javafx.scene.*;

src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java

@@ -25,8 +25,8 @@ import com.google.inject.Inject;
 
 import java.util.Locale;
 
-import viewfx.ActivatableWithDelegate;
-import viewfx.ViewModel;
+import viewfx.model.support.ActivatableWithDelegate;
+import viewfx.model.ViewModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;

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

@@ -22,8 +22,8 @@ import io.bitsquare.gui.main.help.HelpId;
 
 import javax.inject.Inject;
 
-import viewfx.InitializableView;
-import viewfx.Wizard;
+import viewfx.view.support.InitializableView;
+import viewfx.view.Wizard;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;

src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java

@@ -24,7 +24,7 @@ import com.google.inject.Inject;
 
 import java.util.List;
 
-import viewfx.ViewModel;
+import viewfx.model.ViewModel;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;

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

@@ -23,9 +23,9 @@ import io.bitsquare.gui.util.Colors;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
-import viewfx.View;
-import viewfx.Wizard;
+import viewfx.view.support.ActivatableViewAndModel;
+import viewfx.view.View;
+import viewfx.view.Wizard;
 
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;

src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java

@@ -27,9 +27,9 @@ import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableView;
-import viewfx.View;
-import viewfx.Wizard;
+import viewfx.view.support.ActivatableView;
+import viewfx.view.View;
+import viewfx.view.Wizard;
 
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;

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

@@ -22,8 +22,8 @@ import io.bitsquare.gui.ViewLoader;
 
 import javax.inject.Inject;
 
-import viewfx.Activatable;
-import viewfx.ActivatableViewAndModel;
+import viewfx.model.Activatable;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;

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

@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;

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

@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.FXCollections;

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

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.home;
 
-import viewfx.AbstractView;
+import viewfx.view.support.AbstractView;
 
 // home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home,
 // probably overview, event history, news, charts,... -> low prio

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

@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.msg;
 
-import viewfx.AbstractView;
+import viewfx.view.support.AbstractView;
 
 // will be probably only used for arbitration communication, will be renamed and the icon changed
 class MsgView extends AbstractView {

src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java

@@ -23,8 +23,8 @@ import io.bitsquare.trade.TradeManager;
 
 import javax.inject.Inject;
 
-import viewfx.Activatable;
-import viewfx.ActivatableViewAndModel;
+import viewfx.model.Activatable;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;

src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java

@@ -25,8 +25,8 @@ import io.bitsquare.user.User;
 
 import com.google.inject.Inject;
 
-import viewfx.Activatable;
-import viewfx.DataModel;
+import viewfx.model.Activatable;
+import viewfx.model.DataModel;
 
 import javafx.collections.FXCollections;
 import javafx.collections.MapChangeListener;

src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java

@@ -21,7 +21,7 @@ import io.bitsquare.gui.components.Popups;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.fxml.FXML;

src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java

@@ -21,8 +21,8 @@ import io.bitsquare.gui.util.BSFormatter;
 
 import com.google.inject.Inject;
 
-import viewfx.ActivatableWithDelegate;
-import viewfx.ViewModel;
+import viewfx.model.support.ActivatableWithDelegate;
+import viewfx.model.ViewModel;
 
 import javafx.collections.ObservableList;
 

src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java

@@ -26,8 +26,8 @@ import com.google.inject.Inject;
 
 import java.util.stream.Collectors;
 
-import viewfx.Activatable;
-import viewfx.DataModel;
+import viewfx.model.Activatable;
+import viewfx.model.DataModel;
 
 import javafx.collections.FXCollections;
 import javafx.collections.MapChangeListener;

src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java

@@ -22,7 +22,7 @@ import io.bitsquare.util.Utilities;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.fxml.FXML;

src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java

@@ -21,8 +21,8 @@ import io.bitsquare.gui.util.BSFormatter;
 
 import com.google.inject.Inject;
 
-import viewfx.ActivatableWithDelegate;
-import viewfx.ViewModel;
+import viewfx.model.support.ActivatableWithDelegate;
+import viewfx.model.ViewModel;
 
 import javafx.collections.ObservableList;
 

src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java

@@ -39,8 +39,8 @@ import com.google.inject.Inject;
 
 import java.util.Optional;
 
-import viewfx.Activatable;
-import viewfx.DataModel;
+import viewfx.model.Activatable;
+import viewfx.model.DataModel;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;

src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java

@@ -40,7 +40,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyObjectWrapper;

src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java

@@ -30,8 +30,8 @@ import com.google.inject.Inject;
 
 import java.util.Date;
 
-import viewfx.ActivatableWithDelegate;
-import viewfx.ViewModel;
+import viewfx.model.support.ActivatableWithDelegate;
+import viewfx.model.ViewModel;
 
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.BooleanProperty;

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

@@ -23,8 +23,8 @@ import io.bitsquare.settings.Preferences;
 
 import javax.inject.Inject;
 
-import viewfx.Activatable;
-import viewfx.ActivatableViewAndModel;
+import viewfx.model.Activatable;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.value.ChangeListener;
 import javafx.fxml.FXML;

src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java

@@ -21,8 +21,8 @@ import io.bitsquare.settings.Preferences;
 
 import com.google.inject.Inject;
 
-import viewfx.Activatable;
-import viewfx.DataModel;
+import viewfx.model.Activatable;
+import viewfx.model.DataModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;

src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java

@@ -19,7 +19,7 @@ package io.bitsquare.gui.main.settings.application;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;

src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java

@@ -19,8 +19,8 @@ package io.bitsquare.gui.main.settings.application;
 
 import com.google.inject.Inject;
 
-import viewfx.ActivatableWithDelegate;
-import viewfx.ViewModel;
+import viewfx.model.support.ActivatableWithDelegate;
+import viewfx.model.ViewModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.StringProperty;

src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java

@@ -22,7 +22,7 @@ import io.bitsquare.network.ClientNode;
 
 import javax.inject.Inject;
 
-import viewfx.InitializableView;
+import viewfx.view.support.InitializableView;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;

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

@@ -31,8 +31,8 @@ import org.bitcoinj.utils.Fiat;
 
 import java.util.List;
 
-import viewfx.ActivatableView;
-import viewfx.View;
+import viewfx.view.support.ActivatableView;
+import viewfx.view.View;
 
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;

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

@@ -41,8 +41,8 @@ import com.google.inject.Inject;
 import java.util.Locale;
 import java.util.UUID;
 
-import viewfx.Activatable;
-import viewfx.DataModel;
+import viewfx.model.Activatable;
+import viewfx.model.DataModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;

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

@@ -39,7 +39,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.event.ActionEvent;

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

@@ -31,8 +31,8 @@ import org.bitcoinj.utils.Fiat;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableWithDelegate;
-import viewfx.ViewModel;
+import viewfx.model.support.ActivatableWithDelegate;
+import viewfx.model.ViewModel;
 
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;

src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java

@@ -35,8 +35,8 @@ import com.google.inject.Inject;
 
 import java.util.Comparator;
 
-import viewfx.Activatable;
-import viewfx.DataModel;
+import viewfx.model.Activatable;
+import viewfx.model.DataModel;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;

src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java

@@ -35,8 +35,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
-import viewfx.ChildView;
+import viewfx.view.support.ActivatableViewAndModel;
+import viewfx.view.ChildView;
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.transformation.SortedList;

src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java

@@ -30,8 +30,8 @@ import org.bitcoinj.utils.Fiat;
 
 import com.google.inject.Inject;
 
-import viewfx.ActivatableWithDelegate;
-import viewfx.ViewModel;
+import viewfx.model.support.ActivatableWithDelegate;
+import viewfx.model.ViewModel;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;

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

@@ -33,8 +33,8 @@ import org.bitcoinj.utils.Fiat;
 
 import com.google.inject.Inject;
 
-import viewfx.Activatable;
-import viewfx.DataModel;
+import viewfx.model.Activatable;
+import viewfx.model.DataModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;

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

@@ -40,7 +40,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableViewAndModel;
+import viewfx.view.support.ActivatableViewAndModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.event.ActionEvent;

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

@@ -30,8 +30,8 @@ import org.bitcoinj.core.Coin;
 
 import javax.inject.Inject;
 
-import viewfx.ActivatableWithDelegate;
-import viewfx.ViewModel;
+import viewfx.model.support.ActivatableWithDelegate;
+import viewfx.model.ViewModel;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;

src/main/java/viewfx/model/Activatable.java

@@ -15,9 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.model;
 
 public interface Activatable {
+
     void activate();
 
     void deactivate();

src/main/java/viewfx/model/DataModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.model;
 
 public interface DataModel extends Model {
 }

src/main/java/viewfx/model/Model.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.model;
 
 public interface Model {
 }

src/main/java/viewfx/model/ViewModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.model;
 
 public interface ViewModel extends Model {
 }

src/main/java/viewfx/model/support/ActivatableWithDelegate.java

@@ -15,7 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.model.support;
+
+import viewfx.model.Activatable;
 
 public abstract class ActivatableWithDelegate<D extends Activatable> extends WithDelegate<D> implements  Activatable {
 

src/main/java/viewfx/model/support/WithDelegate.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.model.support;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

src/main/java/viewfx/view/ChildView.java

@@ -15,7 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.view;
+
+import viewfx.view.View;
 
 public interface ChildView<Parent extends View> extends View {
     void setParent(Parent parent);

src/main/java/viewfx/view/View.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.view;
 
 public interface View {
 }

src/main/java/viewfx/view/Wizard.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.view;
 
 public interface Wizard extends View {
     void nextStep(Step currentStep);

src/main/java/viewfx/view/support/AbstractView.java

@@ -15,7 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.view.support;
+
+import viewfx.view.View;
 
 import javafx.fxml.FXML;
 import javafx.scene.*;

src/main/java/viewfx/view/support/ActivatableView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.view.support;
 
 import javafx.scene.*;
 

src/main/java/viewfx/view/support/ActivatableViewAndModel.java

@@ -15,7 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.view.support;
+
+import viewfx.model.Activatable;
 
 import javafx.scene.*;
 

src/main/java/viewfx/view/support/InitializableView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package viewfx;
+package viewfx.view.support;
 
 import java.net.URL;