diff --git a/wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java b/wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/BitcoinAddressValidator.java
similarity index 98%
rename from wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java
rename to wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/BitcoinAddressValidator.java
index 3ceb29a9c..f4fb21de2 100644
--- a/wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java
+++ b/wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/BitcoinAddressValidator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package wallettemplate.controls;
+package org.bitcoinj.walletfx.controls;
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.AddressFormatException;
diff --git a/wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java b/wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/ClickableBitcoinAddress.java
similarity index 99%
rename from wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java
rename to wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/ClickableBitcoinAddress.java
index 31a629b08..5813dda2f 100644
--- a/wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java
+++ b/wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/ClickableBitcoinAddress.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package wallettemplate.controls;
+package org.bitcoinj.walletfx.controls;
 
 import java.awt.Desktop;
 import java.io.IOException;
diff --git a/wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java b/wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/NotificationBarPane.java
similarity index 99%
rename from wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java
rename to wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/NotificationBarPane.java
index d6ed7d572..2950652fb 100644
--- a/wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java
+++ b/wallettemplate/src/main/java/org/bitcoinj/walletfx/controls/NotificationBarPane.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package wallettemplate.controls;
+package org.bitcoinj.walletfx.controls;
 
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
diff --git a/wallettemplate/src/main/java/wallettemplate/MainController.java b/wallettemplate/src/main/java/wallettemplate/MainController.java
index 74892aed1..eb9c828ee 100644
--- a/wallettemplate/src/main/java/wallettemplate/MainController.java
+++ b/wallettemplate/src/main/java/wallettemplate/MainController.java
@@ -36,8 +36,8 @@ import javafx.util.Duration;
 import org.bitcoinj.walletfx.overlay.OverlayableStackPaneController;
 import org.bitcoinj.walletfx.utils.GuiUtils;
 import org.bitcoinj.walletfx.utils.TextFieldValidator;
-import wallettemplate.controls.ClickableBitcoinAddress;
-import wallettemplate.controls.NotificationBarPane;
+import org.bitcoinj.walletfx.controls.ClickableBitcoinAddress;
+import org.bitcoinj.walletfx.controls.NotificationBarPane;
 import org.bitcoinj.walletfx.utils.BitcoinUIModel;
 import org.bitcoinj.walletfx.utils.easing.EasingMode;
 import org.bitcoinj.walletfx.utils.easing.ElasticInterpolator;
diff --git a/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java b/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java
index d29a94a6d..b0f6e8b24 100644
--- a/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java
+++ b/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java
@@ -32,7 +32,7 @@ import javafx.scene.control.TextField;
 import org.bitcoinj.walletfx.overlay.OverlayController;
 import org.bitcoinj.walletfx.overlay.OverlayableStackPaneController;
 import org.bouncycastle.crypto.params.KeyParameter;
-import wallettemplate.controls.BitcoinAddressValidator;
+import org.bitcoinj.walletfx.controls.BitcoinAddressValidator;
 import org.bitcoinj.walletfx.utils.TextFieldValidator;
 import org.bitcoinj.walletfx.utils.WTUtils;
 
diff --git a/wallettemplate/src/main/resources/wallettemplate/controls/bitcoin_address.fxml b/wallettemplate/src/main/resources/org/bitcoinj/walletfx/controls/bitcoin_address.fxml
similarity index 100%
rename from wallettemplate/src/main/resources/wallettemplate/controls/bitcoin_address.fxml
rename to wallettemplate/src/main/resources/org/bitcoinj/walletfx/controls/bitcoin_address.fxml
diff --git a/wallettemplate/src/main/resources/wallettemplate/main.fxml b/wallettemplate/src/main/resources/wallettemplate/main.fxml
index 55b79273a..8ebdada6e 100644
--- a/wallettemplate/src/main/resources/wallettemplate/main.fxml
+++ b/wallettemplate/src/main/resources/wallettemplate/main.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.paint.*?>
 <?import javafx.scene.text.*?>
-<?import wallettemplate.controls.*?>
+<?import org.bitcoinj.walletfx.controls.*?>
 
 <AnchorPane maxHeight="Infinity" maxWidth="Infinity" minHeight="200.0" minWidth="300.0" prefHeight="451.0" prefWidth="800.0" styleClass="root-pane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="wallettemplate.MainController">
   <children>