diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 8e254a59e3..899e926ff6 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -77,7 +77,7 @@
     <dependencies>
         <dependency>
             <groupId>io.bitsquare</groupId>
-            <artifactId>gui</artifactId>
+            <artifactId>core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
diff --git a/bootstrap/target/BootstrapNodeMain.jar b/bootstrap/target/BootstrapNodeMain.jar
index f3ff781b07..6bbf9333c5 100644
Binary files a/bootstrap/target/BootstrapNodeMain.jar and b/bootstrap/target/BootstrapNodeMain.jar differ
diff --git a/bootstrap/target/maven-archiver/pom.properties b/bootstrap/target/maven-archiver/pom.properties
index 79179bc3e6..3fb5c63dcb 100644
--- a/bootstrap/target/maven-archiver/pom.properties
+++ b/bootstrap/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Mar 13 20:11:20 CET 2015
+#Fri Mar 13 20:14:44 CET 2015
 version=0.1.2-SNAPSHOT
 groupId=io.bitsquare
 artifactId=bootstrap
diff --git a/gui/pom.xml b/core/pom.xml
similarity index 99%
rename from gui/pom.xml
rename to core/pom.xml
index 590c0e32ba..06458e568c 100755
--- a/gui/pom.xml
+++ b/core/pom.xml
@@ -9,7 +9,7 @@
         <version>0.1.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>gui</artifactId>
+    <artifactId>core</artifactId>
 
     <build>
 
diff --git a/gui/src/main/java/eu/hansolo/enzo/notification/Notification.java b/core/src/main/java/eu/hansolo/enzo/notification/Notification.java
similarity index 100%
rename from gui/src/main/java/eu/hansolo/enzo/notification/Notification.java
rename to core/src/main/java/eu/hansolo/enzo/notification/Notification.java
diff --git a/gui/src/main/java/io/bitsquare/BitsquareException.java b/core/src/main/java/io/bitsquare/BitsquareException.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/BitsquareException.java
rename to core/src/main/java/io/bitsquare/BitsquareException.java
diff --git a/gui/src/main/java/io/bitsquare/BitsquareModule.java b/core/src/main/java/io/bitsquare/BitsquareModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/BitsquareModule.java
rename to core/src/main/java/io/bitsquare/BitsquareModule.java
diff --git a/gui/src/main/java/io/bitsquare/account/AccountSettings.java b/core/src/main/java/io/bitsquare/account/AccountSettings.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/account/AccountSettings.java
rename to core/src/main/java/io/bitsquare/account/AccountSettings.java
diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareEnvironment.java b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
rename to core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareExecutable.java b/core/src/main/java/io/bitsquare/app/BitsquareExecutable.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/app/BitsquareExecutable.java
rename to core/src/main/java/io/bitsquare/app/BitsquareExecutable.java
diff --git a/gui/src/main/java/io/bitsquare/app/gui/BitsquareApp.java b/core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
rename to core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
diff --git a/gui/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java b/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
rename to core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
diff --git a/gui/src/main/java/io/bitsquare/app/gui/BitsquareAppModule.java b/core/src/main/java/io/bitsquare/app/gui/BitsquareAppModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/app/gui/BitsquareAppModule.java
rename to core/src/main/java/io/bitsquare/app/gui/BitsquareAppModule.java
diff --git a/gui/src/main/java/io/bitsquare/app/gui/UpdateProcess.java b/core/src/main/java/io/bitsquare/app/gui/UpdateProcess.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/app/gui/UpdateProcess.java
rename to core/src/main/java/io/bitsquare/app/gui/UpdateProcess.java
diff --git a/gui/src/main/java/io/bitsquare/arbitrator/Arbitrator.java b/core/src/main/java/io/bitsquare/arbitrator/Arbitrator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/arbitrator/Arbitrator.java
rename to core/src/main/java/io/bitsquare/arbitrator/Arbitrator.java
diff --git a/gui/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageModule.java b/core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageModule.java
rename to core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageModule.java
diff --git a/gui/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageService.java b/core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageService.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageService.java
rename to core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageService.java
diff --git a/gui/src/main/java/io/bitsquare/arbitrator/Reputation.java b/core/src/main/java/io/bitsquare/arbitrator/Reputation.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/arbitrator/Reputation.java
rename to core/src/main/java/io/bitsquare/arbitrator/Reputation.java
diff --git a/gui/src/main/java/io/bitsquare/arbitrator/listeners/ArbitratorListener.java b/core/src/main/java/io/bitsquare/arbitrator/listeners/ArbitratorListener.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/arbitrator/listeners/ArbitratorListener.java
rename to core/src/main/java/io/bitsquare/arbitrator/listeners/ArbitratorListener.java
diff --git a/gui/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageModule.java b/core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageModule.java
rename to core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageModule.java
diff --git a/gui/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java b/core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java
rename to core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java
diff --git a/gui/src/main/java/io/bitsquare/bank/BankAccount.java b/core/src/main/java/io/bitsquare/bank/BankAccount.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/bank/BankAccount.java
rename to core/src/main/java/io/bitsquare/bank/BankAccount.java
diff --git a/gui/src/main/java/io/bitsquare/bank/BankAccountType.java b/core/src/main/java/io/bitsquare/bank/BankAccountType.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/bank/BankAccountType.java
rename to core/src/main/java/io/bitsquare/bank/BankAccountType.java
diff --git a/gui/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java b/core/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
rename to core/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
diff --git a/gui/src/main/java/io/bitsquare/btc/AddressEntry.java b/core/src/main/java/io/bitsquare/btc/AddressEntry.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/AddressEntry.java
rename to core/src/main/java/io/bitsquare/btc/AddressEntry.java
diff --git a/gui/src/main/java/io/bitsquare/btc/BitcoinModule.java b/core/src/main/java/io/bitsquare/btc/BitcoinModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/BitcoinModule.java
rename to core/src/main/java/io/bitsquare/btc/BitcoinModule.java
diff --git a/gui/src/main/java/io/bitsquare/btc/BitcoinNetwork.java b/core/src/main/java/io/bitsquare/btc/BitcoinNetwork.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/BitcoinNetwork.java
rename to core/src/main/java/io/bitsquare/btc/BitcoinNetwork.java
diff --git a/gui/src/main/java/io/bitsquare/btc/BlockChainService.java b/core/src/main/java/io/bitsquare/btc/BlockChainService.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/BlockChainService.java
rename to core/src/main/java/io/bitsquare/btc/BlockChainService.java
diff --git a/gui/src/main/java/io/bitsquare/btc/FeePolicy.java b/core/src/main/java/io/bitsquare/btc/FeePolicy.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/FeePolicy.java
rename to core/src/main/java/io/bitsquare/btc/FeePolicy.java
diff --git a/gui/src/main/java/io/bitsquare/btc/Restrictions.java b/core/src/main/java/io/bitsquare/btc/Restrictions.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/Restrictions.java
rename to core/src/main/java/io/bitsquare/btc/Restrictions.java
diff --git a/gui/src/main/java/io/bitsquare/btc/UserAgent.java b/core/src/main/java/io/bitsquare/btc/UserAgent.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/UserAgent.java
rename to core/src/main/java/io/bitsquare/btc/UserAgent.java
diff --git a/gui/src/main/java/io/bitsquare/btc/WalletService.java b/core/src/main/java/io/bitsquare/btc/WalletService.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/WalletService.java
rename to core/src/main/java/io/bitsquare/btc/WalletService.java
diff --git a/gui/src/main/java/io/bitsquare/btc/listeners/AddressConfidenceListener.java b/core/src/main/java/io/bitsquare/btc/listeners/AddressConfidenceListener.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/listeners/AddressConfidenceListener.java
rename to core/src/main/java/io/bitsquare/btc/listeners/AddressConfidenceListener.java
diff --git a/gui/src/main/java/io/bitsquare/btc/listeners/BalanceListener.java b/core/src/main/java/io/bitsquare/btc/listeners/BalanceListener.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/listeners/BalanceListener.java
rename to core/src/main/java/io/bitsquare/btc/listeners/BalanceListener.java
diff --git a/gui/src/main/java/io/bitsquare/btc/listeners/TxConfidenceListener.java b/core/src/main/java/io/bitsquare/btc/listeners/TxConfidenceListener.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/btc/listeners/TxConfidenceListener.java
rename to core/src/main/java/io/bitsquare/btc/listeners/TxConfidenceListener.java
diff --git a/gui/src/main/java/io/bitsquare/crypto/CryptoModule.java b/core/src/main/java/io/bitsquare/crypto/CryptoModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/crypto/CryptoModule.java
rename to core/src/main/java/io/bitsquare/crypto/CryptoModule.java
diff --git a/gui/src/main/java/io/bitsquare/crypto/HashService.java b/core/src/main/java/io/bitsquare/crypto/HashService.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/crypto/HashService.java
rename to core/src/main/java/io/bitsquare/crypto/HashService.java
diff --git a/gui/src/main/java/io/bitsquare/crypto/SignatureService.java b/core/src/main/java/io/bitsquare/crypto/SignatureService.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/crypto/SignatureService.java
rename to core/src/main/java/io/bitsquare/crypto/SignatureService.java
diff --git a/gui/src/main/java/io/bitsquare/gui/GuiModule.java b/core/src/main/java/io/bitsquare/gui/GuiModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/GuiModule.java
rename to core/src/main/java/io/bitsquare/gui/GuiModule.java
diff --git a/gui/src/main/java/io/bitsquare/gui/Navigation.java b/core/src/main/java/io/bitsquare/gui/Navigation.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/Navigation.java
rename to core/src/main/java/io/bitsquare/gui/Navigation.java
diff --git a/gui/src/main/java/io/bitsquare/gui/OverlayManager.java b/core/src/main/java/io/bitsquare/gui/OverlayManager.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/OverlayManager.java
rename to core/src/main/java/io/bitsquare/gui/OverlayManager.java
diff --git a/gui/src/main/java/io/bitsquare/gui/SystemTray.java b/core/src/main/java/io/bitsquare/gui/SystemTray.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/SystemTray.java
rename to core/src/main/java/io/bitsquare/gui/SystemTray.java
diff --git a/gui/src/main/java/io/bitsquare/gui/bitsquare.css b/core/src/main/java/io/bitsquare/gui/bitsquare.css
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/bitsquare.css
rename to core/src/main/java/io/bitsquare/gui/bitsquare.css
diff --git a/gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java b/core/src/main/java/io/bitsquare/gui/components/AddressTextField.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/AddressTextField.java
rename to core/src/main/java/io/bitsquare/gui/components/AddressTextField.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/BalanceTextField.java b/core/src/main/java/io/bitsquare/gui/components/BalanceTextField.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/BalanceTextField.java
rename to core/src/main/java/io/bitsquare/gui/components/BalanceTextField.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java b/core/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java
rename to core/src/main/java/io/bitsquare/gui/components/BalanceWithConfirmationTextField.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/InfoDisplay.java b/core/src/main/java/io/bitsquare/gui/components/InfoDisplay.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/InfoDisplay.java
rename to core/src/main/java/io/bitsquare/gui/components/InfoDisplay.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/InputTextField.java b/core/src/main/java/io/bitsquare/gui/components/InputTextField.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/InputTextField.java
rename to core/src/main/java/io/bitsquare/gui/components/InputTextField.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java b/core/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java
rename to core/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/Popups.java b/core/src/main/java/io/bitsquare/gui/components/Popups.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/Popups.java
rename to core/src/main/java/io/bitsquare/gui/components/Popups.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/SystemNotification.java b/core/src/main/java/io/bitsquare/gui/components/SystemNotification.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/SystemNotification.java
rename to core/src/main/java/io/bitsquare/gui/components/SystemNotification.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java b/core/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java
rename to core/src/main/java/io/bitsquare/gui/components/TextFieldWithCopyIcon.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java b/core/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java
rename to core/src/main/java/io/bitsquare/gui/components/TitledGroupBg.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/TitledSeparator.java b/core/src/main/java/io/bitsquare/gui/components/TitledSeparator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/TitledSeparator.java
rename to core/src/main/java/io/bitsquare/gui/components/TitledSeparator.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java b/core/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
rename to core/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java b/core/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
rename to core/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java b/core/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java
rename to core/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java b/core/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
rename to core/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java b/core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java
rename to core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBar.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java b/core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java
rename to core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java
diff --git a/gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java b/core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java
rename to core/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepItem.java
diff --git a/gui/src/main/java/io/bitsquare/gui/images.css b/core/src/main/java/io/bitsquare/gui/images.css
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/images.css
rename to core/src/main/java/io/bitsquare/gui/images.css
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.fxml b/core/src/main/java/io/bitsquare/gui/main/MainView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/MainView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/MainView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.java b/core/src/main/java/io/bitsquare/gui/main/MainView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/MainView.java
rename to core/src/main/java/io/bitsquare/gui/main/MainView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/AccountView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/AccountView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml b/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
rename to core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml b/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml
rename to core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
rename to core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
rename to core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml b/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
rename to core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java b/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java
rename to core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsListItem.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml b/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
rename to core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java b/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java
rename to core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalListItem.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml b/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
rename to core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/help/Help.java b/core/src/main/java/io/bitsquare/gui/main/help/Help.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/help/Help.java
rename to core/src/main/java/io/bitsquare/gui/main/help/Help.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/help/HelpId.java b/core/src/main/java/io/bitsquare/gui/main/help/HelpId.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/help/HelpId.java
rename to core/src/main/java/io/bitsquare/gui/main/help/HelpId.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml b/core/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/home/HomeView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java b/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/home/HomeView.java
rename to core/src/main/java/io/bitsquare/gui/main/home/HomeView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml b/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/msg/MsgView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
rename to core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml b/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesListItem.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesListItem.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesListItem.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesListItem.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OpenOfferListItem.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OpenOfferListItem.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OpenOfferListItem.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OpenOfferListItem.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesListItem.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml b/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
rename to core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
rename to core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml b/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
rename to core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml b/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/trade/BuyView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/BuyView.java b/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml b/core/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/trade/SellView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/SellView.java b/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/SellView.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/SellView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/TradeView.java b/core/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookListItem.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml
rename to core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.fxml
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
rename to core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/core/src/main/java/io/bitsquare/gui/util/BSFormatter.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
rename to core/src/main/java/io/bitsquare/gui/util/BSFormatter.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/Colors.java b/core/src/main/java/io/bitsquare/gui/util/Colors.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/Colors.java
rename to core/src/main/java/io/bitsquare/gui/util/Colors.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java b/core/src/main/java/io/bitsquare/gui/util/ImageUtil.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/ImageUtil.java
rename to core/src/main/java/io/bitsquare/gui/util/ImageUtil.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/Profiler.java b/core/src/main/java/io/bitsquare/gui/util/Profiler.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/Profiler.java
rename to core/src/main/java/io/bitsquare/gui/util/Profiler.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/Transitions.java b/core/src/main/java/io/bitsquare/gui/util/Transitions.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/Transitions.java
rename to core/src/main/java/io/bitsquare/gui/util/Transitions.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java
rename to core/src/main/java/io/bitsquare/gui/util/validation/BankAccountNumberValidator.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
rename to core/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java
rename to core/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
rename to core/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java
rename to core/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java
rename to core/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
rename to core/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java
rename to core/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java
rename to core/src/main/java/io/bitsquare/gui/util/validation/PasswordValidator.java
diff --git a/gui/src/main/java/io/bitsquare/locale/BSResources.java b/core/src/main/java/io/bitsquare/locale/BSResources.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/locale/BSResources.java
rename to core/src/main/java/io/bitsquare/locale/BSResources.java
diff --git a/gui/src/main/java/io/bitsquare/locale/Country.java b/core/src/main/java/io/bitsquare/locale/Country.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/locale/Country.java
rename to core/src/main/java/io/bitsquare/locale/Country.java
diff --git a/gui/src/main/java/io/bitsquare/locale/CountryUtil.java b/core/src/main/java/io/bitsquare/locale/CountryUtil.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/locale/CountryUtil.java
rename to core/src/main/java/io/bitsquare/locale/CountryUtil.java
diff --git a/gui/src/main/java/io/bitsquare/locale/CurrencyUtil.java b/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/locale/CurrencyUtil.java
rename to core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
diff --git a/gui/src/main/java/io/bitsquare/locale/LanguageUtil.java b/core/src/main/java/io/bitsquare/locale/LanguageUtil.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/locale/LanguageUtil.java
rename to core/src/main/java/io/bitsquare/locale/LanguageUtil.java
diff --git a/gui/src/main/java/io/bitsquare/locale/Region.java b/core/src/main/java/io/bitsquare/locale/Region.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/locale/Region.java
rename to core/src/main/java/io/bitsquare/locale/Region.java
diff --git a/gui/src/main/java/io/bitsquare/modena.css b/core/src/main/java/io/bitsquare/modena.css
similarity index 100%
rename from gui/src/main/java/io/bitsquare/modena.css
rename to core/src/main/java/io/bitsquare/modena.css
diff --git a/gui/src/main/java/io/bitsquare/network/BootstrapNodes.java b/core/src/main/java/io/bitsquare/network/BootstrapNodes.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/BootstrapNodes.java
rename to core/src/main/java/io/bitsquare/network/BootstrapNodes.java
diff --git a/gui/src/main/java/io/bitsquare/network/BootstrapState.java b/core/src/main/java/io/bitsquare/network/BootstrapState.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/BootstrapState.java
rename to core/src/main/java/io/bitsquare/network/BootstrapState.java
diff --git a/gui/src/main/java/io/bitsquare/network/ClientNode.java b/core/src/main/java/io/bitsquare/network/ClientNode.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/ClientNode.java
rename to core/src/main/java/io/bitsquare/network/ClientNode.java
diff --git a/gui/src/main/java/io/bitsquare/network/ConnectionType.java b/core/src/main/java/io/bitsquare/network/ConnectionType.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/ConnectionType.java
rename to core/src/main/java/io/bitsquare/network/ConnectionType.java
diff --git a/gui/src/main/java/io/bitsquare/network/Message.java b/core/src/main/java/io/bitsquare/network/Message.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/Message.java
rename to core/src/main/java/io/bitsquare/network/Message.java
diff --git a/gui/src/main/java/io/bitsquare/network/MessageBroker.java b/core/src/main/java/io/bitsquare/network/MessageBroker.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/MessageBroker.java
rename to core/src/main/java/io/bitsquare/network/MessageBroker.java
diff --git a/gui/src/main/java/io/bitsquare/network/NetworkException.java b/core/src/main/java/io/bitsquare/network/NetworkException.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/NetworkException.java
rename to core/src/main/java/io/bitsquare/network/NetworkException.java
diff --git a/gui/src/main/java/io/bitsquare/network/NetworkModule.java b/core/src/main/java/io/bitsquare/network/NetworkModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/NetworkModule.java
rename to core/src/main/java/io/bitsquare/network/NetworkModule.java
diff --git a/gui/src/main/java/io/bitsquare/network/Node.java b/core/src/main/java/io/bitsquare/network/Node.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/Node.java
rename to core/src/main/java/io/bitsquare/network/Node.java
diff --git a/gui/src/main/java/io/bitsquare/network/Peer.java b/core/src/main/java/io/bitsquare/network/Peer.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/Peer.java
rename to core/src/main/java/io/bitsquare/network/Peer.java
diff --git a/gui/src/main/java/io/bitsquare/network/tomp2p/BootstrappedPeerBuilder.java b/core/src/main/java/io/bitsquare/network/tomp2p/BootstrappedPeerBuilder.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/tomp2p/BootstrappedPeerBuilder.java
rename to core/src/main/java/io/bitsquare/network/tomp2p/BootstrappedPeerBuilder.java
diff --git a/gui/src/main/java/io/bitsquare/network/tomp2p/TomP2PNetworkModule.java b/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNetworkModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/tomp2p/TomP2PNetworkModule.java
rename to core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNetworkModule.java
diff --git a/gui/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java b/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java
rename to core/src/main/java/io/bitsquare/network/tomp2p/TomP2PNode.java
diff --git a/gui/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java b/core/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java
rename to core/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java
diff --git a/gui/src/main/java/io/bitsquare/offer/Direction.java b/core/src/main/java/io/bitsquare/offer/Direction.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/offer/Direction.java
rename to core/src/main/java/io/bitsquare/offer/Direction.java
diff --git a/gui/src/main/java/io/bitsquare/offer/Offer.java b/core/src/main/java/io/bitsquare/offer/Offer.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/offer/Offer.java
rename to core/src/main/java/io/bitsquare/offer/Offer.java
diff --git a/gui/src/main/java/io/bitsquare/offer/OfferBook.java b/core/src/main/java/io/bitsquare/offer/OfferBook.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/offer/OfferBook.java
rename to core/src/main/java/io/bitsquare/offer/OfferBook.java
diff --git a/gui/src/main/java/io/bitsquare/offer/OfferBookService.java b/core/src/main/java/io/bitsquare/offer/OfferBookService.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/offer/OfferBookService.java
rename to core/src/main/java/io/bitsquare/offer/OfferBookService.java
diff --git a/gui/src/main/java/io/bitsquare/offer/OfferModule.java b/core/src/main/java/io/bitsquare/offer/OfferModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/offer/OfferModule.java
rename to core/src/main/java/io/bitsquare/offer/OfferModule.java
diff --git a/gui/src/main/java/io/bitsquare/offer/OpenOffer.java b/core/src/main/java/io/bitsquare/offer/OpenOffer.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/offer/OpenOffer.java
rename to core/src/main/java/io/bitsquare/offer/OpenOffer.java
diff --git a/gui/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java b/core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java
rename to core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java
diff --git a/gui/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferModule.java b/core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferModule.java
rename to core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferModule.java
diff --git a/gui/src/main/java/io/bitsquare/persistence/Persistence.java b/core/src/main/java/io/bitsquare/persistence/Persistence.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/persistence/Persistence.java
rename to core/src/main/java/io/bitsquare/persistence/Persistence.java
diff --git a/gui/src/main/java/io/bitsquare/settings/Preferences.java b/core/src/main/java/io/bitsquare/settings/Preferences.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/settings/Preferences.java
rename to core/src/main/java/io/bitsquare/settings/Preferences.java
diff --git a/gui/src/main/java/io/bitsquare/trade/Contract.java b/core/src/main/java/io/bitsquare/trade/Contract.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/Contract.java
rename to core/src/main/java/io/bitsquare/trade/Contract.java
diff --git a/gui/src/main/java/io/bitsquare/trade/Trade.java b/core/src/main/java/io/bitsquare/trade/Trade.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/Trade.java
rename to core/src/main/java/io/bitsquare/trade/Trade.java
diff --git a/gui/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/TradeManager.java
rename to core/src/main/java/io/bitsquare/trade/TradeManager.java
diff --git a/gui/src/main/java/io/bitsquare/trade/TradeMessageModule.java b/core/src/main/java/io/bitsquare/trade/TradeMessageModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/TradeMessageModule.java
rename to core/src/main/java/io/bitsquare/trade/TradeMessageModule.java
diff --git a/gui/src/main/java/io/bitsquare/trade/TradeMessageService.java b/core/src/main/java/io/bitsquare/trade/TradeMessageService.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/TradeMessageService.java
rename to core/src/main/java/io/bitsquare/trade/TradeMessageService.java
diff --git a/gui/src/main/java/io/bitsquare/trade/TradeModule.java b/core/src/main/java/io/bitsquare/trade/TradeModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/TradeModule.java
rename to core/src/main/java/io/bitsquare/trade/TradeModule.java
diff --git a/gui/src/main/java/io/bitsquare/trade/handlers/MessageHandler.java b/core/src/main/java/io/bitsquare/trade/handlers/MessageHandler.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/handlers/MessageHandler.java
rename to core/src/main/java/io/bitsquare/trade/handlers/MessageHandler.java
diff --git a/gui/src/main/java/io/bitsquare/trade/handlers/TransactionResultHandler.java b/core/src/main/java/io/bitsquare/trade/handlers/TransactionResultHandler.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/handlers/TransactionResultHandler.java
rename to core/src/main/java/io/bitsquare/trade/handlers/TransactionResultHandler.java
diff --git a/gui/src/main/java/io/bitsquare/trade/listeners/GetPeerAddressListener.java b/core/src/main/java/io/bitsquare/trade/listeners/GetPeerAddressListener.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/listeners/GetPeerAddressListener.java
rename to core/src/main/java/io/bitsquare/trade/listeners/GetPeerAddressListener.java
diff --git a/gui/src/main/java/io/bitsquare/trade/listeners/SendMessageListener.java b/core/src/main/java/io/bitsquare/trade/listeners/SendMessageListener.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/listeners/SendMessageListener.java
rename to core/src/main/java/io/bitsquare/trade/listeners/SendMessageListener.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
rename to core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
rename to core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/availability/messages/ReportOfferAvailabilityMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/ReportOfferAvailabilityMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/availability/messages/ReportOfferAvailabilityMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/availability/messages/ReportOfferAvailabilityMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/availability/messages/RequestIsOfferAvailableMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/messages/RequestIsOfferAvailableMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/availability/messages/RequestIsOfferAvailableMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/availability/messages/RequestIsOfferAvailableMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
rename to core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
rename to core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java
rename to core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
rename to core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
rename to core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java
rename to core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
rename to core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
rename to core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/OfferMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/OfferMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/OfferMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/OfferMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/TradeMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/TradeMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/TradeMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/TradeSharedModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeSharedModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/TradeSharedModel.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/TradeSharedModel.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferStartedMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferStartedMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/BankTransferStartedMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/DepositTxPublishedMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RespondToTakeOfferRequestMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/TakerDepositPaymentRequestMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/TakerDepositPaymentRequestMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/TakerDepositPaymentRequestMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/TakerDepositPaymentRequestMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/PayoutTxPublishedMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestTakeOfferMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/TakeOfferFeePayedMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessTakerDepositPaymentRequestMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessTakerDepositPaymentRequestMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessTakerDepositPaymentRequestMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessTakerDepositPaymentRequestMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
rename to core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
diff --git a/gui/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageModule.java b/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageModule.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageModule.java
rename to core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageModule.java
diff --git a/gui/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java b/core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
rename to core/src/main/java/io/bitsquare/trade/tomp2p/TomP2PTradeMessageService.java
diff --git a/gui/src/main/java/io/bitsquare/user/User.java b/core/src/main/java/io/bitsquare/user/User.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/user/User.java
rename to core/src/main/java/io/bitsquare/user/User.java
diff --git a/gui/src/main/java/io/bitsquare/util/Bytes.java b/core/src/main/java/io/bitsquare/util/Bytes.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/Bytes.java
rename to core/src/main/java/io/bitsquare/util/Bytes.java
diff --git a/gui/src/main/java/io/bitsquare/util/DSAKeyUtil.java b/core/src/main/java/io/bitsquare/util/DSAKeyUtil.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/DSAKeyUtil.java
rename to core/src/main/java/io/bitsquare/util/DSAKeyUtil.java
diff --git a/gui/src/main/java/io/bitsquare/util/DesktopUtil.java b/core/src/main/java/io/bitsquare/util/DesktopUtil.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/DesktopUtil.java
rename to core/src/main/java/io/bitsquare/util/DesktopUtil.java
diff --git a/gui/src/main/java/io/bitsquare/util/MessageHandler.java b/core/src/main/java/io/bitsquare/util/MessageHandler.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/MessageHandler.java
rename to core/src/main/java/io/bitsquare/util/MessageHandler.java
diff --git a/gui/src/main/java/io/bitsquare/util/Utilities.java b/core/src/main/java/io/bitsquare/util/Utilities.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/Utilities.java
rename to core/src/main/java/io/bitsquare/util/Utilities.java
diff --git a/gui/src/main/java/io/bitsquare/util/Validator.java b/core/src/main/java/io/bitsquare/util/Validator.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/Validator.java
rename to core/src/main/java/io/bitsquare/util/Validator.java
diff --git a/gui/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java b/core/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java
rename to core/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java
diff --git a/gui/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java b/core/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java
rename to core/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java
diff --git a/gui/src/main/java/io/bitsquare/util/handlers/FaultHandler.java b/core/src/main/java/io/bitsquare/util/handlers/FaultHandler.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/handlers/FaultHandler.java
rename to core/src/main/java/io/bitsquare/util/handlers/FaultHandler.java
diff --git a/gui/src/main/java/io/bitsquare/util/handlers/ResultHandler.java b/core/src/main/java/io/bitsquare/util/handlers/ResultHandler.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/handlers/ResultHandler.java
rename to core/src/main/java/io/bitsquare/util/handlers/ResultHandler.java
diff --git a/gui/src/main/java/io/bitsquare/util/joptsimple/EnumValueConverter.java b/core/src/main/java/io/bitsquare/util/joptsimple/EnumValueConverter.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/joptsimple/EnumValueConverter.java
rename to core/src/main/java/io/bitsquare/util/joptsimple/EnumValueConverter.java
diff --git a/gui/src/main/java/io/bitsquare/util/spring/JOptCommandLinePropertySource.java b/core/src/main/java/io/bitsquare/util/spring/JOptCommandLinePropertySource.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/spring/JOptCommandLinePropertySource.java
rename to core/src/main/java/io/bitsquare/util/spring/JOptCommandLinePropertySource.java
diff --git a/gui/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java b/core/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java
rename to core/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java
diff --git a/gui/src/main/java/io/bitsquare/util/taskrunner/SharedModel.java b/core/src/main/java/io/bitsquare/util/taskrunner/SharedModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/taskrunner/SharedModel.java
rename to core/src/main/java/io/bitsquare/util/taskrunner/SharedModel.java
diff --git a/gui/src/main/java/io/bitsquare/util/taskrunner/Task.java b/core/src/main/java/io/bitsquare/util/taskrunner/Task.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/taskrunner/Task.java
rename to core/src/main/java/io/bitsquare/util/taskrunner/Task.java
diff --git a/gui/src/main/java/io/bitsquare/util/taskrunner/TaskRunner.java b/core/src/main/java/io/bitsquare/util/taskrunner/TaskRunner.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/util/taskrunner/TaskRunner.java
rename to core/src/main/java/io/bitsquare/util/taskrunner/TaskRunner.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/ViewfxException.java b/core/src/main/java/io/bitsquare/viewfx/ViewfxException.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/ViewfxException.java
rename to core/src/main/java/io/bitsquare/viewfx/ViewfxException.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/model/Activatable.java b/core/src/main/java/io/bitsquare/viewfx/model/Activatable.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/model/Activatable.java
rename to core/src/main/java/io/bitsquare/viewfx/model/Activatable.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/model/ActivatableWithDataModel.java b/core/src/main/java/io/bitsquare/viewfx/model/ActivatableWithDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/model/ActivatableWithDataModel.java
rename to core/src/main/java/io/bitsquare/viewfx/model/ActivatableWithDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/model/DataModel.java b/core/src/main/java/io/bitsquare/viewfx/model/DataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/model/DataModel.java
rename to core/src/main/java/io/bitsquare/viewfx/model/DataModel.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/model/Model.java b/core/src/main/java/io/bitsquare/viewfx/model/Model.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/model/Model.java
rename to core/src/main/java/io/bitsquare/viewfx/model/Model.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/model/ViewModel.java b/core/src/main/java/io/bitsquare/viewfx/model/ViewModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/model/ViewModel.java
rename to core/src/main/java/io/bitsquare/viewfx/model/ViewModel.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/model/WithDataModel.java b/core/src/main/java/io/bitsquare/viewfx/model/WithDataModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/model/WithDataModel.java
rename to core/src/main/java/io/bitsquare/viewfx/model/WithDataModel.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/AbstractView.java b/core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/AbstractView.java
rename to core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/ActivatableView.java b/core/src/main/java/io/bitsquare/viewfx/view/ActivatableView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/ActivatableView.java
rename to core/src/main/java/io/bitsquare/viewfx/view/ActivatableView.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/ActivatableViewAndModel.java b/core/src/main/java/io/bitsquare/viewfx/view/ActivatableViewAndModel.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/ActivatableViewAndModel.java
rename to core/src/main/java/io/bitsquare/viewfx/view/ActivatableViewAndModel.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java b/core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java
rename to core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/DefaultPathConvention.java b/core/src/main/java/io/bitsquare/viewfx/view/DefaultPathConvention.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/DefaultPathConvention.java
rename to core/src/main/java/io/bitsquare/viewfx/view/DefaultPathConvention.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/FxmlView.java b/core/src/main/java/io/bitsquare/viewfx/view/FxmlView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/FxmlView.java
rename to core/src/main/java/io/bitsquare/viewfx/view/FxmlView.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/InitializableView.java b/core/src/main/java/io/bitsquare/viewfx/view/InitializableView.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/InitializableView.java
rename to core/src/main/java/io/bitsquare/viewfx/view/InitializableView.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/View.java b/core/src/main/java/io/bitsquare/viewfx/view/View.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/View.java
rename to core/src/main/java/io/bitsquare/viewfx/view/View.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/ViewFactory.java b/core/src/main/java/io/bitsquare/viewfx/view/ViewFactory.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/ViewFactory.java
rename to core/src/main/java/io/bitsquare/viewfx/view/ViewFactory.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/ViewLoader.java b/core/src/main/java/io/bitsquare/viewfx/view/ViewLoader.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/ViewLoader.java
rename to core/src/main/java/io/bitsquare/viewfx/view/ViewLoader.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/ViewPath.java b/core/src/main/java/io/bitsquare/viewfx/view/ViewPath.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/ViewPath.java
rename to core/src/main/java/io/bitsquare/viewfx/view/ViewPath.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/Wizard.java b/core/src/main/java/io/bitsquare/viewfx/view/Wizard.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/Wizard.java
rename to core/src/main/java/io/bitsquare/viewfx/view/Wizard.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java b/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
rename to core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
diff --git a/gui/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java b/core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java
similarity index 100%
rename from gui/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java
rename to core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java
diff --git a/gui/src/main/resources/bitsquare.properties b/core/src/main/resources/bitsquare.properties
similarity index 100%
rename from gui/src/main/resources/bitsquare.properties
rename to core/src/main/resources/bitsquare.properties
diff --git a/gui/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
similarity index 100%
rename from gui/src/main/resources/i18n/displayStrings.properties
rename to core/src/main/resources/i18n/displayStrings.properties
diff --git a/gui/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties
similarity index 100%
rename from gui/src/main/resources/i18n/displayStrings_de.properties
rename to core/src/main/resources/i18n/displayStrings_de.properties
diff --git a/gui/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties
similarity index 100%
rename from gui/src/main/resources/i18n/displayStrings_es.properties
rename to core/src/main/resources/i18n/displayStrings_es.properties
diff --git a/gui/src/main/resources/i18n/displayStrings_sv_SE.properties b/core/src/main/resources/i18n/displayStrings_sv_SE.properties
similarity index 100%
rename from gui/src/main/resources/i18n/displayStrings_sv_SE.properties
rename to core/src/main/resources/i18n/displayStrings_sv_SE.properties
diff --git a/gui/src/main/resources/images/alert_round.png b/core/src/main/resources/images/alert_round.png
similarity index 100%
rename from gui/src/main/resources/images/alert_round.png
rename to core/src/main/resources/images/alert_round.png
diff --git a/gui/src/main/resources/images/alert_round@2x.png b/core/src/main/resources/images/alert_round@2x.png
similarity index 100%
rename from gui/src/main/resources/images/alert_round@2x.png
rename to core/src/main/resources/images/alert_round@2x.png
diff --git a/gui/src/main/resources/images/arrow_blue.png b/core/src/main/resources/images/arrow_blue.png
similarity index 100%
rename from gui/src/main/resources/images/arrow_blue.png
rename to core/src/main/resources/images/arrow_blue.png
diff --git a/gui/src/main/resources/images/arrow_blue@2x.png b/core/src/main/resources/images/arrow_blue@2x.png
similarity index 100%
rename from gui/src/main/resources/images/arrow_blue@2x.png
rename to core/src/main/resources/images/arrow_blue@2x.png
diff --git a/gui/src/main/resources/images/arrow_grey.png b/core/src/main/resources/images/arrow_grey.png
similarity index 100%
rename from gui/src/main/resources/images/arrow_grey.png
rename to core/src/main/resources/images/arrow_grey.png
diff --git a/gui/src/main/resources/images/arrow_grey@2x.png b/core/src/main/resources/images/arrow_grey@2x.png
similarity index 100%
rename from gui/src/main/resources/images/arrow_grey@2x.png
rename to core/src/main/resources/images/arrow_grey@2x.png
diff --git a/gui/src/main/resources/images/buy.png b/core/src/main/resources/images/buy.png
similarity index 100%
rename from gui/src/main/resources/images/buy.png
rename to core/src/main/resources/images/buy.png
diff --git a/gui/src/main/resources/images/buy@2x.png b/core/src/main/resources/images/buy@2x.png
similarity index 100%
rename from gui/src/main/resources/images/buy@2x.png
rename to core/src/main/resources/images/buy@2x.png
diff --git a/gui/src/main/resources/images/buy_large.png b/core/src/main/resources/images/buy_large.png
similarity index 100%
rename from gui/src/main/resources/images/buy_large.png
rename to core/src/main/resources/images/buy_large.png
diff --git a/gui/src/main/resources/images/buy_large@2x.png b/core/src/main/resources/images/buy_large@2x.png
similarity index 100%
rename from gui/src/main/resources/images/buy_large@2x.png
rename to core/src/main/resources/images/buy_large@2x.png
diff --git a/gui/src/main/resources/images/collapse.png b/core/src/main/resources/images/collapse.png
similarity index 100%
rename from gui/src/main/resources/images/collapse.png
rename to core/src/main/resources/images/collapse.png
diff --git a/gui/src/main/resources/images/collapse@2x.png b/core/src/main/resources/images/collapse@2x.png
similarity index 100%
rename from gui/src/main/resources/images/collapse@2x.png
rename to core/src/main/resources/images/collapse@2x.png
diff --git a/gui/src/main/resources/images/connection/direct.png b/core/src/main/resources/images/connection/direct.png
similarity index 100%
rename from gui/src/main/resources/images/connection/direct.png
rename to core/src/main/resources/images/connection/direct.png
diff --git a/gui/src/main/resources/images/connection/direct@2x.png b/core/src/main/resources/images/connection/direct@2x.png
similarity index 100%
rename from gui/src/main/resources/images/connection/direct@2x.png
rename to core/src/main/resources/images/connection/direct@2x.png
diff --git a/gui/src/main/resources/images/connection/nat.png b/core/src/main/resources/images/connection/nat.png
similarity index 100%
rename from gui/src/main/resources/images/connection/nat.png
rename to core/src/main/resources/images/connection/nat.png
diff --git a/gui/src/main/resources/images/connection/nat@2x.png b/core/src/main/resources/images/connection/nat@2x.png
similarity index 100%
rename from gui/src/main/resources/images/connection/nat@2x.png
rename to core/src/main/resources/images/connection/nat@2x.png
diff --git a/gui/src/main/resources/images/connection/relay.png b/core/src/main/resources/images/connection/relay.png
similarity index 100%
rename from gui/src/main/resources/images/connection/relay.png
rename to core/src/main/resources/images/connection/relay.png
diff --git a/gui/src/main/resources/images/connection/relay@2x.png b/core/src/main/resources/images/connection/relay@2x.png
similarity index 100%
rename from gui/src/main/resources/images/connection/relay@2x.png
rename to core/src/main/resources/images/connection/relay@2x.png
diff --git a/gui/src/main/resources/images/connection/synced.png b/core/src/main/resources/images/connection/synced.png
similarity index 100%
rename from gui/src/main/resources/images/connection/synced.png
rename to core/src/main/resources/images/connection/synced.png
diff --git a/gui/src/main/resources/images/connection/synced@2x.png b/core/src/main/resources/images/connection/synced@2x.png
similarity index 100%
rename from gui/src/main/resources/images/connection/synced@2x.png
rename to core/src/main/resources/images/connection/synced@2x.png
diff --git a/gui/src/main/resources/images/countries/ad.png b/core/src/main/resources/images/countries/ad.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ad.png
rename to core/src/main/resources/images/countries/ad.png
diff --git a/gui/src/main/resources/images/countries/ae.png b/core/src/main/resources/images/countries/ae.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ae.png
rename to core/src/main/resources/images/countries/ae.png
diff --git a/gui/src/main/resources/images/countries/af.png b/core/src/main/resources/images/countries/af.png
similarity index 100%
rename from gui/src/main/resources/images/countries/af.png
rename to core/src/main/resources/images/countries/af.png
diff --git a/gui/src/main/resources/images/countries/ag.png b/core/src/main/resources/images/countries/ag.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ag.png
rename to core/src/main/resources/images/countries/ag.png
diff --git a/gui/src/main/resources/images/countries/ai.png b/core/src/main/resources/images/countries/ai.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ai.png
rename to core/src/main/resources/images/countries/ai.png
diff --git a/gui/src/main/resources/images/countries/al.png b/core/src/main/resources/images/countries/al.png
similarity index 100%
rename from gui/src/main/resources/images/countries/al.png
rename to core/src/main/resources/images/countries/al.png
diff --git a/gui/src/main/resources/images/countries/am.png b/core/src/main/resources/images/countries/am.png
similarity index 100%
rename from gui/src/main/resources/images/countries/am.png
rename to core/src/main/resources/images/countries/am.png
diff --git a/gui/src/main/resources/images/countries/an.png b/core/src/main/resources/images/countries/an.png
similarity index 100%
rename from gui/src/main/resources/images/countries/an.png
rename to core/src/main/resources/images/countries/an.png
diff --git a/gui/src/main/resources/images/countries/ao.png b/core/src/main/resources/images/countries/ao.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ao.png
rename to core/src/main/resources/images/countries/ao.png
diff --git a/gui/src/main/resources/images/countries/ar.png b/core/src/main/resources/images/countries/ar.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ar.png
rename to core/src/main/resources/images/countries/ar.png
diff --git a/gui/src/main/resources/images/countries/as.png b/core/src/main/resources/images/countries/as.png
similarity index 100%
rename from gui/src/main/resources/images/countries/as.png
rename to core/src/main/resources/images/countries/as.png
diff --git a/gui/src/main/resources/images/countries/at.png b/core/src/main/resources/images/countries/at.png
similarity index 100%
rename from gui/src/main/resources/images/countries/at.png
rename to core/src/main/resources/images/countries/at.png
diff --git a/gui/src/main/resources/images/countries/au.png b/core/src/main/resources/images/countries/au.png
similarity index 100%
rename from gui/src/main/resources/images/countries/au.png
rename to core/src/main/resources/images/countries/au.png
diff --git a/gui/src/main/resources/images/countries/aw.png b/core/src/main/resources/images/countries/aw.png
similarity index 100%
rename from gui/src/main/resources/images/countries/aw.png
rename to core/src/main/resources/images/countries/aw.png
diff --git a/gui/src/main/resources/images/countries/ax.png b/core/src/main/resources/images/countries/ax.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ax.png
rename to core/src/main/resources/images/countries/ax.png
diff --git a/gui/src/main/resources/images/countries/az.png b/core/src/main/resources/images/countries/az.png
similarity index 100%
rename from gui/src/main/resources/images/countries/az.png
rename to core/src/main/resources/images/countries/az.png
diff --git a/gui/src/main/resources/images/countries/ba.png b/core/src/main/resources/images/countries/ba.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ba.png
rename to core/src/main/resources/images/countries/ba.png
diff --git a/gui/src/main/resources/images/countries/bb.png b/core/src/main/resources/images/countries/bb.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bb.png
rename to core/src/main/resources/images/countries/bb.png
diff --git a/gui/src/main/resources/images/countries/bd.png b/core/src/main/resources/images/countries/bd.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bd.png
rename to core/src/main/resources/images/countries/bd.png
diff --git a/gui/src/main/resources/images/countries/be.png b/core/src/main/resources/images/countries/be.png
similarity index 100%
rename from gui/src/main/resources/images/countries/be.png
rename to core/src/main/resources/images/countries/be.png
diff --git a/gui/src/main/resources/images/countries/bf.png b/core/src/main/resources/images/countries/bf.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bf.png
rename to core/src/main/resources/images/countries/bf.png
diff --git a/gui/src/main/resources/images/countries/bg.png b/core/src/main/resources/images/countries/bg.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bg.png
rename to core/src/main/resources/images/countries/bg.png
diff --git a/gui/src/main/resources/images/countries/bh.png b/core/src/main/resources/images/countries/bh.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bh.png
rename to core/src/main/resources/images/countries/bh.png
diff --git a/gui/src/main/resources/images/countries/bi.png b/core/src/main/resources/images/countries/bi.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bi.png
rename to core/src/main/resources/images/countries/bi.png
diff --git a/gui/src/main/resources/images/countries/bj.png b/core/src/main/resources/images/countries/bj.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bj.png
rename to core/src/main/resources/images/countries/bj.png
diff --git a/gui/src/main/resources/images/countries/bm.png b/core/src/main/resources/images/countries/bm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bm.png
rename to core/src/main/resources/images/countries/bm.png
diff --git a/gui/src/main/resources/images/countries/bn.png b/core/src/main/resources/images/countries/bn.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bn.png
rename to core/src/main/resources/images/countries/bn.png
diff --git a/gui/src/main/resources/images/countries/bo.png b/core/src/main/resources/images/countries/bo.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bo.png
rename to core/src/main/resources/images/countries/bo.png
diff --git a/gui/src/main/resources/images/countries/br.png b/core/src/main/resources/images/countries/br.png
similarity index 100%
rename from gui/src/main/resources/images/countries/br.png
rename to core/src/main/resources/images/countries/br.png
diff --git a/gui/src/main/resources/images/countries/bs.png b/core/src/main/resources/images/countries/bs.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bs.png
rename to core/src/main/resources/images/countries/bs.png
diff --git a/gui/src/main/resources/images/countries/bt.png b/core/src/main/resources/images/countries/bt.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bt.png
rename to core/src/main/resources/images/countries/bt.png
diff --git a/gui/src/main/resources/images/countries/bv.png b/core/src/main/resources/images/countries/bv.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bv.png
rename to core/src/main/resources/images/countries/bv.png
diff --git a/gui/src/main/resources/images/countries/bw.png b/core/src/main/resources/images/countries/bw.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bw.png
rename to core/src/main/resources/images/countries/bw.png
diff --git a/gui/src/main/resources/images/countries/by.png b/core/src/main/resources/images/countries/by.png
similarity index 100%
rename from gui/src/main/resources/images/countries/by.png
rename to core/src/main/resources/images/countries/by.png
diff --git a/gui/src/main/resources/images/countries/bz.png b/core/src/main/resources/images/countries/bz.png
similarity index 100%
rename from gui/src/main/resources/images/countries/bz.png
rename to core/src/main/resources/images/countries/bz.png
diff --git a/gui/src/main/resources/images/countries/ca.png b/core/src/main/resources/images/countries/ca.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ca.png
rename to core/src/main/resources/images/countries/ca.png
diff --git a/gui/src/main/resources/images/countries/catalonia.png b/core/src/main/resources/images/countries/catalonia.png
similarity index 100%
rename from gui/src/main/resources/images/countries/catalonia.png
rename to core/src/main/resources/images/countries/catalonia.png
diff --git a/gui/src/main/resources/images/countries/cc.png b/core/src/main/resources/images/countries/cc.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cc.png
rename to core/src/main/resources/images/countries/cc.png
diff --git a/gui/src/main/resources/images/countries/cd.png b/core/src/main/resources/images/countries/cd.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cd.png
rename to core/src/main/resources/images/countries/cd.png
diff --git a/gui/src/main/resources/images/countries/cf.png b/core/src/main/resources/images/countries/cf.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cf.png
rename to core/src/main/resources/images/countries/cf.png
diff --git a/gui/src/main/resources/images/countries/cg.png b/core/src/main/resources/images/countries/cg.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cg.png
rename to core/src/main/resources/images/countries/cg.png
diff --git a/gui/src/main/resources/images/countries/ch.png b/core/src/main/resources/images/countries/ch.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ch.png
rename to core/src/main/resources/images/countries/ch.png
diff --git a/gui/src/main/resources/images/countries/ci.png b/core/src/main/resources/images/countries/ci.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ci.png
rename to core/src/main/resources/images/countries/ci.png
diff --git a/gui/src/main/resources/images/countries/ck.png b/core/src/main/resources/images/countries/ck.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ck.png
rename to core/src/main/resources/images/countries/ck.png
diff --git a/gui/src/main/resources/images/countries/cl.png b/core/src/main/resources/images/countries/cl.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cl.png
rename to core/src/main/resources/images/countries/cl.png
diff --git a/gui/src/main/resources/images/countries/cm.png b/core/src/main/resources/images/countries/cm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cm.png
rename to core/src/main/resources/images/countries/cm.png
diff --git a/gui/src/main/resources/images/countries/cn.png b/core/src/main/resources/images/countries/cn.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cn.png
rename to core/src/main/resources/images/countries/cn.png
diff --git a/gui/src/main/resources/images/countries/co.png b/core/src/main/resources/images/countries/co.png
similarity index 100%
rename from gui/src/main/resources/images/countries/co.png
rename to core/src/main/resources/images/countries/co.png
diff --git a/gui/src/main/resources/images/countries/cr.png b/core/src/main/resources/images/countries/cr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cr.png
rename to core/src/main/resources/images/countries/cr.png
diff --git a/gui/src/main/resources/images/countries/cs.png b/core/src/main/resources/images/countries/cs.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cs.png
rename to core/src/main/resources/images/countries/cs.png
diff --git a/gui/src/main/resources/images/countries/cu.png b/core/src/main/resources/images/countries/cu.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cu.png
rename to core/src/main/resources/images/countries/cu.png
diff --git a/gui/src/main/resources/images/countries/cv.png b/core/src/main/resources/images/countries/cv.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cv.png
rename to core/src/main/resources/images/countries/cv.png
diff --git a/gui/src/main/resources/images/countries/cx.png b/core/src/main/resources/images/countries/cx.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cx.png
rename to core/src/main/resources/images/countries/cx.png
diff --git a/gui/src/main/resources/images/countries/cy.png b/core/src/main/resources/images/countries/cy.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cy.png
rename to core/src/main/resources/images/countries/cy.png
diff --git a/gui/src/main/resources/images/countries/cz.png b/core/src/main/resources/images/countries/cz.png
similarity index 100%
rename from gui/src/main/resources/images/countries/cz.png
rename to core/src/main/resources/images/countries/cz.png
diff --git a/gui/src/main/resources/images/countries/de.png b/core/src/main/resources/images/countries/de.png
similarity index 100%
rename from gui/src/main/resources/images/countries/de.png
rename to core/src/main/resources/images/countries/de.png
diff --git a/gui/src/main/resources/images/countries/dj.png b/core/src/main/resources/images/countries/dj.png
similarity index 100%
rename from gui/src/main/resources/images/countries/dj.png
rename to core/src/main/resources/images/countries/dj.png
diff --git a/gui/src/main/resources/images/countries/dk.png b/core/src/main/resources/images/countries/dk.png
similarity index 100%
rename from gui/src/main/resources/images/countries/dk.png
rename to core/src/main/resources/images/countries/dk.png
diff --git a/gui/src/main/resources/images/countries/dm.png b/core/src/main/resources/images/countries/dm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/dm.png
rename to core/src/main/resources/images/countries/dm.png
diff --git a/gui/src/main/resources/images/countries/do.png b/core/src/main/resources/images/countries/do.png
similarity index 100%
rename from gui/src/main/resources/images/countries/do.png
rename to core/src/main/resources/images/countries/do.png
diff --git a/gui/src/main/resources/images/countries/dz.png b/core/src/main/resources/images/countries/dz.png
similarity index 100%
rename from gui/src/main/resources/images/countries/dz.png
rename to core/src/main/resources/images/countries/dz.png
diff --git a/gui/src/main/resources/images/countries/ec.png b/core/src/main/resources/images/countries/ec.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ec.png
rename to core/src/main/resources/images/countries/ec.png
diff --git a/gui/src/main/resources/images/countries/ee.png b/core/src/main/resources/images/countries/ee.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ee.png
rename to core/src/main/resources/images/countries/ee.png
diff --git a/gui/src/main/resources/images/countries/eg.png b/core/src/main/resources/images/countries/eg.png
similarity index 100%
rename from gui/src/main/resources/images/countries/eg.png
rename to core/src/main/resources/images/countries/eg.png
diff --git a/gui/src/main/resources/images/countries/eh.png b/core/src/main/resources/images/countries/eh.png
similarity index 100%
rename from gui/src/main/resources/images/countries/eh.png
rename to core/src/main/resources/images/countries/eh.png
diff --git a/gui/src/main/resources/images/countries/england.png b/core/src/main/resources/images/countries/england.png
similarity index 100%
rename from gui/src/main/resources/images/countries/england.png
rename to core/src/main/resources/images/countries/england.png
diff --git a/gui/src/main/resources/images/countries/er.png b/core/src/main/resources/images/countries/er.png
similarity index 100%
rename from gui/src/main/resources/images/countries/er.png
rename to core/src/main/resources/images/countries/er.png
diff --git a/gui/src/main/resources/images/countries/es.png b/core/src/main/resources/images/countries/es.png
similarity index 100%
rename from gui/src/main/resources/images/countries/es.png
rename to core/src/main/resources/images/countries/es.png
diff --git a/gui/src/main/resources/images/countries/et.png b/core/src/main/resources/images/countries/et.png
similarity index 100%
rename from gui/src/main/resources/images/countries/et.png
rename to core/src/main/resources/images/countries/et.png
diff --git a/gui/src/main/resources/images/countries/eu.png b/core/src/main/resources/images/countries/eu.png
similarity index 100%
rename from gui/src/main/resources/images/countries/eu.png
rename to core/src/main/resources/images/countries/eu.png
diff --git a/gui/src/main/resources/images/countries/fam.png b/core/src/main/resources/images/countries/fam.png
similarity index 100%
rename from gui/src/main/resources/images/countries/fam.png
rename to core/src/main/resources/images/countries/fam.png
diff --git a/gui/src/main/resources/images/countries/fi.png b/core/src/main/resources/images/countries/fi.png
similarity index 100%
rename from gui/src/main/resources/images/countries/fi.png
rename to core/src/main/resources/images/countries/fi.png
diff --git a/gui/src/main/resources/images/countries/fj.png b/core/src/main/resources/images/countries/fj.png
similarity index 100%
rename from gui/src/main/resources/images/countries/fj.png
rename to core/src/main/resources/images/countries/fj.png
diff --git a/gui/src/main/resources/images/countries/fk.png b/core/src/main/resources/images/countries/fk.png
similarity index 100%
rename from gui/src/main/resources/images/countries/fk.png
rename to core/src/main/resources/images/countries/fk.png
diff --git a/gui/src/main/resources/images/countries/fm.png b/core/src/main/resources/images/countries/fm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/fm.png
rename to core/src/main/resources/images/countries/fm.png
diff --git a/gui/src/main/resources/images/countries/fo.png b/core/src/main/resources/images/countries/fo.png
similarity index 100%
rename from gui/src/main/resources/images/countries/fo.png
rename to core/src/main/resources/images/countries/fo.png
diff --git a/gui/src/main/resources/images/countries/fr.png b/core/src/main/resources/images/countries/fr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/fr.png
rename to core/src/main/resources/images/countries/fr.png
diff --git a/gui/src/main/resources/images/countries/ga.png b/core/src/main/resources/images/countries/ga.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ga.png
rename to core/src/main/resources/images/countries/ga.png
diff --git a/gui/src/main/resources/images/countries/gd.png b/core/src/main/resources/images/countries/gd.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gd.png
rename to core/src/main/resources/images/countries/gd.png
diff --git a/gui/src/main/resources/images/countries/ge.png b/core/src/main/resources/images/countries/ge.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ge.png
rename to core/src/main/resources/images/countries/ge.png
diff --git a/gui/src/main/resources/images/countries/gf.png b/core/src/main/resources/images/countries/gf.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gf.png
rename to core/src/main/resources/images/countries/gf.png
diff --git a/gui/src/main/resources/images/countries/gh.png b/core/src/main/resources/images/countries/gh.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gh.png
rename to core/src/main/resources/images/countries/gh.png
diff --git a/gui/src/main/resources/images/countries/gi.png b/core/src/main/resources/images/countries/gi.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gi.png
rename to core/src/main/resources/images/countries/gi.png
diff --git a/gui/src/main/resources/images/countries/gl.png b/core/src/main/resources/images/countries/gl.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gl.png
rename to core/src/main/resources/images/countries/gl.png
diff --git a/gui/src/main/resources/images/countries/gm.png b/core/src/main/resources/images/countries/gm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gm.png
rename to core/src/main/resources/images/countries/gm.png
diff --git a/gui/src/main/resources/images/countries/gn.png b/core/src/main/resources/images/countries/gn.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gn.png
rename to core/src/main/resources/images/countries/gn.png
diff --git a/gui/src/main/resources/images/countries/gp.png b/core/src/main/resources/images/countries/gp.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gp.png
rename to core/src/main/resources/images/countries/gp.png
diff --git a/gui/src/main/resources/images/countries/gq.png b/core/src/main/resources/images/countries/gq.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gq.png
rename to core/src/main/resources/images/countries/gq.png
diff --git a/gui/src/main/resources/images/countries/gr.png b/core/src/main/resources/images/countries/gr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gr.png
rename to core/src/main/resources/images/countries/gr.png
diff --git a/gui/src/main/resources/images/countries/gs.png b/core/src/main/resources/images/countries/gs.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gs.png
rename to core/src/main/resources/images/countries/gs.png
diff --git a/gui/src/main/resources/images/countries/gt.png b/core/src/main/resources/images/countries/gt.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gt.png
rename to core/src/main/resources/images/countries/gt.png
diff --git a/gui/src/main/resources/images/countries/gu.png b/core/src/main/resources/images/countries/gu.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gu.png
rename to core/src/main/resources/images/countries/gu.png
diff --git a/gui/src/main/resources/images/countries/gw.png b/core/src/main/resources/images/countries/gw.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gw.png
rename to core/src/main/resources/images/countries/gw.png
diff --git a/gui/src/main/resources/images/countries/gy.png b/core/src/main/resources/images/countries/gy.png
similarity index 100%
rename from gui/src/main/resources/images/countries/gy.png
rename to core/src/main/resources/images/countries/gy.png
diff --git a/gui/src/main/resources/images/countries/hk.png b/core/src/main/resources/images/countries/hk.png
similarity index 100%
rename from gui/src/main/resources/images/countries/hk.png
rename to core/src/main/resources/images/countries/hk.png
diff --git a/gui/src/main/resources/images/countries/hm.png b/core/src/main/resources/images/countries/hm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/hm.png
rename to core/src/main/resources/images/countries/hm.png
diff --git a/gui/src/main/resources/images/countries/hn.png b/core/src/main/resources/images/countries/hn.png
similarity index 100%
rename from gui/src/main/resources/images/countries/hn.png
rename to core/src/main/resources/images/countries/hn.png
diff --git a/gui/src/main/resources/images/countries/hr.png b/core/src/main/resources/images/countries/hr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/hr.png
rename to core/src/main/resources/images/countries/hr.png
diff --git a/gui/src/main/resources/images/countries/ht.png b/core/src/main/resources/images/countries/ht.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ht.png
rename to core/src/main/resources/images/countries/ht.png
diff --git a/gui/src/main/resources/images/countries/hu.png b/core/src/main/resources/images/countries/hu.png
similarity index 100%
rename from gui/src/main/resources/images/countries/hu.png
rename to core/src/main/resources/images/countries/hu.png
diff --git a/gui/src/main/resources/images/countries/id.png b/core/src/main/resources/images/countries/id.png
similarity index 100%
rename from gui/src/main/resources/images/countries/id.png
rename to core/src/main/resources/images/countries/id.png
diff --git a/gui/src/main/resources/images/countries/ie.png b/core/src/main/resources/images/countries/ie.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ie.png
rename to core/src/main/resources/images/countries/ie.png
diff --git a/gui/src/main/resources/images/countries/il.png b/core/src/main/resources/images/countries/il.png
similarity index 100%
rename from gui/src/main/resources/images/countries/il.png
rename to core/src/main/resources/images/countries/il.png
diff --git a/gui/src/main/resources/images/countries/in.png b/core/src/main/resources/images/countries/in.png
similarity index 100%
rename from gui/src/main/resources/images/countries/in.png
rename to core/src/main/resources/images/countries/in.png
diff --git a/gui/src/main/resources/images/countries/io.png b/core/src/main/resources/images/countries/io.png
similarity index 100%
rename from gui/src/main/resources/images/countries/io.png
rename to core/src/main/resources/images/countries/io.png
diff --git a/gui/src/main/resources/images/countries/iq.png b/core/src/main/resources/images/countries/iq.png
similarity index 100%
rename from gui/src/main/resources/images/countries/iq.png
rename to core/src/main/resources/images/countries/iq.png
diff --git a/gui/src/main/resources/images/countries/ir.png b/core/src/main/resources/images/countries/ir.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ir.png
rename to core/src/main/resources/images/countries/ir.png
diff --git a/gui/src/main/resources/images/countries/is.png b/core/src/main/resources/images/countries/is.png
similarity index 100%
rename from gui/src/main/resources/images/countries/is.png
rename to core/src/main/resources/images/countries/is.png
diff --git a/gui/src/main/resources/images/countries/it.png b/core/src/main/resources/images/countries/it.png
similarity index 100%
rename from gui/src/main/resources/images/countries/it.png
rename to core/src/main/resources/images/countries/it.png
diff --git a/gui/src/main/resources/images/countries/jm.png b/core/src/main/resources/images/countries/jm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/jm.png
rename to core/src/main/resources/images/countries/jm.png
diff --git a/gui/src/main/resources/images/countries/jo.png b/core/src/main/resources/images/countries/jo.png
similarity index 100%
rename from gui/src/main/resources/images/countries/jo.png
rename to core/src/main/resources/images/countries/jo.png
diff --git a/gui/src/main/resources/images/countries/jp.png b/core/src/main/resources/images/countries/jp.png
similarity index 100%
rename from gui/src/main/resources/images/countries/jp.png
rename to core/src/main/resources/images/countries/jp.png
diff --git a/gui/src/main/resources/images/countries/ke.png b/core/src/main/resources/images/countries/ke.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ke.png
rename to core/src/main/resources/images/countries/ke.png
diff --git a/gui/src/main/resources/images/countries/kg.png b/core/src/main/resources/images/countries/kg.png
similarity index 100%
rename from gui/src/main/resources/images/countries/kg.png
rename to core/src/main/resources/images/countries/kg.png
diff --git a/gui/src/main/resources/images/countries/kh.png b/core/src/main/resources/images/countries/kh.png
similarity index 100%
rename from gui/src/main/resources/images/countries/kh.png
rename to core/src/main/resources/images/countries/kh.png
diff --git a/gui/src/main/resources/images/countries/ki.png b/core/src/main/resources/images/countries/ki.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ki.png
rename to core/src/main/resources/images/countries/ki.png
diff --git a/gui/src/main/resources/images/countries/km.png b/core/src/main/resources/images/countries/km.png
similarity index 100%
rename from gui/src/main/resources/images/countries/km.png
rename to core/src/main/resources/images/countries/km.png
diff --git a/gui/src/main/resources/images/countries/kn.png b/core/src/main/resources/images/countries/kn.png
similarity index 100%
rename from gui/src/main/resources/images/countries/kn.png
rename to core/src/main/resources/images/countries/kn.png
diff --git a/gui/src/main/resources/images/countries/kp.png b/core/src/main/resources/images/countries/kp.png
similarity index 100%
rename from gui/src/main/resources/images/countries/kp.png
rename to core/src/main/resources/images/countries/kp.png
diff --git a/gui/src/main/resources/images/countries/kr.png b/core/src/main/resources/images/countries/kr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/kr.png
rename to core/src/main/resources/images/countries/kr.png
diff --git a/gui/src/main/resources/images/countries/kw.png b/core/src/main/resources/images/countries/kw.png
similarity index 100%
rename from gui/src/main/resources/images/countries/kw.png
rename to core/src/main/resources/images/countries/kw.png
diff --git a/gui/src/main/resources/images/countries/ky.png b/core/src/main/resources/images/countries/ky.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ky.png
rename to core/src/main/resources/images/countries/ky.png
diff --git a/gui/src/main/resources/images/countries/kz.png b/core/src/main/resources/images/countries/kz.png
similarity index 100%
rename from gui/src/main/resources/images/countries/kz.png
rename to core/src/main/resources/images/countries/kz.png
diff --git a/gui/src/main/resources/images/countries/la.png b/core/src/main/resources/images/countries/la.png
similarity index 100%
rename from gui/src/main/resources/images/countries/la.png
rename to core/src/main/resources/images/countries/la.png
diff --git a/gui/src/main/resources/images/countries/lb.png b/core/src/main/resources/images/countries/lb.png
similarity index 100%
rename from gui/src/main/resources/images/countries/lb.png
rename to core/src/main/resources/images/countries/lb.png
diff --git a/gui/src/main/resources/images/countries/lc.png b/core/src/main/resources/images/countries/lc.png
similarity index 100%
rename from gui/src/main/resources/images/countries/lc.png
rename to core/src/main/resources/images/countries/lc.png
diff --git a/gui/src/main/resources/images/countries/li.png b/core/src/main/resources/images/countries/li.png
similarity index 100%
rename from gui/src/main/resources/images/countries/li.png
rename to core/src/main/resources/images/countries/li.png
diff --git a/gui/src/main/resources/images/countries/lk.png b/core/src/main/resources/images/countries/lk.png
similarity index 100%
rename from gui/src/main/resources/images/countries/lk.png
rename to core/src/main/resources/images/countries/lk.png
diff --git a/gui/src/main/resources/images/countries/lr.png b/core/src/main/resources/images/countries/lr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/lr.png
rename to core/src/main/resources/images/countries/lr.png
diff --git a/gui/src/main/resources/images/countries/ls.png b/core/src/main/resources/images/countries/ls.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ls.png
rename to core/src/main/resources/images/countries/ls.png
diff --git a/gui/src/main/resources/images/countries/lt.png b/core/src/main/resources/images/countries/lt.png
similarity index 100%
rename from gui/src/main/resources/images/countries/lt.png
rename to core/src/main/resources/images/countries/lt.png
diff --git a/gui/src/main/resources/images/countries/lu.png b/core/src/main/resources/images/countries/lu.png
similarity index 100%
rename from gui/src/main/resources/images/countries/lu.png
rename to core/src/main/resources/images/countries/lu.png
diff --git a/gui/src/main/resources/images/countries/lv.png b/core/src/main/resources/images/countries/lv.png
similarity index 100%
rename from gui/src/main/resources/images/countries/lv.png
rename to core/src/main/resources/images/countries/lv.png
diff --git a/gui/src/main/resources/images/countries/ly.png b/core/src/main/resources/images/countries/ly.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ly.png
rename to core/src/main/resources/images/countries/ly.png
diff --git a/gui/src/main/resources/images/countries/ma.png b/core/src/main/resources/images/countries/ma.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ma.png
rename to core/src/main/resources/images/countries/ma.png
diff --git a/gui/src/main/resources/images/countries/mc.png b/core/src/main/resources/images/countries/mc.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mc.png
rename to core/src/main/resources/images/countries/mc.png
diff --git a/gui/src/main/resources/images/countries/md.png b/core/src/main/resources/images/countries/md.png
similarity index 100%
rename from gui/src/main/resources/images/countries/md.png
rename to core/src/main/resources/images/countries/md.png
diff --git a/gui/src/main/resources/images/countries/me.png b/core/src/main/resources/images/countries/me.png
similarity index 100%
rename from gui/src/main/resources/images/countries/me.png
rename to core/src/main/resources/images/countries/me.png
diff --git a/gui/src/main/resources/images/countries/mg.png b/core/src/main/resources/images/countries/mg.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mg.png
rename to core/src/main/resources/images/countries/mg.png
diff --git a/gui/src/main/resources/images/countries/mh.png b/core/src/main/resources/images/countries/mh.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mh.png
rename to core/src/main/resources/images/countries/mh.png
diff --git a/gui/src/main/resources/images/countries/mk.png b/core/src/main/resources/images/countries/mk.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mk.png
rename to core/src/main/resources/images/countries/mk.png
diff --git a/gui/src/main/resources/images/countries/ml.png b/core/src/main/resources/images/countries/ml.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ml.png
rename to core/src/main/resources/images/countries/ml.png
diff --git a/gui/src/main/resources/images/countries/mm.png b/core/src/main/resources/images/countries/mm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mm.png
rename to core/src/main/resources/images/countries/mm.png
diff --git a/gui/src/main/resources/images/countries/mn.png b/core/src/main/resources/images/countries/mn.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mn.png
rename to core/src/main/resources/images/countries/mn.png
diff --git a/gui/src/main/resources/images/countries/mo.png b/core/src/main/resources/images/countries/mo.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mo.png
rename to core/src/main/resources/images/countries/mo.png
diff --git a/gui/src/main/resources/images/countries/mp.png b/core/src/main/resources/images/countries/mp.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mp.png
rename to core/src/main/resources/images/countries/mp.png
diff --git a/gui/src/main/resources/images/countries/mq.png b/core/src/main/resources/images/countries/mq.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mq.png
rename to core/src/main/resources/images/countries/mq.png
diff --git a/gui/src/main/resources/images/countries/mr.png b/core/src/main/resources/images/countries/mr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mr.png
rename to core/src/main/resources/images/countries/mr.png
diff --git a/gui/src/main/resources/images/countries/ms.png b/core/src/main/resources/images/countries/ms.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ms.png
rename to core/src/main/resources/images/countries/ms.png
diff --git a/gui/src/main/resources/images/countries/mt.png b/core/src/main/resources/images/countries/mt.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mt.png
rename to core/src/main/resources/images/countries/mt.png
diff --git a/gui/src/main/resources/images/countries/mu.png b/core/src/main/resources/images/countries/mu.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mu.png
rename to core/src/main/resources/images/countries/mu.png
diff --git a/gui/src/main/resources/images/countries/mv.png b/core/src/main/resources/images/countries/mv.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mv.png
rename to core/src/main/resources/images/countries/mv.png
diff --git a/gui/src/main/resources/images/countries/mw.png b/core/src/main/resources/images/countries/mw.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mw.png
rename to core/src/main/resources/images/countries/mw.png
diff --git a/gui/src/main/resources/images/countries/mx.png b/core/src/main/resources/images/countries/mx.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mx.png
rename to core/src/main/resources/images/countries/mx.png
diff --git a/gui/src/main/resources/images/countries/my.png b/core/src/main/resources/images/countries/my.png
similarity index 100%
rename from gui/src/main/resources/images/countries/my.png
rename to core/src/main/resources/images/countries/my.png
diff --git a/gui/src/main/resources/images/countries/mz.png b/core/src/main/resources/images/countries/mz.png
similarity index 100%
rename from gui/src/main/resources/images/countries/mz.png
rename to core/src/main/resources/images/countries/mz.png
diff --git a/gui/src/main/resources/images/countries/na.png b/core/src/main/resources/images/countries/na.png
similarity index 100%
rename from gui/src/main/resources/images/countries/na.png
rename to core/src/main/resources/images/countries/na.png
diff --git a/gui/src/main/resources/images/countries/nc.png b/core/src/main/resources/images/countries/nc.png
similarity index 100%
rename from gui/src/main/resources/images/countries/nc.png
rename to core/src/main/resources/images/countries/nc.png
diff --git a/gui/src/main/resources/images/countries/ne.png b/core/src/main/resources/images/countries/ne.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ne.png
rename to core/src/main/resources/images/countries/ne.png
diff --git a/gui/src/main/resources/images/countries/nf.png b/core/src/main/resources/images/countries/nf.png
similarity index 100%
rename from gui/src/main/resources/images/countries/nf.png
rename to core/src/main/resources/images/countries/nf.png
diff --git a/gui/src/main/resources/images/countries/ng.png b/core/src/main/resources/images/countries/ng.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ng.png
rename to core/src/main/resources/images/countries/ng.png
diff --git a/gui/src/main/resources/images/countries/ni.png b/core/src/main/resources/images/countries/ni.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ni.png
rename to core/src/main/resources/images/countries/ni.png
diff --git a/gui/src/main/resources/images/countries/nl.png b/core/src/main/resources/images/countries/nl.png
similarity index 100%
rename from gui/src/main/resources/images/countries/nl.png
rename to core/src/main/resources/images/countries/nl.png
diff --git a/gui/src/main/resources/images/countries/no.png b/core/src/main/resources/images/countries/no.png
similarity index 100%
rename from gui/src/main/resources/images/countries/no.png
rename to core/src/main/resources/images/countries/no.png
diff --git a/gui/src/main/resources/images/countries/np.png b/core/src/main/resources/images/countries/np.png
similarity index 100%
rename from gui/src/main/resources/images/countries/np.png
rename to core/src/main/resources/images/countries/np.png
diff --git a/gui/src/main/resources/images/countries/nr.png b/core/src/main/resources/images/countries/nr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/nr.png
rename to core/src/main/resources/images/countries/nr.png
diff --git a/gui/src/main/resources/images/countries/nu.png b/core/src/main/resources/images/countries/nu.png
similarity index 100%
rename from gui/src/main/resources/images/countries/nu.png
rename to core/src/main/resources/images/countries/nu.png
diff --git a/gui/src/main/resources/images/countries/nz.png b/core/src/main/resources/images/countries/nz.png
similarity index 100%
rename from gui/src/main/resources/images/countries/nz.png
rename to core/src/main/resources/images/countries/nz.png
diff --git a/gui/src/main/resources/images/countries/om.png b/core/src/main/resources/images/countries/om.png
similarity index 100%
rename from gui/src/main/resources/images/countries/om.png
rename to core/src/main/resources/images/countries/om.png
diff --git a/gui/src/main/resources/images/countries/pa.png b/core/src/main/resources/images/countries/pa.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pa.png
rename to core/src/main/resources/images/countries/pa.png
diff --git a/gui/src/main/resources/images/countries/pe.png b/core/src/main/resources/images/countries/pe.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pe.png
rename to core/src/main/resources/images/countries/pe.png
diff --git a/gui/src/main/resources/images/countries/pf.png b/core/src/main/resources/images/countries/pf.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pf.png
rename to core/src/main/resources/images/countries/pf.png
diff --git a/gui/src/main/resources/images/countries/pg.png b/core/src/main/resources/images/countries/pg.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pg.png
rename to core/src/main/resources/images/countries/pg.png
diff --git a/gui/src/main/resources/images/countries/ph.png b/core/src/main/resources/images/countries/ph.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ph.png
rename to core/src/main/resources/images/countries/ph.png
diff --git a/gui/src/main/resources/images/countries/pk.png b/core/src/main/resources/images/countries/pk.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pk.png
rename to core/src/main/resources/images/countries/pk.png
diff --git a/gui/src/main/resources/images/countries/pl.png b/core/src/main/resources/images/countries/pl.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pl.png
rename to core/src/main/resources/images/countries/pl.png
diff --git a/gui/src/main/resources/images/countries/pm.png b/core/src/main/resources/images/countries/pm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pm.png
rename to core/src/main/resources/images/countries/pm.png
diff --git a/gui/src/main/resources/images/countries/pn.png b/core/src/main/resources/images/countries/pn.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pn.png
rename to core/src/main/resources/images/countries/pn.png
diff --git a/gui/src/main/resources/images/countries/pr.png b/core/src/main/resources/images/countries/pr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pr.png
rename to core/src/main/resources/images/countries/pr.png
diff --git a/gui/src/main/resources/images/countries/ps.png b/core/src/main/resources/images/countries/ps.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ps.png
rename to core/src/main/resources/images/countries/ps.png
diff --git a/gui/src/main/resources/images/countries/pt.png b/core/src/main/resources/images/countries/pt.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pt.png
rename to core/src/main/resources/images/countries/pt.png
diff --git a/gui/src/main/resources/images/countries/pw.png b/core/src/main/resources/images/countries/pw.png
similarity index 100%
rename from gui/src/main/resources/images/countries/pw.png
rename to core/src/main/resources/images/countries/pw.png
diff --git a/gui/src/main/resources/images/countries/py.png b/core/src/main/resources/images/countries/py.png
similarity index 100%
rename from gui/src/main/resources/images/countries/py.png
rename to core/src/main/resources/images/countries/py.png
diff --git a/gui/src/main/resources/images/countries/qa.png b/core/src/main/resources/images/countries/qa.png
similarity index 100%
rename from gui/src/main/resources/images/countries/qa.png
rename to core/src/main/resources/images/countries/qa.png
diff --git a/gui/src/main/resources/images/countries/re.png b/core/src/main/resources/images/countries/re.png
similarity index 100%
rename from gui/src/main/resources/images/countries/re.png
rename to core/src/main/resources/images/countries/re.png
diff --git a/gui/src/main/resources/images/countries/ro.png b/core/src/main/resources/images/countries/ro.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ro.png
rename to core/src/main/resources/images/countries/ro.png
diff --git a/gui/src/main/resources/images/countries/rs.png b/core/src/main/resources/images/countries/rs.png
similarity index 100%
rename from gui/src/main/resources/images/countries/rs.png
rename to core/src/main/resources/images/countries/rs.png
diff --git a/gui/src/main/resources/images/countries/ru.png b/core/src/main/resources/images/countries/ru.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ru.png
rename to core/src/main/resources/images/countries/ru.png
diff --git a/gui/src/main/resources/images/countries/rw.png b/core/src/main/resources/images/countries/rw.png
similarity index 100%
rename from gui/src/main/resources/images/countries/rw.png
rename to core/src/main/resources/images/countries/rw.png
diff --git a/gui/src/main/resources/images/countries/sa.png b/core/src/main/resources/images/countries/sa.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sa.png
rename to core/src/main/resources/images/countries/sa.png
diff --git a/gui/src/main/resources/images/countries/sb.png b/core/src/main/resources/images/countries/sb.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sb.png
rename to core/src/main/resources/images/countries/sb.png
diff --git a/gui/src/main/resources/images/countries/sc.png b/core/src/main/resources/images/countries/sc.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sc.png
rename to core/src/main/resources/images/countries/sc.png
diff --git a/gui/src/main/resources/images/countries/scotland.png b/core/src/main/resources/images/countries/scotland.png
similarity index 100%
rename from gui/src/main/resources/images/countries/scotland.png
rename to core/src/main/resources/images/countries/scotland.png
diff --git a/gui/src/main/resources/images/countries/sd.png b/core/src/main/resources/images/countries/sd.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sd.png
rename to core/src/main/resources/images/countries/sd.png
diff --git a/gui/src/main/resources/images/countries/se.png b/core/src/main/resources/images/countries/se.png
similarity index 100%
rename from gui/src/main/resources/images/countries/se.png
rename to core/src/main/resources/images/countries/se.png
diff --git a/gui/src/main/resources/images/countries/sg.png b/core/src/main/resources/images/countries/sg.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sg.png
rename to core/src/main/resources/images/countries/sg.png
diff --git a/gui/src/main/resources/images/countries/sh.png b/core/src/main/resources/images/countries/sh.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sh.png
rename to core/src/main/resources/images/countries/sh.png
diff --git a/gui/src/main/resources/images/countries/si.png b/core/src/main/resources/images/countries/si.png
similarity index 100%
rename from gui/src/main/resources/images/countries/si.png
rename to core/src/main/resources/images/countries/si.png
diff --git a/gui/src/main/resources/images/countries/sj.png b/core/src/main/resources/images/countries/sj.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sj.png
rename to core/src/main/resources/images/countries/sj.png
diff --git a/gui/src/main/resources/images/countries/sk.png b/core/src/main/resources/images/countries/sk.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sk.png
rename to core/src/main/resources/images/countries/sk.png
diff --git a/gui/src/main/resources/images/countries/sl.png b/core/src/main/resources/images/countries/sl.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sl.png
rename to core/src/main/resources/images/countries/sl.png
diff --git a/gui/src/main/resources/images/countries/sm.png b/core/src/main/resources/images/countries/sm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sm.png
rename to core/src/main/resources/images/countries/sm.png
diff --git a/gui/src/main/resources/images/countries/sn.png b/core/src/main/resources/images/countries/sn.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sn.png
rename to core/src/main/resources/images/countries/sn.png
diff --git a/gui/src/main/resources/images/countries/so.png b/core/src/main/resources/images/countries/so.png
similarity index 100%
rename from gui/src/main/resources/images/countries/so.png
rename to core/src/main/resources/images/countries/so.png
diff --git a/gui/src/main/resources/images/countries/sr.png b/core/src/main/resources/images/countries/sr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sr.png
rename to core/src/main/resources/images/countries/sr.png
diff --git a/gui/src/main/resources/images/countries/st.png b/core/src/main/resources/images/countries/st.png
similarity index 100%
rename from gui/src/main/resources/images/countries/st.png
rename to core/src/main/resources/images/countries/st.png
diff --git a/gui/src/main/resources/images/countries/sv.png b/core/src/main/resources/images/countries/sv.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sv.png
rename to core/src/main/resources/images/countries/sv.png
diff --git a/gui/src/main/resources/images/countries/sy.png b/core/src/main/resources/images/countries/sy.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sy.png
rename to core/src/main/resources/images/countries/sy.png
diff --git a/gui/src/main/resources/images/countries/sz.png b/core/src/main/resources/images/countries/sz.png
similarity index 100%
rename from gui/src/main/resources/images/countries/sz.png
rename to core/src/main/resources/images/countries/sz.png
diff --git a/gui/src/main/resources/images/countries/tc.png b/core/src/main/resources/images/countries/tc.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tc.png
rename to core/src/main/resources/images/countries/tc.png
diff --git a/gui/src/main/resources/images/countries/td.png b/core/src/main/resources/images/countries/td.png
similarity index 100%
rename from gui/src/main/resources/images/countries/td.png
rename to core/src/main/resources/images/countries/td.png
diff --git a/gui/src/main/resources/images/countries/tf.png b/core/src/main/resources/images/countries/tf.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tf.png
rename to core/src/main/resources/images/countries/tf.png
diff --git a/gui/src/main/resources/images/countries/tg.png b/core/src/main/resources/images/countries/tg.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tg.png
rename to core/src/main/resources/images/countries/tg.png
diff --git a/gui/src/main/resources/images/countries/th.png b/core/src/main/resources/images/countries/th.png
similarity index 100%
rename from gui/src/main/resources/images/countries/th.png
rename to core/src/main/resources/images/countries/th.png
diff --git a/gui/src/main/resources/images/countries/tj.png b/core/src/main/resources/images/countries/tj.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tj.png
rename to core/src/main/resources/images/countries/tj.png
diff --git a/gui/src/main/resources/images/countries/tk.png b/core/src/main/resources/images/countries/tk.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tk.png
rename to core/src/main/resources/images/countries/tk.png
diff --git a/gui/src/main/resources/images/countries/tl.png b/core/src/main/resources/images/countries/tl.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tl.png
rename to core/src/main/resources/images/countries/tl.png
diff --git a/gui/src/main/resources/images/countries/tm.png b/core/src/main/resources/images/countries/tm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tm.png
rename to core/src/main/resources/images/countries/tm.png
diff --git a/gui/src/main/resources/images/countries/tn.png b/core/src/main/resources/images/countries/tn.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tn.png
rename to core/src/main/resources/images/countries/tn.png
diff --git a/gui/src/main/resources/images/countries/to.png b/core/src/main/resources/images/countries/to.png
similarity index 100%
rename from gui/src/main/resources/images/countries/to.png
rename to core/src/main/resources/images/countries/to.png
diff --git a/gui/src/main/resources/images/countries/tr.png b/core/src/main/resources/images/countries/tr.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tr.png
rename to core/src/main/resources/images/countries/tr.png
diff --git a/gui/src/main/resources/images/countries/tt.png b/core/src/main/resources/images/countries/tt.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tt.png
rename to core/src/main/resources/images/countries/tt.png
diff --git a/gui/src/main/resources/images/countries/tv.png b/core/src/main/resources/images/countries/tv.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tv.png
rename to core/src/main/resources/images/countries/tv.png
diff --git a/gui/src/main/resources/images/countries/tw.png b/core/src/main/resources/images/countries/tw.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tw.png
rename to core/src/main/resources/images/countries/tw.png
diff --git a/gui/src/main/resources/images/countries/tz.png b/core/src/main/resources/images/countries/tz.png
similarity index 100%
rename from gui/src/main/resources/images/countries/tz.png
rename to core/src/main/resources/images/countries/tz.png
diff --git a/gui/src/main/resources/images/countries/ua.png b/core/src/main/resources/images/countries/ua.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ua.png
rename to core/src/main/resources/images/countries/ua.png
diff --git a/gui/src/main/resources/images/countries/ug.png b/core/src/main/resources/images/countries/ug.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ug.png
rename to core/src/main/resources/images/countries/ug.png
diff --git a/gui/src/main/resources/images/countries/uk.png b/core/src/main/resources/images/countries/uk.png
similarity index 100%
rename from gui/src/main/resources/images/countries/uk.png
rename to core/src/main/resources/images/countries/uk.png
diff --git a/gui/src/main/resources/images/countries/um.png b/core/src/main/resources/images/countries/um.png
similarity index 100%
rename from gui/src/main/resources/images/countries/um.png
rename to core/src/main/resources/images/countries/um.png
diff --git a/gui/src/main/resources/images/countries/us.png b/core/src/main/resources/images/countries/us.png
similarity index 100%
rename from gui/src/main/resources/images/countries/us.png
rename to core/src/main/resources/images/countries/us.png
diff --git a/gui/src/main/resources/images/countries/uy.png b/core/src/main/resources/images/countries/uy.png
similarity index 100%
rename from gui/src/main/resources/images/countries/uy.png
rename to core/src/main/resources/images/countries/uy.png
diff --git a/gui/src/main/resources/images/countries/uz.png b/core/src/main/resources/images/countries/uz.png
similarity index 100%
rename from gui/src/main/resources/images/countries/uz.png
rename to core/src/main/resources/images/countries/uz.png
diff --git a/gui/src/main/resources/images/countries/va.png b/core/src/main/resources/images/countries/va.png
similarity index 100%
rename from gui/src/main/resources/images/countries/va.png
rename to core/src/main/resources/images/countries/va.png
diff --git a/gui/src/main/resources/images/countries/vc.png b/core/src/main/resources/images/countries/vc.png
similarity index 100%
rename from gui/src/main/resources/images/countries/vc.png
rename to core/src/main/resources/images/countries/vc.png
diff --git a/gui/src/main/resources/images/countries/ve.png b/core/src/main/resources/images/countries/ve.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ve.png
rename to core/src/main/resources/images/countries/ve.png
diff --git a/gui/src/main/resources/images/countries/vg.png b/core/src/main/resources/images/countries/vg.png
similarity index 100%
rename from gui/src/main/resources/images/countries/vg.png
rename to core/src/main/resources/images/countries/vg.png
diff --git a/gui/src/main/resources/images/countries/vi.png b/core/src/main/resources/images/countries/vi.png
similarity index 100%
rename from gui/src/main/resources/images/countries/vi.png
rename to core/src/main/resources/images/countries/vi.png
diff --git a/gui/src/main/resources/images/countries/vn.png b/core/src/main/resources/images/countries/vn.png
similarity index 100%
rename from gui/src/main/resources/images/countries/vn.png
rename to core/src/main/resources/images/countries/vn.png
diff --git a/gui/src/main/resources/images/countries/vu.png b/core/src/main/resources/images/countries/vu.png
similarity index 100%
rename from gui/src/main/resources/images/countries/vu.png
rename to core/src/main/resources/images/countries/vu.png
diff --git a/gui/src/main/resources/images/countries/wales.png b/core/src/main/resources/images/countries/wales.png
similarity index 100%
rename from gui/src/main/resources/images/countries/wales.png
rename to core/src/main/resources/images/countries/wales.png
diff --git a/gui/src/main/resources/images/countries/wf.png b/core/src/main/resources/images/countries/wf.png
similarity index 100%
rename from gui/src/main/resources/images/countries/wf.png
rename to core/src/main/resources/images/countries/wf.png
diff --git a/gui/src/main/resources/images/countries/ws.png b/core/src/main/resources/images/countries/ws.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ws.png
rename to core/src/main/resources/images/countries/ws.png
diff --git a/gui/src/main/resources/images/countries/ye.png b/core/src/main/resources/images/countries/ye.png
similarity index 100%
rename from gui/src/main/resources/images/countries/ye.png
rename to core/src/main/resources/images/countries/ye.png
diff --git a/gui/src/main/resources/images/countries/yt.png b/core/src/main/resources/images/countries/yt.png
similarity index 100%
rename from gui/src/main/resources/images/countries/yt.png
rename to core/src/main/resources/images/countries/yt.png
diff --git a/gui/src/main/resources/images/countries/za.png b/core/src/main/resources/images/countries/za.png
similarity index 100%
rename from gui/src/main/resources/images/countries/za.png
rename to core/src/main/resources/images/countries/za.png
diff --git a/gui/src/main/resources/images/countries/zm.png b/core/src/main/resources/images/countries/zm.png
similarity index 100%
rename from gui/src/main/resources/images/countries/zm.png
rename to core/src/main/resources/images/countries/zm.png
diff --git a/gui/src/main/resources/images/countries/zw.png b/core/src/main/resources/images/countries/zw.png
similarity index 100%
rename from gui/src/main/resources/images/countries/zw.png
rename to core/src/main/resources/images/countries/zw.png
diff --git a/gui/src/main/resources/images/expand.png b/core/src/main/resources/images/expand.png
similarity index 100%
rename from gui/src/main/resources/images/expand.png
rename to core/src/main/resources/images/expand.png
diff --git a/gui/src/main/resources/images/expand@2x.png b/core/src/main/resources/images/expand@2x.png
similarity index 100%
rename from gui/src/main/resources/images/expand@2x.png
rename to core/src/main/resources/images/expand@2x.png
diff --git a/gui/src/main/resources/images/info.png b/core/src/main/resources/images/info.png
similarity index 100%
rename from gui/src/main/resources/images/info.png
rename to core/src/main/resources/images/info.png
diff --git a/gui/src/main/resources/images/info@2x.png b/core/src/main/resources/images/info@2x.png
similarity index 100%
rename from gui/src/main/resources/images/info@2x.png
rename to core/src/main/resources/images/info@2x.png
diff --git a/gui/src/main/resources/images/logo_splash.png b/core/src/main/resources/images/logo_splash.png
similarity index 100%
rename from gui/src/main/resources/images/logo_splash.png
rename to core/src/main/resources/images/logo_splash.png
diff --git a/gui/src/main/resources/images/logo_splash@2x.png b/core/src/main/resources/images/logo_splash@2x.png
similarity index 100%
rename from gui/src/main/resources/images/logo_splash@2x.png
rename to core/src/main/resources/images/logo_splash@2x.png
diff --git a/gui/src/main/resources/images/nav/account.png b/core/src/main/resources/images/nav/account.png
similarity index 100%
rename from gui/src/main/resources/images/nav/account.png
rename to core/src/main/resources/images/nav/account.png
diff --git a/gui/src/main/resources/images/nav/account@2x.png b/core/src/main/resources/images/nav/account@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/account@2x.png
rename to core/src/main/resources/images/nav/account@2x.png
diff --git a/gui/src/main/resources/images/nav/account_active.png b/core/src/main/resources/images/nav/account_active.png
similarity index 100%
rename from gui/src/main/resources/images/nav/account_active.png
rename to core/src/main/resources/images/nav/account_active.png
diff --git a/gui/src/main/resources/images/nav/account_active@2x.png b/core/src/main/resources/images/nav/account_active@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/account_active@2x.png
rename to core/src/main/resources/images/nav/account_active@2x.png
diff --git a/gui/src/main/resources/images/nav/buy.png b/core/src/main/resources/images/nav/buy.png
similarity index 100%
rename from gui/src/main/resources/images/nav/buy.png
rename to core/src/main/resources/images/nav/buy.png
diff --git a/gui/src/main/resources/images/nav/buy@2x.png b/core/src/main/resources/images/nav/buy@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/buy@2x.png
rename to core/src/main/resources/images/nav/buy@2x.png
diff --git a/gui/src/main/resources/images/nav/buy_active.png b/core/src/main/resources/images/nav/buy_active.png
similarity index 100%
rename from gui/src/main/resources/images/nav/buy_active.png
rename to core/src/main/resources/images/nav/buy_active.png
diff --git a/gui/src/main/resources/images/nav/buy_active@2x.png b/core/src/main/resources/images/nav/buy_active@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/buy_active@2x.png
rename to core/src/main/resources/images/nav/buy_active@2x.png
diff --git a/gui/src/main/resources/images/nav/funds.png b/core/src/main/resources/images/nav/funds.png
similarity index 100%
rename from gui/src/main/resources/images/nav/funds.png
rename to core/src/main/resources/images/nav/funds.png
diff --git a/gui/src/main/resources/images/nav/funds@2x.png b/core/src/main/resources/images/nav/funds@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/funds@2x.png
rename to core/src/main/resources/images/nav/funds@2x.png
diff --git a/gui/src/main/resources/images/nav/funds_active.png b/core/src/main/resources/images/nav/funds_active.png
similarity index 100%
rename from gui/src/main/resources/images/nav/funds_active.png
rename to core/src/main/resources/images/nav/funds_active.png
diff --git a/gui/src/main/resources/images/nav/funds_active@2x.png b/core/src/main/resources/images/nav/funds_active@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/funds_active@2x.png
rename to core/src/main/resources/images/nav/funds_active@2x.png
diff --git a/gui/src/main/resources/images/nav/home.png b/core/src/main/resources/images/nav/home.png
similarity index 100%
rename from gui/src/main/resources/images/nav/home.png
rename to core/src/main/resources/images/nav/home.png
diff --git a/gui/src/main/resources/images/nav/home@2x.png b/core/src/main/resources/images/nav/home@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/home@2x.png
rename to core/src/main/resources/images/nav/home@2x.png
diff --git a/gui/src/main/resources/images/nav/home_active.png b/core/src/main/resources/images/nav/home_active.png
similarity index 100%
rename from gui/src/main/resources/images/nav/home_active.png
rename to core/src/main/resources/images/nav/home_active.png
diff --git a/gui/src/main/resources/images/nav/home_active@2x.png b/core/src/main/resources/images/nav/home_active@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/home_active@2x.png
rename to core/src/main/resources/images/nav/home_active@2x.png
diff --git a/gui/src/main/resources/images/nav/msg.png b/core/src/main/resources/images/nav/msg.png
similarity index 100%
rename from gui/src/main/resources/images/nav/msg.png
rename to core/src/main/resources/images/nav/msg.png
diff --git a/gui/src/main/resources/images/nav/msg@2x.png b/core/src/main/resources/images/nav/msg@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/msg@2x.png
rename to core/src/main/resources/images/nav/msg@2x.png
diff --git a/gui/src/main/resources/images/nav/msg_active.png b/core/src/main/resources/images/nav/msg_active.png
similarity index 100%
rename from gui/src/main/resources/images/nav/msg_active.png
rename to core/src/main/resources/images/nav/msg_active.png
diff --git a/gui/src/main/resources/images/nav/msg_active@2x.png b/core/src/main/resources/images/nav/msg_active@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/msg_active@2x.png
rename to core/src/main/resources/images/nav/msg_active@2x.png
diff --git a/gui/src/main/resources/images/nav/portfolio.png b/core/src/main/resources/images/nav/portfolio.png
similarity index 100%
rename from gui/src/main/resources/images/nav/portfolio.png
rename to core/src/main/resources/images/nav/portfolio.png
diff --git a/gui/src/main/resources/images/nav/portfolio@2x.png b/core/src/main/resources/images/nav/portfolio@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/portfolio@2x.png
rename to core/src/main/resources/images/nav/portfolio@2x.png
diff --git a/gui/src/main/resources/images/nav/portfolio_active.png b/core/src/main/resources/images/nav/portfolio_active.png
similarity index 100%
rename from gui/src/main/resources/images/nav/portfolio_active.png
rename to core/src/main/resources/images/nav/portfolio_active.png
diff --git a/gui/src/main/resources/images/nav/portfolio_active@2x.png b/core/src/main/resources/images/nav/portfolio_active@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/portfolio_active@2x.png
rename to core/src/main/resources/images/nav/portfolio_active@2x.png
diff --git a/gui/src/main/resources/images/nav/sell.png b/core/src/main/resources/images/nav/sell.png
similarity index 100%
rename from gui/src/main/resources/images/nav/sell.png
rename to core/src/main/resources/images/nav/sell.png
diff --git a/gui/src/main/resources/images/nav/sell@2x.png b/core/src/main/resources/images/nav/sell@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/sell@2x.png
rename to core/src/main/resources/images/nav/sell@2x.png
diff --git a/gui/src/main/resources/images/nav/sell_active.png b/core/src/main/resources/images/nav/sell_active.png
similarity index 100%
rename from gui/src/main/resources/images/nav/sell_active.png
rename to core/src/main/resources/images/nav/sell_active.png
diff --git a/gui/src/main/resources/images/nav/sell_active@2x.png b/core/src/main/resources/images/nav/sell_active@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/sell_active@2x.png
rename to core/src/main/resources/images/nav/sell_active@2x.png
diff --git a/gui/src/main/resources/images/nav/settings.png b/core/src/main/resources/images/nav/settings.png
similarity index 100%
rename from gui/src/main/resources/images/nav/settings.png
rename to core/src/main/resources/images/nav/settings.png
diff --git a/gui/src/main/resources/images/nav/settings@2x.png b/core/src/main/resources/images/nav/settings@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/settings@2x.png
rename to core/src/main/resources/images/nav/settings@2x.png
diff --git a/gui/src/main/resources/images/nav/settings_active.png b/core/src/main/resources/images/nav/settings_active.png
similarity index 100%
rename from gui/src/main/resources/images/nav/settings_active.png
rename to core/src/main/resources/images/nav/settings_active.png
diff --git a/gui/src/main/resources/images/nav/settings_active@2x.png b/core/src/main/resources/images/nav/settings_active@2x.png
similarity index 100%
rename from gui/src/main/resources/images/nav/settings_active@2x.png
rename to core/src/main/resources/images/nav/settings_active@2x.png
diff --git a/gui/src/main/resources/images/notification_logo.png b/core/src/main/resources/images/notification_logo.png
similarity index 100%
rename from gui/src/main/resources/images/notification_logo.png
rename to core/src/main/resources/images/notification_logo.png
diff --git a/gui/src/main/resources/images/notification_logo@2x.png b/core/src/main/resources/images/notification_logo@2x.png
similarity index 100%
rename from gui/src/main/resources/images/notification_logo@2x.png
rename to core/src/main/resources/images/notification_logo@2x.png
diff --git a/gui/src/main/resources/images/offer/offer_state_available.png b/core/src/main/resources/images/offer/offer_state_available.png
similarity index 100%
rename from gui/src/main/resources/images/offer/offer_state_available.png
rename to core/src/main/resources/images/offer/offer_state_available.png
diff --git a/gui/src/main/resources/images/offer/offer_state_available@2x.png b/core/src/main/resources/images/offer/offer_state_available@2x.png
similarity index 100%
rename from gui/src/main/resources/images/offer/offer_state_available@2x.png
rename to core/src/main/resources/images/offer/offer_state_available@2x.png
diff --git a/gui/src/main/resources/images/offer/offer_state_not_available.png b/core/src/main/resources/images/offer/offer_state_not_available.png
similarity index 100%
rename from gui/src/main/resources/images/offer/offer_state_not_available.png
rename to core/src/main/resources/images/offer/offer_state_not_available.png
diff --git a/gui/src/main/resources/images/offer/offer_state_not_available@2x.png b/core/src/main/resources/images/offer/offer_state_not_available@2x.png
similarity index 100%
rename from gui/src/main/resources/images/offer/offer_state_not_available@2x.png
rename to core/src/main/resources/images/offer/offer_state_not_available@2x.png
diff --git a/gui/src/main/resources/images/offer/offer_state_unknown.png b/core/src/main/resources/images/offer/offer_state_unknown.png
similarity index 100%
rename from gui/src/main/resources/images/offer/offer_state_unknown.png
rename to core/src/main/resources/images/offer/offer_state_unknown.png
diff --git a/gui/src/main/resources/images/offer/offer_state_unknown@2x.png b/core/src/main/resources/images/offer/offer_state_unknown@2x.png
similarity index 100%
rename from gui/src/main/resources/images/offer/offer_state_unknown@2x.png
rename to core/src/main/resources/images/offer/offer_state_unknown@2x.png
diff --git a/gui/src/main/resources/images/remove.png b/core/src/main/resources/images/remove.png
similarity index 100%
rename from gui/src/main/resources/images/remove.png
rename to core/src/main/resources/images/remove.png
diff --git a/gui/src/main/resources/images/remove@2x.png b/core/src/main/resources/images/remove@2x.png
similarity index 100%
rename from gui/src/main/resources/images/remove@2x.png
rename to core/src/main/resources/images/remove@2x.png
diff --git a/gui/src/main/resources/images/sell.png b/core/src/main/resources/images/sell.png
similarity index 100%
rename from gui/src/main/resources/images/sell.png
rename to core/src/main/resources/images/sell.png
diff --git a/gui/src/main/resources/images/sell@2x.png b/core/src/main/resources/images/sell@2x.png
similarity index 100%
rename from gui/src/main/resources/images/sell@2x.png
rename to core/src/main/resources/images/sell@2x.png
diff --git a/gui/src/main/resources/images/sell_large.png b/core/src/main/resources/images/sell_large.png
similarity index 100%
rename from gui/src/main/resources/images/sell_large.png
rename to core/src/main/resources/images/sell_large.png
diff --git a/gui/src/main/resources/images/sell_large@2x.png b/core/src/main/resources/images/sell_large@2x.png
similarity index 100%
rename from gui/src/main/resources/images/sell_large@2x.png
rename to core/src/main/resources/images/sell_large@2x.png
diff --git a/gui/src/main/resources/images/system_tray_icon.png b/core/src/main/resources/images/system_tray_icon.png
similarity index 100%
rename from gui/src/main/resources/images/system_tray_icon.png
rename to core/src/main/resources/images/system_tray_icon.png
diff --git a/gui/src/main/resources/images/system_tray_icon@2x.png b/core/src/main/resources/images/system_tray_icon@2x.png
similarity index 100%
rename from gui/src/main/resources/images/system_tray_icon@2x.png
rename to core/src/main/resources/images/system_tray_icon@2x.png
diff --git a/gui/src/main/resources/images/system_tray_icon_linux.png b/core/src/main/resources/images/system_tray_icon_linux.png
similarity index 100%
rename from gui/src/main/resources/images/system_tray_icon_linux.png
rename to core/src/main/resources/images/system_tray_icon_linux.png
diff --git a/gui/src/main/resources/images/system_tray_icon_windows.png b/core/src/main/resources/images/system_tray_icon_windows.png
similarity index 100%
rename from gui/src/main/resources/images/system_tray_icon_windows.png
rename to core/src/main/resources/images/system_tray_icon_windows.png
diff --git a/gui/src/main/resources/images/task_bar_icon_linux.png b/core/src/main/resources/images/task_bar_icon_linux.png
similarity index 100%
rename from gui/src/main/resources/images/task_bar_icon_linux.png
rename to core/src/main/resources/images/task_bar_icon_linux.png
diff --git a/gui/src/main/resources/images/task_bar_icon_windows.png b/core/src/main/resources/images/task_bar_icon_windows.png
similarity index 100%
rename from gui/src/main/resources/images/task_bar_icon_windows.png
rename to core/src/main/resources/images/task_bar_icon_windows.png
diff --git a/gui/src/main/resources/images/tick.png b/core/src/main/resources/images/tick.png
similarity index 100%
rename from gui/src/main/resources/images/tick.png
rename to core/src/main/resources/images/tick.png
diff --git a/gui/src/main/resources/images/tick@2x.png b/core/src/main/resources/images/tick@2x.png
similarity index 100%
rename from gui/src/main/resources/images/tick@2x.png
rename to core/src/main/resources/images/tick@2x.png
diff --git a/gui/src/main/resources/images/update/update_available.png b/core/src/main/resources/images/update/update_available.png
similarity index 100%
rename from gui/src/main/resources/images/update/update_available.png
rename to core/src/main/resources/images/update/update_available.png
diff --git a/gui/src/main/resources/images/update/update_available@2x.png b/core/src/main/resources/images/update/update_available@2x.png
similarity index 100%
rename from gui/src/main/resources/images/update/update_available@2x.png
rename to core/src/main/resources/images/update/update_available@2x.png
diff --git a/gui/src/main/resources/images/update/update_failed.png b/core/src/main/resources/images/update/update_failed.png
similarity index 100%
rename from gui/src/main/resources/images/update/update_failed.png
rename to core/src/main/resources/images/update/update_failed.png
diff --git a/gui/src/main/resources/images/update/update_failed@2x.png b/core/src/main/resources/images/update/update_failed@2x.png
similarity index 100%
rename from gui/src/main/resources/images/update/update_failed@2x.png
rename to core/src/main/resources/images/update/update_failed@2x.png
diff --git a/gui/src/main/resources/images/update/update_in_progress.png b/core/src/main/resources/images/update/update_in_progress.png
similarity index 100%
rename from gui/src/main/resources/images/update/update_in_progress.png
rename to core/src/main/resources/images/update/update_in_progress.png
diff --git a/gui/src/main/resources/images/update/update_in_progress@2x.png b/core/src/main/resources/images/update/update_in_progress@2x.png
similarity index 100%
rename from gui/src/main/resources/images/update/update_in_progress@2x.png
rename to core/src/main/resources/images/update/update_in_progress@2x.png
diff --git a/gui/src/main/resources/images/update/update_up_to_date.png b/core/src/main/resources/images/update/update_up_to_date.png
similarity index 100%
rename from gui/src/main/resources/images/update/update_up_to_date.png
rename to core/src/main/resources/images/update/update_up_to_date.png
diff --git a/gui/src/main/resources/images/update/update_up_to_date@2x.png b/core/src/main/resources/images/update/update_up_to_date@2x.png
similarity index 100%
rename from gui/src/main/resources/images/update/update_up_to_date@2x.png
rename to core/src/main/resources/images/update/update_up_to_date@2x.png
diff --git a/gui/src/main/resources/images/window_icon.png b/core/src/main/resources/images/window_icon.png
similarity index 100%
rename from gui/src/main/resources/images/window_icon.png
rename to core/src/main/resources/images/window_icon.png
diff --git a/gui/src/main/resources/images/window_icon@2x.png b/core/src/main/resources/images/window_icon@2x.png
similarity index 100%
rename from gui/src/main/resources/images/window_icon@2x.png
rename to core/src/main/resources/images/window_icon@2x.png
diff --git a/gui/src/main/resources/logback.xml b/core/src/main/resources/logback.xml
similarity index 100%
rename from gui/src/main/resources/logback.xml
rename to core/src/main/resources/logback.xml
diff --git a/gui/src/main/resources/wallet/checkpoints b/core/src/main/resources/wallet/checkpoints
similarity index 100%
rename from gui/src/main/resources/wallet/checkpoints
rename to core/src/main/resources/wallet/checkpoints
diff --git a/gui/src/main/resources/wallet/checkpoints.testnet b/core/src/main/resources/wallet/checkpoints.testnet
similarity index 100%
rename from gui/src/main/resources/wallet/checkpoints.testnet
rename to core/src/main/resources/wallet/checkpoints.testnet
diff --git a/gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java b/core/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
rename to core/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
diff --git a/gui/src/test/java/io/bitsquare/btc/RestrictionsTest.java b/core/src/test/java/io/bitsquare/btc/RestrictionsTest.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/btc/RestrictionsTest.java
rename to core/src/test/java/io/bitsquare/btc/RestrictionsTest.java
diff --git a/gui/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java b/core/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
rename to core/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
diff --git a/gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java b/core/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
rename to core/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java b/core/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java
rename to core/src/test/java/io/bitsquare/gui/util/validation/BtcValidatorTest.java
diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java b/core/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java
rename to core/src/test/java/io/bitsquare/gui/util/validation/FiatValidatorTest.java
diff --git a/gui/src/test/java/io/bitsquare/msg/TomP2PTests.java b/core/src/test/java/io/bitsquare/msg/TomP2PTests.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/msg/TomP2PTests.java
rename to core/src/test/java/io/bitsquare/msg/TomP2PTests.java
diff --git a/gui/src/test/java/io/bitsquare/network/NodeTests.java b/core/src/test/java/io/bitsquare/network/NodeTests.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/network/NodeTests.java
rename to core/src/test/java/io/bitsquare/network/NodeTests.java
diff --git a/gui/src/test/java/io/bitsquare/network/tomp2p/TomP2PNodeTest.java b/core/src/test/java/io/bitsquare/network/tomp2p/TomP2PNodeTest.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/network/tomp2p/TomP2PNodeTest.java
rename to core/src/test/java/io/bitsquare/network/tomp2p/TomP2PNodeTest.java
diff --git a/gui/src/test/java/io/bitsquare/network/tomp2p/TomP2PPeerTest.java b/core/src/test/java/io/bitsquare/network/tomp2p/TomP2PPeerTest.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/network/tomp2p/TomP2PPeerTest.java
rename to core/src/test/java/io/bitsquare/network/tomp2p/TomP2PPeerTest.java
diff --git a/gui/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java b/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
rename to core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
diff --git a/gui/src/test/java/io/bitsquare/trade/protocol/placeoffer/TaskRunner.java b/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/TaskRunner.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/trade/protocol/placeoffer/TaskRunner.java
rename to core/src/test/java/io/bitsquare/trade/protocol/placeoffer/TaskRunner.java
diff --git a/gui/src/test/java/io/bitsquare/util/Repeat.java b/core/src/test/java/io/bitsquare/util/Repeat.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/util/Repeat.java
rename to core/src/test/java/io/bitsquare/util/Repeat.java
diff --git a/gui/src/test/java/io/bitsquare/util/RepeatRule.java b/core/src/test/java/io/bitsquare/util/RepeatRule.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/util/RepeatRule.java
rename to core/src/test/java/io/bitsquare/util/RepeatRule.java
diff --git a/gui/src/test/java/io/bitsquare/util/RepeatRuleTests.java b/core/src/test/java/io/bitsquare/util/RepeatRuleTests.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/util/RepeatRuleTests.java
rename to core/src/test/java/io/bitsquare/util/RepeatRuleTests.java
diff --git a/gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml b/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml
similarity index 100%
rename from gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml
rename to core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml
diff --git a/gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml b/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml
similarity index 100%
rename from gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml
rename to core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml
diff --git a/gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml b/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml
similarity index 100%
rename from gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml
rename to core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml
diff --git a/gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml b/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml
similarity index 100%
rename from gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml
rename to core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml
diff --git a/gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java b/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java
rename to core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java
diff --git a/gui/src/test/java/io/bitsquare/viewfx/view/support/CachingViewLoaderTests.java b/core/src/test/java/io/bitsquare/viewfx/view/support/CachingViewLoaderTests.java
similarity index 100%
rename from gui/src/test/java/io/bitsquare/viewfx/view/support/CachingViewLoaderTests.java
rename to core/src/test/java/io/bitsquare/viewfx/view/support/CachingViewLoaderTests.java
diff --git a/gui/src/test/java/net/tomp2p/dht/UtilsDHT2.java b/core/src/test/java/net/tomp2p/dht/UtilsDHT2.java
similarity index 100%
rename from gui/src/test/java/net/tomp2p/dht/UtilsDHT2.java
rename to core/src/test/java/net/tomp2p/dht/UtilsDHT2.java
diff --git a/pom.xml b/pom.xml
index fe51ff3263..55bc64859d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
     </properties>
 
     <modules>
-        <module>gui</module>
+        <module>core</module>
         <module>bootstrap</module>
     </modules>