diff --git a/src/com/romraider/io/connection/EcuConnection.java b/src/com/romraider/logger/ecu/comms/io/connection/EcuConnection.java
similarity index 91%
rename from src/com/romraider/io/connection/EcuConnection.java
rename to src/com/romraider/logger/ecu/comms/io/connection/EcuConnection.java
index f99964a2..4acda85a 100644
--- a/src/com/romraider/io/connection/EcuConnection.java
+++ b/src/com/romraider/logger/ecu/comms/io/connection/EcuConnection.java
@@ -19,7 +19,7 @@
  *
  */
 
-package com.romraider.io.connection;
+package com.romraider.logger.ecu.comms.io.connection;
 
 public interface EcuConnection {
 
diff --git a/src/com/romraider/io/connection/EcuConnectionImpl.java b/src/com/romraider/logger/ecu/comms/io/connection/EcuConnectionImpl.java
similarity index 88%
rename from src/com/romraider/io/connection/EcuConnectionImpl.java
rename to src/com/romraider/logger/ecu/comms/io/connection/EcuConnectionImpl.java
index c516b832..6f5b9939 100644
--- a/src/com/romraider/io/connection/EcuConnectionImpl.java
+++ b/src/com/romraider/logger/ecu/comms/io/connection/EcuConnectionImpl.java
@@ -19,13 +19,17 @@
  *
  */
 
-package com.romraider.io.connection;
+package com.romraider.logger.ecu.comms.io.connection;
 
+import com.romraider.io.connection.ConnectionProperties;
+import com.romraider.io.connection.SerialConnection;
+import com.romraider.io.connection.SerialConnectionImpl;
 import com.romraider.logger.ecu.exception.SerialCommunicationException;
 import static com.romraider.util.ParamChecker.checkNotNull;
 import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;
 import static com.romraider.util.ThreadUtil.sleep;
 
+// FIX - Merge with SSMLoggerConnection
 public final class EcuConnectionImpl implements EcuConnection {
     private final long sendTimeout;
     private final SerialConnection serialConnection;
diff --git a/src/com/romraider/logger/ecu/comms/manager/QueryManagerImpl.java b/src/com/romraider/logger/ecu/comms/manager/QueryManagerImpl.java
index f57ea22e..916472b7 100644
--- a/src/com/romraider/logger/ecu/comms/manager/QueryManagerImpl.java
+++ b/src/com/romraider/logger/ecu/comms/manager/QueryManagerImpl.java
@@ -22,10 +22,10 @@
 package com.romraider.logger.ecu.comms.manager;
 
 import com.romraider.Settings;
-import com.romraider.io.connection.EcuConnection;
-import com.romraider.io.connection.EcuConnectionImpl;
 import com.romraider.io.protocol.Protocol;
 import com.romraider.io.protocol.ProtocolFactory;
+import com.romraider.logger.ecu.comms.io.connection.EcuConnection;
+import com.romraider.logger.ecu.comms.io.connection.EcuConnectionImpl;
 import com.romraider.logger.ecu.comms.query.EcuInitCallback;
 import com.romraider.logger.ecu.comms.query.EcuQuery;
 import com.romraider.logger.ecu.comms.query.EcuQueryImpl;
diff --git a/src/com/romraider/logger/ecu/comms/reset/ResetManagerImpl.java b/src/com/romraider/logger/ecu/comms/reset/ResetManagerImpl.java
index 0ef87bc8..ca9a1845 100644
--- a/src/com/romraider/logger/ecu/comms/reset/ResetManagerImpl.java
+++ b/src/com/romraider/logger/ecu/comms/reset/ResetManagerImpl.java
@@ -22,10 +22,10 @@
 package com.romraider.logger.ecu.comms.reset;
 
 import com.romraider.Settings;
-import com.romraider.io.connection.EcuConnection;
-import com.romraider.io.connection.EcuConnectionImpl;
 import com.romraider.io.protocol.Protocol;
 import com.romraider.io.protocol.ProtocolFactory;
+import com.romraider.logger.ecu.comms.io.connection.EcuConnection;
+import com.romraider.logger.ecu.comms.io.connection.EcuConnectionImpl;
 import com.romraider.logger.ecu.ui.MessageListener;
 import static com.romraider.util.HexUtil.asHex;
 import static com.romraider.util.ParamChecker.checkNotNull;
diff --git a/src/com/romraider/ramtune/test/command/executor/CommandExecutorImpl.java b/src/com/romraider/ramtune/test/command/executor/CommandExecutorImpl.java
index aea92c44..2adb5da7 100644
--- a/src/com/romraider/ramtune/test/command/executor/CommandExecutorImpl.java
+++ b/src/com/romraider/ramtune/test/command/executor/CommandExecutorImpl.java
@@ -22,8 +22,8 @@
 package com.romraider.ramtune.test.command.executor;
 
 import com.romraider.io.connection.ConnectionProperties;
-import com.romraider.io.connection.EcuConnection;
-import com.romraider.io.connection.EcuConnectionImpl;
+import com.romraider.logger.ecu.comms.io.connection.EcuConnection;
+import com.romraider.logger.ecu.comms.io.connection.EcuConnectionImpl;
 import static com.romraider.util.ParamChecker.checkNotNull;
 import static com.romraider.util.ParamChecker.checkNotNullOrEmpty;