diff --git a/.idea/modules.xml b/.idea/modules.xml
index 71ba967e94..2cb9499d76 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -24,9 +24,6 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/experimental/experimental.iml" filepath="$PROJECT_DIR$/.idea/modules/experimental/experimental.iml" group="experimental" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/experimental/experimental_main.iml" filepath="$PROJECT_DIR$/.idea/modules/experimental/experimental_main.iml" group="experimental" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/experimental/experimental_test.iml" filepath="$PROJECT_DIR$/.idea/modules/experimental/experimental_test.iml" group="experimental" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/explorer/explorer.iml" filepath="$PROJECT_DIR$/.idea/modules/explorer/explorer.iml" group="explorer" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/explorer/explorer_main.iml" filepath="$PROJECT_DIR$/.idea/modules/explorer/explorer_main.iml" group="explorer" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/explorer/explorer_test.iml" filepath="$PROJECT_DIR$/.idea/modules/explorer/explorer_test.iml" group="explorer" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins.iml" group="gradle-plugins" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins_main.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins_main.iml" group="gradle-plugins" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins_test.iml" filepath="$PROJECT_DIR$/.idea/modules/gradle-plugins/gradle-plugins_test.iml" group="gradle-plugins" />
@@ -50,6 +47,9 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/test-utils/test-utils.iml" filepath="$PROJECT_DIR$/.idea/modules/test-utils/test-utils.iml" group="test-utils" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/test-utils/test-utils_main.iml" filepath="$PROJECT_DIR$/.idea/modules/test-utils/test-utils_main.iml" group="test-utils" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/test-utils/test-utils_test.iml" filepath="$PROJECT_DIR$/.idea/modules/test-utils/test-utils_test.iml" group="test-utils" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/tools/explorer/tools_explorer.iml" filepath="$PROJECT_DIR$/.idea/modules/tools/explorer/tools_explorer.iml" group="tools/explorer" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/tools/explorer/tools_explorer_main.iml" filepath="$PROJECT_DIR$/.idea/modules/tools/explorer/tools_explorer_main.iml" group="tools/explorer" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/tools/explorer/tools_explorer_test.iml" filepath="$PROJECT_DIR$/.idea/modules/tools/explorer/tools_explorer_test.iml" group="tools/explorer" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 21a85ae049..4d07996a92 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ include 'node'
 include 'client'
 include 'experimental'
 include 'test-utils'
-include 'explorer'
+include 'tools/explorer'
 include 'gradle-plugins:quasar-utils'
 include 'gradle-plugins:publish-utils'
 include 'gradle-plugins:cordformation'
diff --git a/explorer/build.gradle b/tools/explorer/build.gradle
similarity index 96%
rename from explorer/build.gradle
rename to tools/explorer/build.gradle
index bc35c72a4a..8e2f7ee5c7 100644
--- a/explorer/build.gradle
+++ b/tools/explorer/build.gradle
@@ -30,12 +30,12 @@ mainClassName = 'com.r3corda.explorer.Main'
 sourceSets {
     main {
         resources {
-            srcDir "../config/dev"
+            srcDir "../../config/dev"
         }
     }
     test {
         resources {
-            srcDir "../config/test"
+            srcDir "../../config/test"
         }
     }
 }
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/AmountDiff.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/AmountDiff.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/AmountDiff.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/AmountDiff.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/Main.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/Main.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/Main.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/Main.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/MainWindow.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/MainWindow.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/MainWindow.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/MainWindow.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/formatters/AmountFormatter.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/formatters/AmountFormatter.kt
similarity index 95%
rename from explorer/src/main/kotlin/com/r3corda/explorer/formatters/AmountFormatter.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/formatters/AmountFormatter.kt
index 0ec38d6c40..4452d4fc05 100644
--- a/explorer/src/main/kotlin/com/r3corda/explorer/formatters/AmountFormatter.kt
+++ b/tools/explorer/src/main/kotlin/com/r3corda/explorer/formatters/AmountFormatter.kt
@@ -1,7 +1,7 @@
 package com.r3corda.explorer.formatters
 
 import com.r3corda.core.contracts.Amount
-import java.util.Currency
+import java.util.*
 
 /**
  * A note on formatting: Currently we don't have any fancy locale/use-case-specific formatting of amounts. This is a
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/formatters/Formatter.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/formatters/Formatter.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/formatters/Formatter.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/formatters/Formatter.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/formatters/NumberFormatter.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/formatters/NumberFormatter.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/formatters/NumberFormatter.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/formatters/NumberFormatter.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/identicon/IdenticonRenderer.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/identicon/IdenticonRenderer.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/identicon/IdenticonRenderer.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/identicon/IdenticonRenderer.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/model/ReportingCurrencyModel.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/model/ReportingCurrencyModel.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/model/ReportingCurrencyModel.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/model/ReportingCurrencyModel.kt
index 9d49555abc..a38a654005 100644
--- a/explorer/src/main/kotlin/com/r3corda/explorer/model/ReportingCurrencyModel.kt
+++ b/tools/explorer/src/main/kotlin/com/r3corda/explorer/model/ReportingCurrencyModel.kt
@@ -1,10 +1,10 @@
 package com.r3corda.explorer.model
 
-import com.r3corda.core.contracts.Amount
 import com.r3corda.client.fxutils.AmountBindings
 import com.r3corda.client.model.ExchangeRate
 import com.r3corda.client.model.ExchangeRateModel
 import com.r3corda.client.model.observableValue
+import com.r3corda.core.contracts.Amount
 import javafx.beans.value.ObservableValue
 import org.fxmisc.easybind.EasyBind
 import java.util.*
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/model/SettingsModel.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/model/SettingsModel.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/model/SettingsModel.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/model/SettingsModel.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/model/TopLevelModel.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/model/TopLevelModel.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/model/TopLevelModel.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/model/TopLevelModel.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/model/TransactionTypes.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/model/TransactionTypes.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/model/TransactionTypes.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/model/TransactionTypes.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/ui/ListViewUtilities.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/ui/ListViewUtilities.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/ui/ListViewUtilities.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/ui/ListViewUtilities.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/ui/SingleRowSelection.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/ui/SingleRowSelection.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/ui/SingleRowSelection.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/ui/SingleRowSelection.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/ui/TableViewUtilities.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/ui/TableViewUtilities.kt
similarity index 98%
rename from explorer/src/main/kotlin/com/r3corda/explorer/ui/TableViewUtilities.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/ui/TableViewUtilities.kt
index b4887f5099..9c709468c3 100644
--- a/explorer/src/main/kotlin/com/r3corda/explorer/ui/TableViewUtilities.kt
+++ b/tools/explorer/src/main/kotlin/com/r3corda/explorer/ui/TableViewUtilities.kt
@@ -4,7 +4,6 @@ import com.r3corda.explorer.formatters.Formatter
 import javafx.beans.binding.Bindings
 import javafx.beans.value.ObservableValue
 import javafx.scene.Node
-import javafx.scene.control.ListCell
 import javafx.scene.control.TableCell
 import javafx.scene.control.TableColumn
 import javafx.scene.control.TableView
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/ui/TreeTableViewUtilities.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/ui/TreeTableViewUtilities.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/ui/TreeTableViewUtilities.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/ui/TreeTableViewUtilities.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/CashViewer.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/CashViewer.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/CashViewer.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/CashViewer.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/CordaView.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/CordaView.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/CordaView.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/CordaView.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/GuiUtilities.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/GuiUtilities.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/GuiUtilities.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/GuiUtilities.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/Header.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/Header.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/Header.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/Header.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/Home.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/Home.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/Home.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/Home.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/LoginView.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/LoginView.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/LoginView.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/LoginView.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/NewTransaction.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/NewTransaction.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/NewTransaction.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/NewTransaction.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/SearchField.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/SearchField.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/SearchField.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/SearchField.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/Sidebar.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/Sidebar.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/Sidebar.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/Sidebar.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/TopLevel.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/TopLevel.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/TopLevel.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/TopLevel.kt
diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/TransactionViewer.kt b/tools/explorer/src/main/kotlin/com/r3corda/explorer/views/TransactionViewer.kt
similarity index 100%
rename from explorer/src/main/kotlin/com/r3corda/explorer/views/TransactionViewer.kt
rename to tools/explorer/src/main/kotlin/com/r3corda/explorer/views/TransactionViewer.kt
diff --git a/explorer/src/main/resources/com/r3corda/explorer/css/notification-bar.css b/tools/explorer/src/main/resources/com/r3corda/explorer/css/notification-bar.css
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/css/notification-bar.css
rename to tools/explorer/src/main/resources/com/r3corda/explorer/css/notification-bar.css
diff --git a/explorer/src/main/resources/com/r3corda/explorer/css/shell.css b/tools/explorer/src/main/resources/com/r3corda/explorer/css/shell.css
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/css/shell.css
rename to tools/explorer/src/main/resources/com/r3corda/explorer/css/shell.css
diff --git a/explorer/src/main/resources/com/r3corda/explorer/css/wallet.css b/tools/explorer/src/main/resources/com/r3corda/explorer/css/wallet.css
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/css/wallet.css
rename to tools/explorer/src/main/resources/com/r3corda/explorer/css/wallet.css
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/arrow_l.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/arrow_l.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/arrow_l.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/arrow_l.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/arrow_r.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/arrow_r.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/arrow_r.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/arrow_r.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/cash.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/cash.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/cash.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/cash.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/cash_lrg.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/cash_lrg.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/cash_lrg.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/cash_lrg.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/clear.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/clear.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/clear.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/clear.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/clear_inactive.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/clear_inactive.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/clear_inactive.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/clear_inactive.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/cpty_lrg.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/cpty_lrg.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/cpty_lrg.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/cpty_lrg.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/home.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/home.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/home.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/home.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/inflow_lrg.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/inflow_lrg.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/inflow_lrg.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/inflow_lrg.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/inst.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/inst.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/inst.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/inst.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/inst_128.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/inst_128.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/inst_128.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/inst_128.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/man1.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/man1.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/man1.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/man1.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/outflow_lrg.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/outflow_lrg.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/outflow_lrg.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/outflow_lrg.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/search.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/search.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/search.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/search.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/settings_lrg.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/settings_lrg.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/settings_lrg.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/settings_lrg.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/settings_w.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/settings_w.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/settings_w.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/settings_w.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/tx.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/tx.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/tx.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/tx.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/tx_lrg.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/tx_lrg.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/tx_lrg.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/tx_lrg.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/user_b.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/user_b.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/user_b.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/user_b.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/user_b.svg b/tools/explorer/src/main/resources/com/r3corda/explorer/images/user_b.svg
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/user_b.svg
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/user_b.svg
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/user_w.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/user_w.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/user_w.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/user_w.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/images/woman1.png b/tools/explorer/src/main/resources/com/r3corda/explorer/images/woman1.png
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/images/woman1.png
rename to tools/explorer/src/main/resources/com/r3corda/explorer/images/woman1.png
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/CashStateViewer.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/CashStateViewer.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/CashStateViewer.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/CashStateViewer.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/CashViewer.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/CashViewer.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/CashViewer.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/CashViewer.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/ContractStatesView.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/ContractStatesView.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/ContractStatesView.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/ContractStatesView.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/Header.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/Header.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/Header.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/Header.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/Home.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/Home.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/Home.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/Home.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/LoginView.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/LoginView.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/LoginView.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/LoginView.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/NewTransaction.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/NewTransaction.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/NewTransaction.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/NewTransaction.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/SearchField.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/SearchField.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/SearchField.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/SearchField.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/Sidebar.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/Sidebar.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/Sidebar.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/Sidebar.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/TopLevel.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/TopLevel.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/TopLevel.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/TopLevel.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/TransactionViewer.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/TransactionViewer.fxml
similarity index 100%
rename from explorer/src/main/resources/com/r3corda/explorer/views/TransactionViewer.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/TransactionViewer.fxml
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/login.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/login.fxml
similarity index 88%
rename from explorer/src/main/resources/com/r3corda/explorer/views/login.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/login.fxml
index cda9c779e3..1e21c70b68 100644
--- a/explorer/src/main/resources/com/r3corda/explorer/views/login.fxml
+++ b/tools/explorer/src/main/resources/com/r3corda/explorer/views/login.fxml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.String?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.PasswordField?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.control.TitledPane?>
-<?import javafx.scene.layout.TilePane?>
-<?import javafx.scene.layout.VBox?>
-
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import java.lang.String?>
 <DialogPane expanded="true" headerText="Sign in to Corda" prefHeight="246.0" prefWidth="648.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
    <content>
       <TilePane alignment="CENTER">
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/schedule.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/schedule.fxml
similarity index 91%
rename from explorer/src/main/resources/com/r3corda/explorer/views/schedule.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/schedule.fxml
index 6bcab11e41..01602dfd3d 100644
--- a/explorer/src/main/resources/com/r3corda/explorer/views/schedule.fxml
+++ b/tools/explorer/src/main/resources/com/r3corda/explorer/views/schedule.fxml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.String?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.control.TreeTableColumn?>
-<?import javafx.scene.control.TreeTableView?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.layout.VBox?>
-
+<?import javafx.scene.layout.*?>
+<?import java.lang.String?>
 <VBox xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <StackPane alignment="CENTER_RIGHT">
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/search.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/search.fxml
similarity index 99%
rename from explorer/src/main/resources/com/r3corda/explorer/views/search.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/search.fxml
index ee68a49b11..54a984a740 100644
--- a/explorer/src/main/resources/com/r3corda/explorer/views/search.fxml
+++ b/tools/explorer/src/main/resources/com/r3corda/explorer/views/search.fxml
@@ -5,7 +5,6 @@
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.StackPane?>
-
 <StackPane alignment="CENTER_RIGHT" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <TextField fx:id="SearchCriteriaTextField" promptText="Set prompt text" styleClass="search">
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/settings.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/settings.fxml
similarity index 82%
rename from explorer/src/main/resources/com/r3corda/explorer/views/settings.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/settings.fxml
index 51506030e5..faf3b0639c 100644
--- a/explorer/src/main/resources/com/r3corda/explorer/views/settings.fxml
+++ b/tools/explorer/src/main/resources/com/r3corda/explorer/views/settings.fxml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.ChoiceBox?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
+
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.AnchorPane?>
-
-
 <DialogPane expanded="true" headerText="Settings" scaleShape="false" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
    <content>
       <AnchorPane>
diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/wallet-hover.fxml b/tools/explorer/src/main/resources/com/r3corda/explorer/views/wallet-hover.fxml
similarity index 88%
rename from explorer/src/main/resources/com/r3corda/explorer/views/wallet-hover.fxml
rename to tools/explorer/src/main/resources/com/r3corda/explorer/views/wallet-hover.fxml
index 5cf0dad257..73f004fc49 100644
--- a/explorer/src/main/resources/com/r3corda/explorer/views/wallet-hover.fxml
+++ b/tools/explorer/src/main/resources/com/r3corda/explorer/views/wallet-hover.fxml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.String?>
+
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.VBox?>
-
-
+<?import java.lang.String?>
 <DialogPane headerText="Issuer C039201 HSBC GROUP PLC" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
    <content>
       <VBox spacing="5.0">