diff --git a/core/src/main/groovy/com/muwire/core/connection/Connection.groovy b/core/src/main/groovy/com/muwire/core/connection/Connection.groovy
index b6002d0e..3db9308b 100644
--- a/core/src/main/groovy/com/muwire/core/connection/Connection.groovy
+++ b/core/src/main/groovy/com/muwire/core/connection/Connection.groovy
@@ -7,18 +7,13 @@ import net.i2p.data.Destination
 abstract class Connection {
 
 	final EventBus eventBus
-	final InputStream inputStream
-	final OutputStream outputStream
-	final Destination remoteSide
+	final Endpoint endpoint
 	final boolean incoming
 	
-	Connection(EventBus eventBus, InputStream inputStream, OutputStream outputStream,
-		Destination remoteSide, boolean incoming) {
+	Connection(EventBus eventBus, Endpoint endpoint, boolean incoming) {
 		this.eventBus = eventBus
-		this.inputStream = inputStream
-		this.outputStream = outputStream
-		this.remoteSide = remoteSide
 		this.incoming = incoming
+		this.endpoint = endpoint
 	}
 	
 	/**
diff --git a/core/src/main/groovy/com/muwire/core/connection/Endpoint.groovy b/core/src/main/groovy/com/muwire/core/connection/Endpoint.groovy
new file mode 100644
index 00000000..24eaa8c5
--- /dev/null
+++ b/core/src/main/groovy/com/muwire/core/connection/Endpoint.groovy
@@ -0,0 +1,15 @@
+package com.muwire.core.connection
+
+import net.i2p.data.Destination
+
+class Endpoint {
+	final Destination destination
+	final InputStream inputStream
+	final OutputStream outputStream
+	
+	Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream) {
+		this.destination = destination
+		this.inputStream = inputStream
+		this.outputStream = outputStream
+	}
+} 
diff --git a/core/src/main/groovy/com/muwire/core/connection/I2PConnector.groovy b/core/src/main/groovy/com/muwire/core/connection/I2PConnector.groovy
new file mode 100644
index 00000000..42ba8fc0
--- /dev/null
+++ b/core/src/main/groovy/com/muwire/core/connection/I2PConnector.groovy
@@ -0,0 +1,12 @@
+package com.muwire.core.connection
+
+import net.i2p.data.Destination
+
+class I2PConnector {
+	
+	Endpoint connect(Destination dest) {
+		//TODO implement
+		null
+	}
+
+}