diff --git a/src/main/java/fucoin/wallet/AbstractNode.java b/src/main/java/fucoin/AbstractNode.java
similarity index 97%
rename from src/main/java/fucoin/wallet/AbstractNode.java
rename to src/main/java/fucoin/AbstractNode.java
index 2a6d51e8746c1e3928cf3396b4a6285b5fba08ef..c57568bbbe64852303e2f3c05234ac4cd1781d89 100644
--- a/src/main/java/fucoin/wallet/AbstractNode.java
+++ b/src/main/java/fucoin/AbstractNode.java
@@ -1,7 +1,8 @@
-package fucoin.wallet;
+package fucoin;
 
 import akka.actor.ActorRef;
 import akka.actor.UntypedActor;
+import fucoin.wallet.AbstractWallet;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/src/main/java/fucoin/actions/Action.java b/src/main/java/fucoin/actions/Action.java
index bacffdfc91a6a23c7e8800947d66b8b66653777b..f51e4deb9be136d41ba6f8cf5aec3c4de83a1c88 100644
--- a/src/main/java/fucoin/actions/Action.java
+++ b/src/main/java/fucoin/actions/Action.java
@@ -2,7 +2,7 @@ package fucoin.actions;
 
 import akka.actor.ActorRef;
 import akka.actor.UntypedActorContext;
-import fucoin.wallet.AbstractNode;
+import fucoin.AbstractNode;
 
 public abstract class Action<T extends AbstractNode> {
     private ActorRef self;
diff --git a/src/main/java/fucoin/actions/join/ActionJoin.java b/src/main/java/fucoin/actions/join/ActionJoin.java
index e5bb08f1f20ff5a3f74d52e4cb2da201e5cdad3c..8c1699f4e6505be874a5ce02605e8a3d68dc4bf8 100644
--- a/src/main/java/fucoin/actions/join/ActionJoin.java
+++ b/src/main/java/fucoin/actions/join/ActionJoin.java
@@ -2,7 +2,7 @@ package fucoin.actions.join;
 
 import akka.actor.ActorRef;
 import akka.actor.UntypedActorContext;
-import fucoin.wallet.AbstractNode;
+import fucoin.AbstractNode;
 
 //Used to join the network (a pre known participant/WalletImpl must be known)
 public class ActionJoin extends GeneralAction {
diff --git a/src/main/java/fucoin/actions/join/GeneralAction.java b/src/main/java/fucoin/actions/join/GeneralAction.java
index fd231975ee78fc2c648b0f208162aa2362b62aa4..8dd3c591f4bec0592cf4a102d1ed63367e4f41bc 100644
--- a/src/main/java/fucoin/actions/join/GeneralAction.java
+++ b/src/main/java/fucoin/actions/join/GeneralAction.java
@@ -1,7 +1,7 @@
 package fucoin.actions.join;
 
 import fucoin.actions.Action;
-import fucoin.wallet.AbstractNode;
+import fucoin.AbstractNode;
 
 public abstract class GeneralAction extends Action<AbstractNode> {
 
diff --git a/src/main/java/fucoin/supervisor/SuperVisorImpl.java b/src/main/java/fucoin/supervisor/SuperVisorImpl.java
index e7c7c2d56f9186b27e4885865e5df9f754a7238e..4f708ef42e33cddb0ac4f7a59c0dd0b71dfb9653 100644
--- a/src/main/java/fucoin/supervisor/SuperVisorImpl.java
+++ b/src/main/java/fucoin/supervisor/SuperVisorImpl.java
@@ -6,7 +6,7 @@ import fucoin.actions.persist.ActionInvokeUpdate;
 import fucoin.actions.transaction.ActionGetAmountAnswer;
 import fucoin.actions.transaction.SuperVisorAction;
 import fucoin.gui.SuperVisorGuiControl;
-import fucoin.wallet.AbstractNode;
+import fucoin.AbstractNode;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/fucoin/wallet/AbstractWallet.java b/src/main/java/fucoin/wallet/AbstractWallet.java
index 3da2d7eba791253d9f3fec10b85bdf9b23fa8918..a9fd926b303332e5b12d3549d5e1d3fb302568c1 100644
--- a/src/main/java/fucoin/wallet/AbstractWallet.java
+++ b/src/main/java/fucoin/wallet/AbstractWallet.java
@@ -1,6 +1,7 @@
 package fucoin.wallet;
 
 import akka.actor.ActorRef;
+import fucoin.AbstractNode;
 
 public abstract class AbstractWallet extends AbstractNode {
     /**