diff --git a/gogo/commands/NOTICE b/gogo/commands/NOTICE
deleted file mode 100644
index 30a853c..0000000
--- a/gogo/commands/NOTICE
+++ /dev/null
@@ -1,26 +0,0 @@
-Apache Felix Gogo Commands
-Copyright 2009 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
-
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
-
-
-III. License Summary
-- Apache License 2.0
diff --git a/gogo/commands/pom.xml b/gogo/commands/pom.xml
deleted file mode 100644
index d465ff3..0000000
--- a/gogo/commands/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.apache.felix.gogo</groupId>
-        <artifactId>gogo</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>bundle</packaging>
-    <name>Apache Felix Gogo Command Framework</name>
-    <artifactId>org.apache.felix.gogo.commands</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix.gogo</groupId>
-            <artifactId>org.apache.felix.gogo.runtime</artifactId>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>
-                            org.apache.felix.gogo.commands*;version=${project.version},
-                        </Export-Package>
-                        <Import-Package>
-                            !org.apache.felix.gogo.commands.basic,
-                            !org.apache.felix.gogo.commands.converter,
-                            *
-                        </Import-Package>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-                        <Include-Resource>{maven-resources},META-INF/NOTICE=NOTICE</Include-Resource>
-                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-                        <_removeheaders>Private-Package,Ignore-Package,Include-Resource</_removeheaders>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/karaf/shell/console/pom.xml b/karaf/shell/console/pom.xml
index 37b9eb4..60bb571 100644
--- a/karaf/shell/console/pom.xml
+++ b/karaf/shell/console/pom.xml
@@ -67,10 +67,6 @@
             <groupId>org.apache.felix.gogo</groupId>
             <artifactId>org.apache.felix.gogo.runtime</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.felix.gogo</groupId>
-            <artifactId>org.apache.felix.gogo.commands</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Action.java
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Command.java
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
diff --git a/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java b/karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
similarity index 100%
rename from gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
rename to karaf/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
diff --git a/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java b/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java
similarity index 88%
rename from gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
rename to karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java
index 1d466ff..1e266da 100644
--- a/gogo/commands/src/test/java/org/apache/felix/gogo/commands/Context.java
+++ b/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/Context.java
@@ -18,11 +18,11 @@
  */
 package org.apache.felix.gogo.commands;
 
-import org.apache.felix.gogo.runtime.CommandProcessorImpl;
-import org.apache.felix.gogo.runtime.CommandSessionImpl;
 import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
+import org.apache.felix.gogo.runtime.shell.CommandShellImpl;
+import org.apache.felix.gogo.runtime.shell.CommandSessionImpl;
 
-public class Context extends CommandProcessorImpl
+public class Context extends CommandShellImpl
 {
     public static final String EMPTY = "";
     CommandSessionImpl session = (CommandSessionImpl) createSession(System.in, System.out, System.err);
@@ -37,7 +37,7 @@
 
     public Context()
     {
-        super(threadio, null);
+        setThreadio(threadio);
     }
 
     public Object execute(CharSequence source) throws Exception
diff --git a/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java b/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
similarity index 99%
rename from gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
rename to karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
index 39da2a5..72256e0 100644
--- a/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
+++ b/karaf/shell/console/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
@@ -136,4 +136,4 @@
             return ids;
         }
     }
-}
+}
\ No newline at end of file