diff --git a/src/main/java/com/github/boukefalos/ibuddy/Loader.java b/src/main/java/com/github/boukefalos/ibuddy/Loader.java
index def2d58..1ad2814 100644
--- a/src/main/java/com/github/boukefalos/ibuddy/Loader.java
+++ b/src/main/java/com/github/boukefalos/ibuddy/Loader.java
@@ -28,7 +28,7 @@ public class Loader extends AbstractLoader<Loader> {
 					String implementation = properties.getOrDefault("tcp.implementation", "socket").toString();
 					String host = properties.getProperty("remote.host");
 					int port = Integer.valueOf(properties.getProperty("remote.port"));
-					addSender(protocol, implementation, host, port);
+					addClientSender(protocol, implementation, host, port);
 				} catch (NumberFormatException e) {
 					throw new LoaderException("Failed to parse remote.port");
 				}	
@@ -44,7 +44,7 @@ public class Loader extends AbstractLoader<Loader> {
 				String protocol = properties.getOrDefault("server.protocol", "tcp").toString();
 				String implementation = properties.getOrDefault("tcp.implementation", "socket").toString();
 				int port = Integer.valueOf(properties.getProperty("server.port"));
-				addForwarder(protocol, implementation, port);
+				addServerForwarder(protocol, implementation, port);
 			} catch (NumberFormatException e) {
 				throw new LoaderException("Failed to parse server.port");
 			}	
diff --git a/src/main/java/com/github/boukefalos/ibuddy/Server.java b/src/main/java/com/github/boukefalos/ibuddy/Server.java
index fa25ee9..83ea4df 100644
--- a/src/main/java/com/github/boukefalos/ibuddy/Server.java
+++ b/src/main/java/com/github/boukefalos/ibuddy/Server.java
@@ -12,8 +12,8 @@ import proto.Ibuddy.Flap;
 import proto.Ibuddy.Head;
 import proto.Ibuddy.Nudge;
 import proto.Ibuddy.State;
-import base.receiver.Forwarder;
-import base.server.forwarder.AbstractReceiver;
+import base.Forwarder;
+import base.server.receiver.AbstractReceiver;
 
 public class Server extends AbstractReceiver {
 	protected iBuddy iBuddy;
diff --git a/src/main/java/com/github/boukefalos/ibuddy/implementation/Remote.java b/src/main/java/com/github/boukefalos/ibuddy/implementation/Remote.java
index 40fd849..7114070 100644
--- a/src/main/java/com/github/boukefalos/ibuddy/implementation/Remote.java
+++ b/src/main/java/com/github/boukefalos/ibuddy/implementation/Remote.java
@@ -20,7 +20,7 @@ import proto.Ibuddy.State;
 import proto.Ibuddy.Type;
 import proto.Ibuddy.Wings;
 import base.Control;
-import base.sender.Sender;
+import base.Sender;
 
 import com.github.boukefalos.ibuddy.iBuddy;