diff --git a/gogo/pom.xml b/gogo/pom.xml
new file mode 100644
index 0000000..45d8e8a
--- /dev/null
+++ b/gogo/pom.xml
@@ -0,0 +1,91 @@
+<!--
+ 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</groupId>
+    <artifactId>felix-parent</artifactId>
+    <version>1.2.0</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Gogo Shell</name>
+  <artifactId>org.apache.felix.gogo</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <dependencies>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>1.2.0</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>org.osgi.compendium</artifactId>
+        <version>1.2.0</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>4.5</version>
+          <scope>test</scope>
+      </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.0.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>org.osgi.service.command; version=1.0.0</Export-Package>
+            <Private-Package>aQute.*</Private-Package>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+        <configuration>
+          <excludeSubProjects>false</excludeSubProjects>
+          <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+          <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+          <excludes>
+            <param>doc/*</param>
+            <param>maven-eclipse.xml</param>
+            <param>.checkstyle</param>
+            <param>.externalToolBuilders/*</param>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+              <source>1.5</source>
+              <target>1.5</target>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/gogo/src/aQute/cpeg/Procedural.java b/gogo/src/main/java/aQute/cpeg/Procedural.java
similarity index 100%
rename from gogo/src/aQute/cpeg/Procedural.java
rename to gogo/src/main/java/aQute/cpeg/Procedural.java
diff --git a/gogo/src/aQute/osgi/launcher/Launcher.java b/gogo/src/main/java/aQute/osgi/launcher/Launcher.java
similarity index 100%
rename from gogo/src/aQute/osgi/launcher/Launcher.java
rename to gogo/src/main/java/aQute/osgi/launcher/Launcher.java
diff --git a/gogo/src/aQute/shell/console/Console.java b/gogo/src/main/java/aQute/shell/console/Console.java
similarity index 100%
rename from gogo/src/aQute/shell/console/Console.java
rename to gogo/src/main/java/aQute/shell/console/Console.java
diff --git a/gogo/src/aQute/shell/equinox/Equinox.java b/gogo/src/main/java/aQute/shell/equinox/Equinox.java
similarity index 100%
rename from gogo/src/aQute/shell/equinox/Equinox.java
rename to gogo/src/main/java/aQute/shell/equinox/Equinox.java
diff --git a/gogo/src/aQute/shell/lang/Support.java b/gogo/src/main/java/aQute/shell/lang/Support.java
similarity index 100%
rename from gogo/src/aQute/shell/lang/Support.java
rename to gogo/src/main/java/aQute/shell/lang/Support.java
diff --git a/gogo/src/aQute/shell/osgi/OSGiCommands.java b/gogo/src/main/java/aQute/shell/osgi/OSGiCommands.java
similarity index 100%
rename from gogo/src/aQute/shell/osgi/OSGiCommands.java
rename to gogo/src/main/java/aQute/shell/osgi/OSGiCommands.java
diff --git a/gogo/src/aQute/shell/osgi/OSGiShell.java b/gogo/src/main/java/aQute/shell/osgi/OSGiShell.java
similarity index 100%
rename from gogo/src/aQute/shell/osgi/OSGiShell.java
rename to gogo/src/main/java/aQute/shell/osgi/OSGiShell.java
diff --git a/gogo/src/aQute/shell/osgi/ServiceCommand.java b/gogo/src/main/java/aQute/shell/osgi/ServiceCommand.java
similarity index 100%
rename from gogo/src/aQute/shell/osgi/ServiceCommand.java
rename to gogo/src/main/java/aQute/shell/osgi/ServiceCommand.java
diff --git a/gogo/src/aQute/shell/runtime/Closure.java b/gogo/src/main/java/aQute/shell/runtime/Closure.java
similarity index 100%
rename from gogo/src/aQute/shell/runtime/Closure.java
rename to gogo/src/main/java/aQute/shell/runtime/Closure.java
diff --git a/gogo/src/aQute/shell/runtime/Command.java b/gogo/src/main/java/aQute/shell/runtime/Command.java
similarity index 100%
rename from gogo/src/aQute/shell/runtime/Command.java
rename to gogo/src/main/java/aQute/shell/runtime/Command.java
diff --git a/gogo/src/aQute/shell/runtime/CommandSessionImpl.java b/gogo/src/main/java/aQute/shell/runtime/CommandSessionImpl.java
similarity index 100%
rename from gogo/src/aQute/shell/runtime/CommandSessionImpl.java
rename to gogo/src/main/java/aQute/shell/runtime/CommandSessionImpl.java
diff --git a/gogo/src/aQute/shell/runtime/CommandShellImpl.java b/gogo/src/main/java/aQute/shell/runtime/CommandShellImpl.java
similarity index 100%
rename from gogo/src/aQute/shell/runtime/CommandShellImpl.java
rename to gogo/src/main/java/aQute/shell/runtime/CommandShellImpl.java
diff --git a/gogo/src/aQute/shell/runtime/Parser.java b/gogo/src/main/java/aQute/shell/runtime/Parser.java
similarity index 100%
rename from gogo/src/aQute/shell/runtime/Parser.java
rename to gogo/src/main/java/aQute/shell/runtime/Parser.java
diff --git a/gogo/src/aQute/shell/runtime/Pipe.java b/gogo/src/main/java/aQute/shell/runtime/Pipe.java
similarity index 100%
rename from gogo/src/aQute/shell/runtime/Pipe.java
rename to gogo/src/main/java/aQute/shell/runtime/Pipe.java
diff --git a/gogo/src/aQute/shell/runtime/Reflective.java b/gogo/src/main/java/aQute/shell/runtime/Reflective.java
similarity index 100%
rename from gogo/src/aQute/shell/runtime/Reflective.java
rename to gogo/src/main/java/aQute/shell/runtime/Reflective.java
diff --git a/gogo/src/aQute/shell/stdio/StdioConsole.java b/gogo/src/main/java/aQute/shell/stdio/StdioConsole.java
similarity index 100%
rename from gogo/src/aQute/shell/stdio/StdioConsole.java
rename to gogo/src/main/java/aQute/shell/stdio/StdioConsole.java
diff --git a/gogo/src/aQute/shell/telnet/Handler.java b/gogo/src/main/java/aQute/shell/telnet/Handler.java
similarity index 100%
rename from gogo/src/aQute/shell/telnet/Handler.java
rename to gogo/src/main/java/aQute/shell/telnet/Handler.java
diff --git a/gogo/src/aQute/shell/telnet/TelnetShell.java b/gogo/src/main/java/aQute/shell/telnet/TelnetShell.java
similarity index 100%
rename from gogo/src/aQute/shell/telnet/TelnetShell.java
rename to gogo/src/main/java/aQute/shell/telnet/TelnetShell.java
diff --git a/gogo/src/aQute/threadio/Marker.java b/gogo/src/main/java/aQute/threadio/Marker.java
similarity index 100%
rename from gogo/src/aQute/threadio/Marker.java
rename to gogo/src/main/java/aQute/threadio/Marker.java
diff --git a/gogo/src/aQute/threadio/ThreadIOImpl.java b/gogo/src/main/java/aQute/threadio/ThreadIOImpl.java
similarity index 100%
rename from gogo/src/aQute/threadio/ThreadIOImpl.java
rename to gogo/src/main/java/aQute/threadio/ThreadIOImpl.java
diff --git a/gogo/src/aQute/threadio/ThreadInputStream.java b/gogo/src/main/java/aQute/threadio/ThreadInputStream.java
similarity index 100%
rename from gogo/src/aQute/threadio/ThreadInputStream.java
rename to gogo/src/main/java/aQute/threadio/ThreadInputStream.java
diff --git a/gogo/src/aQute/threadio/ThreadPrintStream.java b/gogo/src/main/java/aQute/threadio/ThreadPrintStream.java
similarity index 100%
rename from gogo/src/aQute/threadio/ThreadPrintStream.java
rename to gogo/src/main/java/aQute/threadio/ThreadPrintStream.java
diff --git a/gogo/src/org/osgi/framework/boot/SystemBundle.java b/gogo/src/main/java/org/osgi/framework/boot/SystemBundle.java
similarity index 100%
rename from gogo/src/org/osgi/framework/boot/SystemBundle.java
rename to gogo/src/main/java/org/osgi/framework/boot/SystemBundle.java
diff --git a/gogo/src/org/osgi/service/command/CommandProcessor.java b/gogo/src/main/java/org/osgi/service/command/CommandProcessor.java
similarity index 100%
rename from gogo/src/org/osgi/service/command/CommandProcessor.java
rename to gogo/src/main/java/org/osgi/service/command/CommandProcessor.java
diff --git a/gogo/src/org/osgi/service/command/CommandSession.java b/gogo/src/main/java/org/osgi/service/command/CommandSession.java
similarity index 98%
rename from gogo/src/org/osgi/service/command/CommandSession.java
rename to gogo/src/main/java/org/osgi/service/command/CommandSession.java
index 6770689..fecc242 100644
--- a/gogo/src/org/osgi/service/command/CommandSession.java
+++ b/gogo/src/main/java/org/osgi/service/command/CommandSession.java
@@ -46,7 +46,7 @@
 	 * @return InpuStream used closest to the user or null if input is from a
 	 *         file.
 	 */
-	InputStream getKeybord();
+	InputStream getKeyboard();
 
 	/**
 	 * Return the PrintStream for the console. This must always be the stream
diff --git a/gogo/src/org/osgi/service/command/Converter.java b/gogo/src/main/java/org/osgi/service/command/Converter.java
similarity index 100%
rename from gogo/src/org/osgi/service/command/Converter.java
rename to gogo/src/main/java/org/osgi/service/command/Converter.java
diff --git a/gogo/src/org/osgi/service/command/Function.java b/gogo/src/main/java/org/osgi/service/command/Function.java
similarity index 100%
rename from gogo/src/org/osgi/service/command/Function.java
rename to gogo/src/main/java/org/osgi/service/command/Function.java
diff --git a/gogo/src/org/osgi/service/threadio/ThreadIO.java b/gogo/src/main/java/org/osgi/service/threadio/ThreadIO.java
similarity index 100%
rename from gogo/src/org/osgi/service/threadio/ThreadIO.java
rename to gogo/src/main/java/org/osgi/service/threadio/ThreadIO.java
diff --git a/gogo/test/test/aQute/shell/runtime/Context.java b/gogo/src/test/java/test/aQute/shell/runtime/Context.java
similarity index 100%
rename from gogo/test/test/aQute/shell/runtime/Context.java
rename to gogo/src/test/java/test/aQute/shell/runtime/Context.java
diff --git a/gogo/test/test/aQute/shell/runtime/TestParser.java b/gogo/src/test/java/test/aQute/shell/runtime/TestParser.java
similarity index 100%
rename from gogo/test/test/aQute/shell/runtime/TestParser.java
rename to gogo/src/test/java/test/aQute/shell/runtime/TestParser.java
diff --git a/gogo/test/test/aQute/threadio/TestThreadIO.java b/gogo/src/test/java/test/aQute/threadio/TestThreadIO.java
similarity index 100%
rename from gogo/test/test/aQute/threadio/TestThreadIO.java
rename to gogo/src/test/java/test/aQute/threadio/TestThreadIO.java