Rename view packages

core/src/main/java/io/bitsquare/gui/Navigation.java

@@ -20,7 +20,7 @@ package io.bitsquare.gui;
 import io.bitsquare.common.viewfx.view.View;
 import io.bitsquare.common.viewfx.view.ViewPath;
 import io.bitsquare.gui.main.MainView;
-import io.bitsquare.gui.main.trade.BuyView;
+import io.bitsquare.gui.main.offer.BuyOfferView;
 import io.bitsquare.storage.Storage;
 
 import com.google.inject.Inject;
@@ -39,7 +39,7 @@ public class Navigation implements Serializable {
     private static final long serialVersionUID = 1L;
     transient private static final Logger log = LoggerFactory.getLogger(Navigation.class);
 
-    transient private static final ViewPath DEFAULT_VIEW_PATH = ViewPath.to(MainView.class, BuyView.class);
+    transient private static final ViewPath DEFAULT_VIEW_PATH = ViewPath.to(MainView.class, BuyOfferView.class);
 
 
     public interface Listener {

core/src/main/java/io/bitsquare/gui/images.css

@@ -22,11 +22,11 @@
     -fx-image: url("../../../images/remove.png");
 }
 
-#image-buy {
+#image-buyoffer {
     -fx-image: url("../../../images/buy.png");
 }
 
-#image-sell {
+#image-selloffer {
     -fx-image: url("../../../images/sell.png");
 }
 
@@ -55,20 +55,20 @@
     -fx-image: url("../../../images/nav/home_active.png");
 }
 
-#image-nav-buy {
+#image-nav-buyoffer {
-    -fx-image: url("../../../images/nav/buy.png");
+    -fx-image: url("../../../images/nav/buyoffer.png");
 }
 
-#image-nav-buy-active {
+#image-nav-buyoffer-active {
-    -fx-image: url("../../../images/nav/buy_active.png");
+    -fx-image: url("../../../images/nav/buyoffer_active.png");
 }
 
-#image-nav-sell {
+#image-nav-selloffer {
-    -fx-image: url("../../../images/nav/sell.png");
+    -fx-image: url("../../../images/nav/selloffer.png");
 }
 
-#image-nav-sell-active {
+#image-nav-selloffer-active {
-    -fx-image: url("../../../images/nav/sell_active.png");
+    -fx-image: url("../../../images/nav/selloffer_active.png");
 }
 
 #image-nav-portfolio {

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

@@ -32,10 +32,10 @@ import io.bitsquare.gui.main.account.AccountView;
 import io.bitsquare.gui.main.funds.FundsView;
 import io.bitsquare.gui.main.home.HomeView;
 import io.bitsquare.gui.main.msg.MsgView;
+import io.bitsquare.gui.main.offer.BuyOfferView;
+import io.bitsquare.gui.main.offer.SellOfferView;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.settings.SettingsView;
-import io.bitsquare.gui.main.trade.BuyView;
-import io.bitsquare.gui.main.trade.SellView;
 import io.bitsquare.gui.util.Transitions;
 
 import javax.inject.Inject;
@@ -83,8 +83,8 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         ToggleButton homeButton = new NavButton(HomeView.class, "Overview") {{
             setDisable(true); // alpha
         }};
-        ToggleButton buyButton = new NavButton(BuyView.class, "Buy BTC");
+        ToggleButton buyButton = new NavButton(BuyOfferView.class, "Buy BTC");
-        ToggleButton sellButton = new NavButton(SellView.class, "Sell BTC");
+        ToggleButton sellButton = new NavButton(SellOfferView.class, "Sell BTC");
         ToggleButton portfolioButton = new NavButton(PortfolioView.class, "Portfolio");
         ToggleButton fundsButton = new NavButton(FundsView.class, "Funds");
         ToggleButton msgButton = new NavButton(MsgView.class, "Messages") {{

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

@@ -30,7 +30,7 @@ import io.bitsquare.gui.main.account.content.password.PasswordView;
 import io.bitsquare.gui.main.account.content.registration.RegistrationView;
 import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
 import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
-import io.bitsquare.gui.main.trade.BuyView;
+import io.bitsquare.gui.main.offer.BuyOfferView;
 
 import javax.inject.Inject;
 
@@ -142,7 +142,7 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
             if (navigation.getReturnPath() != null)
                 navigation.navigateTo(navigation.getReturnPath());
             else
-                navigation.navigateTo(MainView.class, BuyView.class);
+                navigation.navigateTo(MainView.class, BuyOfferView.class);
         }
     }
 

core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml

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

core/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.trade;
+package io.bitsquare.gui.main.offer;
 
 import io.bitsquare.common.viewfx.view.FxmlView;
 import io.bitsquare.common.viewfx.view.ViewLoader;
@@ -24,10 +24,10 @@ import io.bitsquare.gui.Navigation;
 import javax.inject.Inject;
 
 @FxmlView
-public class SellView extends TradeView {
+public class BuyOfferView extends OfferView {
 
     @Inject
-    public SellView(ViewLoader viewLoader, Navigation navigation) {
+    public BuyOfferView(ViewLoader viewLoader, Navigation navigation) {
         super(viewLoader, navigation);
     }
 }

core/src/main/java/io/bitsquare/gui/main/offer/OfferView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.trade;
+package io.bitsquare.gui.main.offer;
 
 import io.bitsquare.common.viewfx.view.ActivatableView;
 import io.bitsquare.common.viewfx.view.View;
@@ -23,9 +23,9 @@ import io.bitsquare.common.viewfx.view.ViewLoader;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.main.MainView;
-import io.bitsquare.gui.main.trade.createoffer.CreateOfferView;
+import io.bitsquare.gui.main.offer.createoffer.CreateOfferView;
-import io.bitsquare.gui.main.trade.offerbook.OfferBookView;
+import io.bitsquare.gui.main.offer.offerbook.OfferBookView;
-import io.bitsquare.gui.main.trade.takeoffer.TakeOfferView;
+import io.bitsquare.gui.main.offer.takeoffer.TakeOfferView;
 import io.bitsquare.offer.Offer;
 
 import org.bitcoinj.core.Coin;
@@ -38,7 +38,7 @@ import javafx.collections.ListChangeListener;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
 
-public abstract class TradeView extends ActivatableView<TabPane, Void> {
+public abstract class OfferView extends ActivatableView<TabPane, Void> {
 
     private OfferBookView offerBookView;
     private CreateOfferView createOfferView;
@@ -54,10 +54,10 @@ public abstract class TradeView extends ActivatableView<TabPane, Void> {
     private final Navigation navigation;
     private final Offer.Direction direction;
 
-    protected TradeView(ViewLoader viewLoader, Navigation navigation) {
+    protected OfferView(ViewLoader viewLoader, Navigation navigation) {
         this.viewLoader = viewLoader;
         this.navigation = navigation;
-        this.direction = (this instanceof BuyView) ? Offer.Direction.BUY : Offer.Direction.SELL;
+        this.direction = (this instanceof BuyOfferView) ? Offer.Direction.BUY : Offer.Direction.SELL;
     }
 
     @Override
@@ -127,18 +127,18 @@ public abstract class TradeView extends ActivatableView<TabPane, Void> {
             OfferActionHandler offerActionHandler = new OfferActionHandler() {
                 @Override
                 public void createOffer(Coin amount, Fiat price) {
-                    TradeView.this.amount = amount;
+                    OfferView.this.amount = amount;
-                    TradeView.this.price = price;
+                    OfferView.this.price = price;
-                    TradeView.this.navigation.navigateTo(MainView.class, TradeView.this.getClass(),
+                    OfferView.this.navigation.navigateTo(MainView.class, OfferView.this.getClass(),
                             CreateOfferView.class);
                 }
 
                 @Override
                 public void takeOffer(Coin amount, Fiat price, Offer offer) {
-                    TradeView.this.amount = amount;
+                    OfferView.this.amount = amount;
-                    TradeView.this.price = price;
+                    OfferView.this.price = price;
-                    TradeView.this.offer = offer;
+                    OfferView.this.offer = offer;
-                    TradeView.this.navigation.navigateTo(MainView.class, TradeView.this.getClass(),
+                    OfferView.this.navigation.navigateTo(MainView.class, OfferView.this.getClass(),
                             TakeOfferView.class);
                 }
             };

core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml

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

core/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.trade;
+package io.bitsquare.gui.main.offer;
 
 import io.bitsquare.common.viewfx.view.FxmlView;
 import io.bitsquare.common.viewfx.view.ViewLoader;
@@ -24,10 +24,10 @@ import io.bitsquare.gui.Navigation;
 import javax.inject.Inject;
 
 @FxmlView
-public class BuyView extends TradeView {
+public class SellOfferView extends OfferView {
 
     @Inject
-    public BuyView(ViewLoader viewLoader, Navigation navigation) {
+    public SellOfferView(ViewLoader viewLoader, Navigation navigation) {
         super(viewLoader, navigation);
     }
 }

core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java

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

core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.fxml

@@ -27,7 +27,7 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.createoffer.CreateOfferView"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.offer.createoffer.CreateOfferView"
             xmlns:fx="http://javafx.com/fxml">
 
     <ScrollPane fx:id="scrollPane" hbarPolicy="NEVER" vbarPolicy="NEVER" fitToWidth="true" fitToHeight="true"

core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.trade.createoffer;
+package io.bitsquare.gui.main.offer.createoffer;
 
 import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
 import io.bitsquare.common.viewfx.view.FxmlView;
@@ -33,9 +33,9 @@ import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
 import io.bitsquare.gui.main.account.settings.AccountSettingsView;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
+import io.bitsquare.gui.main.offer.OfferView;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
-import io.bitsquare.gui.main.portfolio.offer.OffersView;
+import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView;
-import io.bitsquare.gui.main.trade.TradeView;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.offer.Offer;
@@ -102,7 +102,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
 
     private final Navigation navigation;
     private final OverlayManager overlayManager;
-    private TradeView.CloseHandler closeHandler;
+    private OfferView.CloseHandler closeHandler;
 
     @Inject
     private CreateOfferView(CreateOfferViewModel model, Navigation navigation,
@@ -135,7 +135,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
             imageView.setId("image-sell-large");
     }
 
-    public void setCloseHandler(TradeView.CloseHandler closeHandler) {
+    public void setCloseHandler(OfferView.CloseHandler closeHandler) {
         this.closeHandler = closeHandler;
     }
 
@@ -294,7 +294,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
             // TODO temp just for testing 
             newValue = false;
             close();
-            navigation.navigateTo(MainView.class, PortfolioView.class, OffersView.class);
+            navigation.navigateTo(MainView.class, PortfolioView.class, OpenOffersView.class);
 
             if (newValue) {
                 overlayManager.blurContent();
@@ -315,7 +315,7 @@ public class CreateOfferView extends ActivatableViewAndModel<AnchorPane, CreateO
                         getProperties().put("type", "CLOSE");
                         try {
                             close();
-                            navigation.navigateTo(MainView.class, PortfolioView.class, OffersView.class);
+                            navigation.navigateTo(MainView.class, PortfolioView.class, OpenOffersView.class);
                         } catch (Exception e) {
                             e.printStackTrace();
                         }

core/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.trade.createoffer;
+package io.bitsquare.gui.main.offer.createoffer;
 
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;

core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookDataModel.java

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

core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookListItem.java

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

core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.fxml

@@ -24,7 +24,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.trade.offerbook.OfferBookView"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.offer.offerbook.OfferBookView"
           hgap="5.0" vgap="0"
           xmlns:fx="http://javafx.com/fxml">
     <padding>

core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.trade.offerbook;
+package io.bitsquare.gui.main.offer.offerbook;
 
 import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
 import io.bitsquare.common.viewfx.view.FxmlView;
@@ -30,7 +30,7 @@ import io.bitsquare.gui.main.account.settings.AccountSettingsView;
 import io.bitsquare.gui.main.account.setup.AccountSetupWizard;
 import io.bitsquare.gui.main.funds.FundsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
-import io.bitsquare.gui.main.trade.TradeView;
+import io.bitsquare.gui.main.offer.OfferView;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.gui.util.validation.OptionalBtcValidator;
 import io.bitsquare.gui.util.validation.OptionalFiatValidator;
@@ -82,7 +82,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
     private final OverlayManager overlayManager;
     private final OptionalBtcValidator optionalBtcValidator;
     private final OptionalFiatValidator optionalFiatValidator;
-    private TradeView.OfferActionHandler offerActionHandler;
+    private OfferView.OfferActionHandler offerActionHandler;
 
     @Inject
     OfferBookView(OfferBookViewModel model,
@@ -365,7 +365,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
                 .getFiatAccountType()));
     }
 
-    public void setOfferActionHandler(TradeView.OfferActionHandler offerActionHandler) {
+    public void setOfferActionHandler(OfferView.OfferActionHandler offerActionHandler) {
         this.offerActionHandler = offerActionHandler;
     }
 

core/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java

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

core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java

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

core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.fxml

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

core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.trade.takeoffer;
+package io.bitsquare.gui.main.offer.takeoffer;
 
 
 import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
@@ -31,9 +31,9 @@ import io.bitsquare.gui.components.TitledGroupBg;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
+import io.bitsquare.gui.main.offer.OfferView;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
-import io.bitsquare.gui.main.portfolio.pending.PendingTradesView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView;
-import io.bitsquare.gui.main.trade.TradeView;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.offer.Offer;
@@ -96,7 +96,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
 
     private final Navigation navigation;
     private final OverlayManager overlayManager;
-    private TradeView.CloseHandler closeHandler;
+    private OfferView.CloseHandler closeHandler;
 
     private ChangeListener<String> errorMessageChangeListener;
 
@@ -152,7 +152,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
         showCheckAvailabilityScreen();
     }
 
-    public void setCloseHandler(TradeView.CloseHandler closeHandler) {
+    public void setCloseHandler(OfferView.CloseHandler closeHandler) {
         this.closeHandler = closeHandler;
     }
 

core/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.trade.takeoffer;
+package io.bitsquare.gui.main.offer.takeoffer;
 
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;

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

@@ -25,9 +25,9 @@ import io.bitsquare.common.viewfx.view.View;
 import io.bitsquare.common.viewfx.view.ViewLoader;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.main.MainView;
-import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView;
+import io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView;
-import io.bitsquare.gui.main.portfolio.offer.OffersView;
+import io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView;
-import io.bitsquare.gui.main.portfolio.pending.PendingTradesView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView;
 import io.bitsquare.trade.TradeManager;
 
 import javax.inject.Inject;
@@ -63,7 +63,7 @@ public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable>
 
         tabChangeListener = (ov, oldValue, newValue) -> {
             if (newValue == offersTab)
-                navigation.navigateTo(MainView.class, PortfolioView.class, OffersView.class);
+                navigation.navigateTo(MainView.class, PortfolioView.class, OpenOffersView.class);
             else if (newValue == openTradesTab)
                 navigation.navigateTo(MainView.class, PortfolioView.class, PendingTradesView.class);
             else if (newValue == closedTradesTab)
@@ -96,7 +96,7 @@ public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable>
 
         View view = viewLoader.load(viewClass);
 
-        if (view instanceof OffersView) currentTab = offersTab;
+        if (view instanceof OpenOffersView) currentTab = offersTab;
         else if (view instanceof PendingTradesView) currentTab = openTradesTab;
         else if (view instanceof ClosedTradesView) currentTab = closedTradesTab;
 

core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesDataModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.closed;
+package io.bitsquare.gui.main.portfolio.closedtrades;
 
 import io.bitsquare.common.viewfx.model.Activatable;
 import io.bitsquare.common.viewfx.model.DataModel;

core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesListItem.java

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

core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.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.main.portfolio.closed.ClosedTradesView"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView"
           hgap="5.0" vgap="5"
           xmlns:fx="http://javafx.com/fxml">
     <padding>

core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.closed;
+package io.bitsquare.gui.main.portfolio.closedtrades;
 
 import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
 import io.bitsquare.common.viewfx.view.FxmlView;

core/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.closed;
+package io.bitsquare.gui.main.portfolio.closedtrades;
 
 import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
 import io.bitsquare.common.viewfx.model.ViewModel;

core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOfferListItem.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.offer;
+package io.bitsquare.gui.main.portfolio.openoffer;
 
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.Trade;
@@ -23,11 +23,11 @@ import io.bitsquare.trade.Trade;
 /**
  * We could remove that wrapper if it is not needed for additional UI only fields.
  */
-class OfferListItem {
+class OpenOfferListItem {
 
     private final Offer offer;
 
-    public OfferListItem(Trade trade) {
+    public OpenOfferListItem(Trade trade) {
         this.offer = trade.getOffer();
     }
 

core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersDataModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.offer;
+package io.bitsquare.gui.main.portfolio.openoffer;
 
 import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
@@ -37,17 +37,17 @@ import javafx.collections.ObservableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class OffersDataModel implements Activatable, DataModel {
+class OpenOffersDataModel implements Activatable, DataModel {
-    private static final Logger log = LoggerFactory.getLogger(OffersDataModel.class);
+    private static final Logger log = LoggerFactory.getLogger(OpenOffersDataModel.class);
 
     private final TradeManager tradeManager;
     private final User user;
 
-    private final ObservableList<OfferListItem> list = FXCollections.observableArrayList();
+    private final ObservableList<OpenOfferListItem> list = FXCollections.observableArrayList();
     private final ListChangeListener<Trade> tradesListChangeListener;
 
     @Inject
-    public OffersDataModel(TradeManager tradeManager, User user) {
+    public OpenOffersDataModel(TradeManager tradeManager, User user) {
         this.tradeManager = tradeManager;
         this.user = user;
 
@@ -70,7 +70,7 @@ class OffersDataModel implements Activatable, DataModel {
     }
 
 
-    public ObservableList<OfferListItem> getList() {
+    public ObservableList<OpenOfferListItem> getList() {
         return list;
     }
 
@@ -82,7 +82,7 @@ class OffersDataModel implements Activatable, DataModel {
     private void applyList() {
         list.clear();
 
-        list.addAll(tradeManager.getOpenOfferTrades().stream().map(OfferListItem::new).collect(Collectors.toList()));
+        list.addAll(tradeManager.getOpenOfferTrades().stream().map(OpenOfferListItem::new).collect(Collectors.toList()));
 
         // we sort by date, earliest first
         list.sort((o1, o2) -> o2.getOffer().getCreationDate().compareTo(o1.getOffer().getCreationDate()));

core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.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.main.portfolio.offer.OffersView"
+<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.openoffer.OpenOffersView"
           hgap="5.0" vgap="5"
           xmlns:fx="http://javafx.com/fxml">
     <padding>

core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.offer;
+package io.bitsquare.gui.main.portfolio.openoffer;
 
 import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
 import io.bitsquare.common.viewfx.view.FxmlView;
@@ -37,15 +37,15 @@ import javafx.scene.layout.*;
 import javafx.util.Callback;
 
 @FxmlView
-public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewModel> {
+public class OpenOffersView extends ActivatableViewAndModel<GridPane, OpenOffersViewModel> {
 
-    @FXML TableView<OfferListItem> table;
+    @FXML TableView<OpenOfferListItem> table;
-    @FXML TableColumn<OfferListItem, OfferListItem> priceColumn, amountColumn, volumeColumn,
+    @FXML TableColumn<OpenOfferListItem, OpenOfferListItem> priceColumn, amountColumn, volumeColumn,
             directionColumn, dateColumn, offerIdColumn, removeItemColumn;
     private Navigation navigation;
 
     @Inject
-    public OffersView(OffersViewModel model, Navigation navigation) {
+    public OpenOffersView(OpenOffersViewModel model, Navigation navigation) {
         super(model);
         this.navigation = navigation;
     }
@@ -83,7 +83,7 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
 
     }
 
-    private void openOfferDetails(OfferListItem item) {
+    private void openOfferDetails(OpenOfferListItem item) {
         // TODO Open popup with details view
         log.debug("openOfferDetails " + item);
         Utilities.copyToClipboard(item.getOffer().getId());
@@ -96,16 +96,16 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
     private void setOfferIdColumnCellFactory() {
         offerIdColumn.setCellValueFactory((offerListItem) -> new ReadOnlyObjectWrapper<>(offerListItem.getValue()));
         offerIdColumn.setCellFactory(
-                new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem, OfferListItem>>() {
+                new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem, OpenOfferListItem>>() {
 
                     @Override
-                    public TableCell<OfferListItem, OfferListItem> call(TableColumn<OfferListItem,
+                    public TableCell<OpenOfferListItem, OpenOfferListItem> call(TableColumn<OpenOfferListItem,
-                            OfferListItem> column) {
+                            OpenOfferListItem> column) {
-                        return new TableCell<OfferListItem, OfferListItem>() {
+                        return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
                             private Hyperlink hyperlink;
 
                             @Override
-                            public void updateItem(final OfferListItem item, boolean empty) {
+                            public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
 
                                 if (item != null && !empty) {
@@ -128,14 +128,14 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
     private void setDateColumnCellFactory() {
         dateColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         dateColumn.setCellFactory(
-                new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem,
+                new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
-                        OfferListItem>>() {
+                        OpenOfferListItem>>() {
                     @Override
-                    public TableCell<OfferListItem, OfferListItem> call(
+                    public TableCell<OpenOfferListItem, OpenOfferListItem> call(
-                            TableColumn<OfferListItem, OfferListItem> column) {
+                            TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
-                        return new TableCell<OfferListItem, OfferListItem>() {
+                        return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
                             @Override
-                            public void updateItem(final OfferListItem item, boolean empty) {
+                            public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 if (item != null)
                                     setText(model.getDate(item));
@@ -150,14 +150,14 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
     private void setAmountColumnCellFactory() {
         amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         amountColumn.setCellFactory(
-                new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem,
+                new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
-                        OfferListItem>>() {
+                        OpenOfferListItem>>() {
                     @Override
-                    public TableCell<OfferListItem, OfferListItem> call(
+                    public TableCell<OpenOfferListItem, OpenOfferListItem> call(
-                            TableColumn<OfferListItem, OfferListItem> column) {
+                            TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
-                        return new TableCell<OfferListItem, OfferListItem>() {
+                        return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
                             @Override
-                            public void updateItem(final OfferListItem item, boolean empty) {
+                            public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 setText(model.getAmount(item));
                             }
@@ -169,14 +169,14 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
     private void setPriceColumnCellFactory() {
         priceColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         priceColumn.setCellFactory(
-                new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem,
+                new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
-                        OfferListItem>>() {
+                        OpenOfferListItem>>() {
                     @Override
-                    public TableCell<OfferListItem, OfferListItem> call(
+                    public TableCell<OpenOfferListItem, OpenOfferListItem> call(
-                            TableColumn<OfferListItem, OfferListItem> column) {
+                            TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
-                        return new TableCell<OfferListItem, OfferListItem>() {
+                        return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
                             @Override
-                            public void updateItem(final OfferListItem item, boolean empty) {
+                            public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 setText(model.getPrice(item));
                             }
@@ -188,14 +188,14 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
     private void setVolumeColumnCellFactory() {
         volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         volumeColumn.setCellFactory(
-                new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem,
+                new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
-                        OfferListItem>>() {
+                        OpenOfferListItem>>() {
                     @Override
-                    public TableCell<OfferListItem, OfferListItem> call(
+                    public TableCell<OpenOfferListItem, OpenOfferListItem> call(
-                            TableColumn<OfferListItem, OfferListItem> column) {
+                            TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
-                        return new TableCell<OfferListItem, OfferListItem>() {
+                        return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
                             @Override
-                            public void updateItem(final OfferListItem item, boolean empty) {
+                            public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 if (item != null)
                                     setText(model.getVolume(item));
@@ -210,14 +210,14 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
     private void setDirectionColumnCellFactory() {
         directionColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue()));
         directionColumn.setCellFactory(
-                new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem,
+                new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem,
-                        OfferListItem>>() {
+                        OpenOfferListItem>>() {
                     @Override
-                    public TableCell<OfferListItem, OfferListItem> call(
+                    public TableCell<OpenOfferListItem, OpenOfferListItem> call(
-                            TableColumn<OfferListItem, OfferListItem> column) {
+                            TableColumn<OpenOfferListItem, OpenOfferListItem> column) {
-                        return new TableCell<OfferListItem, OfferListItem>() {
+                        return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
                             @Override
-                            public void updateItem(final OfferListItem item, boolean empty) {
+                            public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 setText(model.getDirectionLabel(item));
                             }
@@ -229,11 +229,11 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
     private void setRemoveColumnCellFactory() {
         removeItemColumn.setCellValueFactory((offerListItem) -> new ReadOnlyObjectWrapper<>(offerListItem.getValue()));
         removeItemColumn.setCellFactory(
-                new Callback<TableColumn<OfferListItem, OfferListItem>, TableCell<OfferListItem, OfferListItem>>() {
+                new Callback<TableColumn<OpenOfferListItem, OpenOfferListItem>, TableCell<OpenOfferListItem, OpenOfferListItem>>() {
                     @Override
-                    public TableCell<OfferListItem, OfferListItem> call(TableColumn<OfferListItem,
+                    public TableCell<OpenOfferListItem, OpenOfferListItem> call(TableColumn<OpenOfferListItem,
-                            OfferListItem> directionColumn) {
+                            OpenOfferListItem> directionColumn) {
-                        return new TableCell<OfferListItem, OfferListItem>() {
+                        return new TableCell<OpenOfferListItem, OpenOfferListItem>() {
                             final ImageView iconView = new ImageView();
                             final Button button = new Button();
 
@@ -245,7 +245,7 @@ public class OffersView extends ActivatableViewAndModel<GridPane, OffersViewMode
                             }
 
                             @Override
-                            public void updateItem(final OfferListItem item, boolean empty) {
+                            public void updateItem(final OpenOfferListItem item, boolean empty) {
                                 super.updateItem(item, empty);
 
                                 if (item != null) {

core/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersViewModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.offer;
+package io.bitsquare.gui.main.portfolio.openoffer;
 
 import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
@@ -31,14 +31,14 @@ import javafx.collections.ObservableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class OffersViewModel extends ActivatableWithDataModel<OffersDataModel> implements ViewModel {
+class OpenOffersViewModel extends ActivatableWithDataModel<OpenOffersDataModel> implements ViewModel {
-    private static final Logger log = LoggerFactory.getLogger(OffersViewModel.class);
+    private static final Logger log = LoggerFactory.getLogger(OpenOffersViewModel.class);
 
     private final BSFormatter formatter;
 
 
     @Inject
-    public OffersViewModel(OffersDataModel dataModel, BSFormatter formatter) {
+    public OpenOffersViewModel(OpenOffersDataModel dataModel, BSFormatter formatter) {
         super(dataModel);
 
         this.formatter = formatter;
@@ -49,31 +49,31 @@ class OffersViewModel extends ActivatableWithDataModel<OffersDataModel> implemen
         dataModel.onCancelOpenOffer(offer, resultHandler, errorMessageHandler);
     }
 
-    public ObservableList<OfferListItem> getList() {
+    public ObservableList<OpenOfferListItem> getList() {
         return dataModel.getList();
     }
 
-    String getTradeId(OfferListItem item) {
+    String getTradeId(OpenOfferListItem item) {
         return item.getOffer().getId();
     }
 
-    String getAmount(OfferListItem item) {
+    String getAmount(OpenOfferListItem item) {
         return (item != null) ? formatter.formatAmountWithMinAmount(item.getOffer()) : "";
     }
 
-    String getPrice(OfferListItem item) {
+    String getPrice(OpenOfferListItem item) {
         return (item != null) ? formatter.formatFiat(item.getOffer().getPrice()) : "";
     }
 
-    String getVolume(OfferListItem item) {
+    String getVolume(OpenOfferListItem item) {
         return (item != null) ? formatter.formatVolumeWithMinVolume(item.getOffer()) : "";
     }
 
-    String getDirectionLabel(OfferListItem item) {
+    String getDirectionLabel(OpenOfferListItem item) {
         return (item != null) ? formatter.formatDirection(dataModel.getDirection(item.getOffer())) : "";
     }
 
-    String getDate(OfferListItem item) {
+    String getDate(OpenOfferListItem item) {
         return formatter.formatDateTime(item.getOffer().getCreationDate());
     }
 

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/BuyerSubView.java

@@ -15,14 +15,14 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending;
+package io.bitsquare.gui.main.portfolio.pendingtrades;
 
 import io.bitsquare.gui.components.Popups;
-import io.bitsquare.gui.main.portfolio.pending.steps.CompletedView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.CompletedView;
-import io.bitsquare.gui.main.portfolio.pending.steps.StartFiatView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.StartFiatView;
-import io.bitsquare.gui.main.portfolio.pending.steps.TradeWizardItem;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem;
-import io.bitsquare.gui.main.portfolio.pending.steps.WaitFiatReceivedView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitFiatReceivedView;
-import io.bitsquare.gui.main.portfolio.pending.steps.WaitTxInBlockchainView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitTxInBlockchainView;
 import io.bitsquare.locale.BSResources;
 
 import org.slf4j.Logger;

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending;
+package io.bitsquare.gui.main.portfolio.pendingtrades;
 
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletService;
@@ -25,7 +25,7 @@ import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.portfolio.PortfolioView;
-import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView;
+import io.bitsquare.gui.main.portfolio.closedtrades.ClosedTradesView;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.BuyerTrade;
 import io.bitsquare.trade.Contract;

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesListItem.java

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

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.fxml

@@ -22,7 +22,7 @@
 <?import javafx.scene.control.cell.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.pending.PendingTradesView"
+<VBox fx:id="root" fx:controller="io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesView"
       xmlns:fx="http://javafx.com/fxml">
 
     <AnchorPane minHeight="145" VBox.vgrow="SOMETIMES">

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesView.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending;
+package io.bitsquare.gui.main.portfolio.pendingtrades;
 
 import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
 import io.bitsquare.common.viewfx.view.FxmlView;

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending;
+package io.bitsquare.gui.main.portfolio.pendingtrades;
 
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/SellerSubView.java

@@ -15,13 +15,13 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending;
+package io.bitsquare.gui.main.portfolio.pendingtrades;
 
 import io.bitsquare.gui.components.Popups;
-import io.bitsquare.gui.main.portfolio.pending.steps.CompletedView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.CompletedView;
-import io.bitsquare.gui.main.portfolio.pending.steps.ConfirmFiatReceivedView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.ConfirmFiatReceivedView;
-import io.bitsquare.gui.main.portfolio.pending.steps.TradeWizardItem;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem;
-import io.bitsquare.gui.main.portfolio.pending.steps.WaitTxInBlockchainView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.WaitTxInBlockchainView;
 import io.bitsquare.locale.BSResources;
 
 import org.slf4j.Logger;

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/TradeSubView.java

@@ -15,10 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending;
+package io.bitsquare.gui.main.portfolio.pendingtrades;
 
-import io.bitsquare.gui.main.portfolio.pending.steps.TradeStepDetailsView;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeStepDetailsView;
-import io.bitsquare.gui.main.portfolio.pending.steps.TradeWizardItem;
+import io.bitsquare.gui.main.portfolio.pendingtrades.steps.TradeWizardItem;
 import io.bitsquare.gui.util.Layout;
 
 import javafx.beans.value.ChangeListener;

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/CompletedView.java

@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending.steps;
+package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
 import io.bitsquare.gui.components.InfoDisplay;
 import io.bitsquare.gui.components.InputTextField;
-import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel;
+import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.util.Layout;
 
 import javafx.application.Platform;

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/ConfirmFiatReceivedView.java

@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending.steps;
+package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
 import io.bitsquare.gui.components.InfoDisplay;
 import io.bitsquare.gui.components.TxIdTextField;
-import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel;
+import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.util.Layout;
 
 import javafx.beans.value.ChangeListener;

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/StartFiatView.java

@@ -15,12 +15,12 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending.steps;
+package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
 import io.bitsquare.gui.components.InfoDisplay;
 import io.bitsquare.gui.components.TextFieldWithCopyIcon;
 import io.bitsquare.gui.components.TxIdTextField;
-import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel;
+import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.util.Layout;
 import io.bitsquare.locale.BSResources;
 

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepDetailsView.java

@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending.steps;
+package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel;
+import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 
 import javafx.event.ActionEvent;
 import javafx.scene.layout.*;

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java

@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending.steps;
+package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
 import io.bitsquare.gui.util.Colors;
 

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitFiatReceivedView.java

@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending.steps;
+package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
 import io.bitsquare.gui.components.InfoDisplay;
 import io.bitsquare.gui.components.TxIdTextField;
-import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel;
+import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.util.Layout;
 
 import javafx.beans.value.ChangeListener;

core/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/WaitTxInBlockchainView.java

@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.portfolio.pending.steps;
+package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
 
 import io.bitsquare.gui.components.InfoDisplay;
 import io.bitsquare.gui.components.TxIdTextField;
-import io.bitsquare.gui.main.portfolio.pending.PendingTradesViewModel;
+import io.bitsquare.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
 import io.bitsquare.gui.util.Layout;
 
 import javafx.beans.value.ChangeListener;

core/src/main/java/io/bitsquare/offer/OfferBook.java

@@ -18,7 +18,7 @@
 package io.bitsquare.offer;
 
 import io.bitsquare.fiat.FiatAccount;
-import io.bitsquare.gui.main.trade.offerbook.OfferBookListItem;
+import io.bitsquare.gui.main.offer.offerbook.OfferBookListItem;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.trade.TradeManager;

core/src/test/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModelTest.java

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