diff --git a/readline/src/main/java/org/aesh/readline/AeshConsoleBuffer.java b/readline/src/main/java/org/aesh/readline/AeshConsoleBuffer.java
index fde98e6f..faee8443 100644
--- a/readline/src/main/java/org/aesh/readline/AeshConsoleBuffer.java
+++ b/readline/src/main/java/org/aesh/readline/AeshConsoleBuffer.java
@@ -9,7 +9,7 @@
 import org.aesh.readline.completion.CompletionHandler;
 import org.aesh.readline.editing.EditMode;
 import org.aesh.readline.history.History;
-import org.aesh.readline.tty.Connection;
+import org.aesh.terminal.Connection;
 import org.aesh.util.LoggerUtil;
 
 import java.util.logging.Logger;
diff --git a/readline/src/main/java/org/aesh/readline/InputProcessor.java b/readline/src/main/java/org/aesh/readline/InputProcessor.java
index 8a9da99c..635b6167 100644
--- a/readline/src/main/java/org/aesh/readline/InputProcessor.java
+++ b/readline/src/main/java/org/aesh/readline/InputProcessor.java
@@ -20,7 +20,7 @@
 package org.aesh.readline;
 
 import org.aesh.readline.editing.EditMode;
-import org.aesh.readline.tty.Connection;
+import org.aesh.terminal.Connection;
 
 /**
  * InputProcessor is used by {@link org.aesh.readline.Readline} to process the input.
diff --git a/readline/src/main/java/org/aesh/readline/Readline.java b/readline/src/main/java/org/aesh/readline/Readline.java
index aee8052a..c12caaf7 100644
--- a/readline/src/main/java/org/aesh/readline/Readline.java
+++ b/readline/src/main/java/org/aesh/readline/Readline.java
@@ -32,7 +32,7 @@
 import org.aesh.readline.terminal.Key;
 import org.aesh.util.Config;
 import org.aesh.util.Parser;
-import org.aesh.readline.tty.Connection;
+import org.aesh.terminal.Connection;
 import org.aesh.util.LoggerUtil;
 
 import java.util.List;
@@ -45,7 +45,7 @@
 
 /**
  * Readline is a simple way to read a single input line from the terminal/shell/console.
- * Readline reads/writes from/to a {@link org.aesh.readline.tty.Connection}.
+ * Readline reads/writes from/to a {@link org.aesh.terminal.Connection}.
  *
  * Readline is thread safe and will not accept new {@link org.aesh.readline.Readline#readline} calls
  * while currently reading input.
diff --git a/readline/src/main/java/org/aesh/readline/tty/terminal/TerminalConnection.java b/readline/src/main/java/org/aesh/readline/tty/terminal/TerminalConnection.java
index 3a6692c7..c8a305f6 100644
--- a/readline/src/main/java/org/aesh/readline/tty/terminal/TerminalConnection.java
+++ b/readline/src/main/java/org/aesh/readline/tty/terminal/TerminalConnection.java
@@ -25,7 +25,7 @@
 import org.aesh.terminal.Terminal;
 import org.aesh.readline.terminal.TerminalBuilder;
 import org.aesh.terminal.tty.Capability;
-import org.aesh.readline.tty.Connection;
+import org.aesh.terminal.Connection;
 import org.aesh.util.LoggerUtil;
 
 import java.io.IOException;
diff --git a/readline/src/test/java/org/aesh/readline/ConsoleBufferTest.java b/readline/src/test/java/org/aesh/readline/ConsoleBufferTest.java
index 4cb60565..685c1e2f 100644
--- a/readline/src/test/java/org/aesh/readline/ConsoleBufferTest.java
+++ b/readline/src/test/java/org/aesh/readline/ConsoleBufferTest.java
@@ -24,7 +24,7 @@
 import org.aesh.readline.editing.EditModeBuilder;
 import org.aesh.readline.history.InMemoryHistory;
 import org.aesh.terminal.tty.Capability;
-import org.aesh.readline.tty.Connection;
+import org.aesh.terminal.Connection;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/readline/src/test/java/org/aesh/readline/tty/TestConnection.java b/readline/src/test/java/org/aesh/readline/tty/TestConnection.java
index 83b2d7f9..675c2b97 100644
--- a/readline/src/test/java/org/aesh/readline/tty/TestConnection.java
+++ b/readline/src/test/java/org/aesh/readline/tty/TestConnection.java
@@ -19,6 +19,7 @@
  */
 package org.aesh.readline.tty;
 
+import org.aesh.terminal.Connection;
 import org.aesh.terminal.tty.Size;
 import org.aesh.terminal.tty.Capability;
 import org.aesh.io.Decoder;
diff --git a/readline/src/main/java/org/aesh/readline/tty/Connection.java b/terminal-api/src/main/java/org/aesh/terminal/Connection.java
similarity index 99%
rename from readline/src/main/java/org/aesh/readline/tty/Connection.java
rename to terminal-api/src/main/java/org/aesh/terminal/Connection.java
index 3161592b..8c6c4c8f 100644
--- a/readline/src/main/java/org/aesh/readline/tty/Connection.java
+++ b/terminal-api/src/main/java/org/aesh/terminal/Connection.java
@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aesh.readline.tty;
+package org.aesh.terminal;
 
 import org.aesh.terminal.tty.Size;
 import org.aesh.terminal.tty.Capability;