diff --git a/gogo/pom.xml b/gogo/pom.xml
index dffe91e..98f019e 100644
--- a/gogo/pom.xml
+++ b/gogo/pom.xml
@@ -34,7 +34,7 @@
 
     <modules>
         <module>runtime</module>
-        <module>console</module>
+        <module>shell</module>
         <module>commands</module>
         <module>felixcommands</module>
     </modules>
diff --git a/gogo/console/NOTICE b/gogo/shell/NOTICE
similarity index 100%
rename from gogo/console/NOTICE
rename to gogo/shell/NOTICE
diff --git a/gogo/console/pom.xml b/gogo/shell/pom.xml
similarity index 100%
rename from gogo/console/pom.xml
rename to gogo/shell/pom.xml
diff --git a/gogo/console/src/main/java/org/apache/felix/gogo/options/Option.java b/gogo/shell/src/main/java/org/apache/felix/gogo/options/Option.java
similarity index 100%
rename from gogo/console/src/main/java/org/apache/felix/gogo/options/Option.java
rename to gogo/shell/src/main/java/org/apache/felix/gogo/options/Option.java
diff --git a/gogo/console/src/main/java/org/apache/felix/gogo/options/Options.java b/gogo/shell/src/main/java/org/apache/felix/gogo/options/Options.java
similarity index 100%
rename from gogo/console/src/main/java/org/apache/felix/gogo/options/Options.java
rename to gogo/shell/src/main/java/org/apache/felix/gogo/options/Options.java
diff --git a/gogo/console/src/main/java/org/apache/felix/gogo/shell/Activator.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
similarity index 100%
rename from gogo/console/src/main/java/org/apache/felix/gogo/shell/Activator.java
rename to gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
diff --git a/gogo/console/src/main/java/org/apache/felix/gogo/shell/Builtin.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
similarity index 100%
rename from gogo/console/src/main/java/org/apache/felix/gogo/shell/Builtin.java
rename to gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
diff --git a/gogo/console/src/main/java/org/apache/felix/gogo/shell/Console.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
similarity index 100%
rename from gogo/console/src/main/java/org/apache/felix/gogo/shell/Console.java
rename to gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
diff --git a/gogo/console/src/main/java/org/apache/felix/gogo/shell/Converters.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
similarity index 100%
rename from gogo/console/src/main/java/org/apache/felix/gogo/shell/Converters.java
rename to gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
diff --git a/gogo/console/src/main/java/org/apache/felix/gogo/shell/Posix.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
similarity index 100%
rename from gogo/console/src/main/java/org/apache/felix/gogo/shell/Posix.java
rename to gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
diff --git a/gogo/console/src/main/java/org/apache/felix/gogo/shell/Procedural.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
similarity index 100%
rename from gogo/console/src/main/java/org/apache/felix/gogo/shell/Procedural.java
rename to gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
diff --git a/gogo/console/src/main/java/org/apache/felix/gogo/shell/Shell.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
similarity index 100%
rename from gogo/console/src/main/java/org/apache/felix/gogo/shell/Shell.java
rename to gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
diff --git a/gogo/console/src/main/java/org/apache/felix/gogo/shell/Telnet.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
similarity index 100%
rename from gogo/console/src/main/java/org/apache/felix/gogo/shell/Telnet.java
rename to gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
diff --git a/gogo/console/src/main/resources/gosh_profile b/gogo/shell/src/main/resources/gosh_profile
similarity index 100%
rename from gogo/console/src/main/resources/gosh_profile
rename to gogo/shell/src/main/resources/gosh_profile
diff --git a/gogo/console/src/main/resources/motd b/gogo/shell/src/main/resources/motd
similarity index 100%
rename from gogo/console/src/main/resources/motd
rename to gogo/shell/src/main/resources/motd