diff --git a/gclc-swt/pom.xml b/gclc-swt/pom.xml
index 9c8ff72..7cb5307 100644
--- a/gclc-swt/pom.xml
+++ b/gclc-swt/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>net.bigeon.config</groupId>
 		<artifactId>swt-config</artifactId>
-		<version>1.8.11</version>
+		<version>1.8.19</version>
 	</parent>
 	<groupId>net.bigeon.gclc</groupId>
 	<artifactId>swt</artifactId>
@@ -48,17 +48,17 @@
 		<dependency>
 			<groupId>net.bigeon</groupId>
 			<artifactId>gclc</artifactId>
-			<version>2.0.12</version>
+			<version>2.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.bigeon</groupId>
 			<artifactId>collections</artifactId>
-			<version>1.2.0</version>
+			<version>1.2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>2.23.0</version>
+			<version>2.27.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleInputManager.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleInputManager.java
index 347f8f7..ea47666 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleInputManager.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleInputManager.java
@@ -41,7 +41,7 @@ import java.io.IOException;
 
 import org.eclipse.swt.widgets.Text;
 
-import net.bigeon.gclc.utils.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleInput;
 
 /** The object managing the console input.
  * 
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputManager.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputManager.java
index 2ad7a0e..a9f5505 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputManager.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/ConsoleOutputManager.java
@@ -39,8 +39,8 @@ package net.bigeon.gclc.swt;
 
 import org.eclipse.swt.widgets.Text;
 
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 import net.bigeon.gclc.swt.tools.ToSWTConsoleForwardRunnable;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
 
 /** The manager for console output to insert in a text.
  * 
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java
index b23beba..d019ec1 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsole.java
@@ -77,8 +77,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-import net.bigeon.gclc.utils.PipedConsoleInput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 
 /** A shell containing a {@link SWTConsoleView}
  * <p>
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java
index dbd1b1f..04f06d1 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/SWTConsoleView.java
@@ -76,8 +76,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 
 import net.bigeon.gclc.ConsoleApplication;
-import net.bigeon.gclc.utils.PipedConsoleInput;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 
 /** A SWT component to connect to gclc {@link ConsoleApplication}.
  *
diff --git a/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/ToSWTConsoleForwardRunnable.java b/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/ToSWTConsoleForwardRunnable.java
index 2574373..a747cca 100644
--- a/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/ToSWTConsoleForwardRunnable.java
+++ b/gclc-swt/src/main/java/net/bigeon/gclc/swt/tools/ToSWTConsoleForwardRunnable.java
@@ -5,9 +5,9 @@ package net.bigeon.gclc.swt.tools;
 
 import org.eclipse.swt.widgets.Widget;
 
+import net.bigeon.gclc.manager.PipedConsoleOutput;
+import net.bigeon.gclc.manager.forwarding.AOutputForwardRunnable;
 import net.bigeon.gclc.swt.ConsoleOutputDisplay;
-import net.bigeon.gclc.utils.AOutputForwardRunnable;
-import net.bigeon.gclc.utils.PipedConsoleOutput;
 
 /** The local implementation of the forwarding runnable.
  *
diff --git a/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java
index f57f5dd..29fc977 100644
--- a/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleInputManagerTest.java
@@ -39,17 +39,14 @@ package net.bigeon.gclc.swt;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 
 import org.eclipse.swt.widgets.Text;
 import org.junit.Test;
 
-import net.bigeon.gclc.utils.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleInput;
 
 /** @author Emmanuel Bigeon */
 public class ConsoleInputManagerTest {
diff --git a/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleOutputManagerTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleOutputManagerTest.java
index 4b6c0c7..663cfd2 100644
--- a/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleOutputManagerTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/ConsoleOutputManagerTest.java
@@ -38,10 +38,7 @@ package net.bigeon.gclc.swt;
  */
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 
@@ -51,7 +48,7 @@ import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import net.bigeon.gclc.utils.PipedConsoleOutput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
 
 /** @author Emmanuel Bigeon */
 public class ConsoleOutputManagerTest {
diff --git a/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java
index e5b26ce..747abb3 100644
--- a/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleShellTest.java
@@ -44,6 +44,9 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.junit.Test;
 
+import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
+
 /** @author Emmanuel Bigeon */
 public class SWTConsoleShellTest {
 
@@ -61,7 +64,7 @@ public class SWTConsoleShellTest {
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.swt.SWTConsole#connect(net.bigeon.gclc.utils.PipedConsoleInput, net.bigeon.gclc.utils.PipedConsoleOutput, java.io.BufferedReader)}. */
+     * {@link net.bigeon.gclc.swt.SWTConsole#connect(PipedConsoleInput, PipedConsoleOutput, java.io.BufferedReader)}. */
     @Test
     public void testConnect() {
         final SWTConsole console = new SWTConsole(new Shell(), SWT.NONE);
diff --git a/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java
index a0ddbfa..00a35b7 100644
--- a/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java
+++ b/gclc-swt/src/test/java/net/bigeon/gclc/swt/SWTConsoleViewTest.java
@@ -44,6 +44,9 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Shell;
 import org.junit.Test;
 
+import net.bigeon.gclc.manager.PipedConsoleInput;
+import net.bigeon.gclc.manager.PipedConsoleOutput;
+
 /** @author Emmanuel Bigeon */
 public class SWTConsoleViewTest {
 
@@ -65,7 +68,7 @@ public class SWTConsoleViewTest {
     }
 
     /** Test method for
-     * {@link net.bigeon.gclc.swt.SWTConsoleView#setManager(net.bigeon.gclc.utils.PipedConsoleOutput, net.bigeon.gclc.utils.PipedConsoleInput)}. */
+     * {@link net.bigeon.gclc.swt.SWTConsoleView#setManager(PipedConsoleOutput, PipedConsoleInput)}. */
     @Test
     public void testSetManager() {
         final SWTConsoleView view = new SWTConsoleView(new Shell(), SWT.NONE);