diff --git a/gogo/gogo.commands/pom.xml b/gogo/commands/pom.xml
similarity index 100%
rename from gogo/gogo.commands/pom.xml
rename to gogo/commands/pom.xml
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/Action.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/Action.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/Action.java
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/Argument.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/Argument.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/Argument.java
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/Command.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/Command.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/Command.java
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/Option.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/Option.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/Option.java
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/AbstractCommand.java
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/ActionPreparator.java
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/basic/SimpleCommand.java
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
diff --git a/gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java b/gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
similarity index 100%
rename from gogo/gogo.commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
rename to gogo/commands/src/main/java/org/apache/felix/gogo/commands/converter/ReifiedType.java
diff --git a/gogo/gogo.commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java b/gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
similarity index 100%
rename from gogo/gogo.commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
rename to gogo/commands/src/test/java/org/apache/felix/gogo/commands/TestCommands.java
diff --git a/gogo/gogo.console/pom.xml b/gogo/console/pom.xml
similarity index 100%
rename from gogo/gogo.console/pom.xml
rename to gogo/console/pom.xml
diff --git a/gogo/gogo.console/src/main/java/org/apache/felix/gogo/console/Activator.java b/gogo/console/src/main/java/org/apache/felix/gogo/console/Activator.java
similarity index 100%
rename from gogo/gogo.console/src/main/java/org/apache/felix/gogo/console/Activator.java
rename to gogo/console/src/main/java/org/apache/felix/gogo/console/Activator.java
diff --git a/gogo/gogo.console/src/main/java/org/apache/felix/gogo/console/stdio/Console.java b/gogo/console/src/main/java/org/apache/felix/gogo/console/stdio/Console.java
similarity index 100%
rename from gogo/gogo.console/src/main/java/org/apache/felix/gogo/console/stdio/Console.java
rename to gogo/console/src/main/java/org/apache/felix/gogo/console/stdio/Console.java
diff --git a/gogo/gogo.console/src/main/java/org/apache/felix/gogo/console/stdio/StdioConsole.java b/gogo/console/src/main/java/org/apache/felix/gogo/console/stdio/StdioConsole.java
similarity index 100%
rename from gogo/gogo.console/src/main/java/org/apache/felix/gogo/console/stdio/StdioConsole.java
rename to gogo/console/src/main/java/org/apache/felix/gogo/console/stdio/StdioConsole.java
diff --git a/gogo/gogo.console/src/main/java/org/apache/felix/gogo/console/telnet/Handler.java b/gogo/console/src/main/java/org/apache/felix/gogo/console/telnet/Handler.java
similarity index 100%
rename from gogo/gogo.console/src/main/java/org/apache/felix/gogo/console/telnet/Handler.java
rename to gogo/console/src/main/java/org/apache/felix/gogo/console/telnet/Handler.java
diff --git a/gogo/gogo.console/src/main/java/org/apache/felix/gogo/console/telnet/TelnetShell.java b/gogo/console/src/main/java/org/apache/felix/gogo/console/telnet/TelnetShell.java
similarity index 100%
rename from gogo/gogo.console/src/main/java/org/apache/felix/gogo/console/telnet/TelnetShell.java
rename to gogo/console/src/main/java/org/apache/felix/gogo/console/telnet/TelnetShell.java
diff --git a/gogo/gogo.launcher/pom.xml b/gogo/launcher/pom.xml
similarity index 100%
rename from gogo/gogo.launcher/pom.xml
rename to gogo/launcher/pom.xml
diff --git a/gogo/gogo.launcher/src/main/java/org/apache/felix/gogo/launcher/Launcher.java b/gogo/launcher/src/main/java/org/apache/felix/gogo/launcher/Launcher.java
similarity index 100%
rename from gogo/gogo.launcher/src/main/java/org/apache/felix/gogo/launcher/Launcher.java
rename to gogo/launcher/src/main/java/org/apache/felix/gogo/launcher/Launcher.java
diff --git a/gogo/pom.xml b/gogo/pom.xml
index bb875f1..2b2b6f6 100644
--- a/gogo/pom.xml
+++ b/gogo/pom.xml
@@ -33,10 +33,10 @@
     <version>1.0.0-SNAPSHOT</version>
 
     <modules>
-        <module>gogo.runtime</module>
-        <module>gogo.launcher</module>
-        <module>gogo.console</module>
-        <module>gogo.commands</module>
+        <module>runtime</module>
+        <module>launcher</module>
+        <module>console</module>
+        <module>commands</module>
     </modules>
 
     <dependencyManagement>
diff --git a/gogo/gogo.runtime/pom.xml b/gogo/runtime/pom.xml
similarity index 100%
rename from gogo/gogo.runtime/pom.xml
rename to gogo/runtime/pom.xml
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/Activator.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Activator.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/Activator.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Activator.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/cpeg/Procedural.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/cpeg/Procedural.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/cpeg/Procedural.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/cpeg/Procedural.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/lang/Support.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/lang/Support.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/lang/Support.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/lang/Support.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/OSGiCommands.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/OSGiCommands.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/OSGiCommands.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/OSGiCommands.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/OSGiShell.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/OSGiShell.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/OSGiShell.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/OSGiShell.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/ServiceCommand.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/ServiceCommand.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/ServiceCommand.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/osgi/ServiceCommand.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Closure.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Closure.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Closure.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Closure.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Command.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Command.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Command.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Command.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandSessionImpl.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandShellImpl.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandShellImpl.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandShellImpl.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/CommandShellImpl.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Context.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Context.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Context.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Context.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Parser.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Parser.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Parser.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Parser.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Pipe.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Pipe.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Pipe.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Pipe.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/shell/Reflective.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/Marker.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/Marker.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/Marker.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/Marker.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadInputStream.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadInputStream.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadInputStream.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadInputStream.java
diff --git a/gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadPrintStream.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadPrintStream.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadPrintStream.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadPrintStream.java
diff --git a/gogo/gogo.runtime/src/main/java/org/osgi/service/command/CommandProcessor.java b/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
rename to gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
diff --git a/gogo/gogo.runtime/src/main/java/org/osgi/service/command/CommandSession.java b/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/osgi/service/command/CommandSession.java
rename to gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
diff --git a/gogo/gogo.runtime/src/main/java/org/osgi/service/command/Converter.java b/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/osgi/service/command/Converter.java
rename to gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
diff --git a/gogo/gogo.runtime/src/main/java/org/osgi/service/command/Function.java b/gogo/runtime/src/main/java/org/osgi/service/command/Function.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/osgi/service/command/Function.java
rename to gogo/runtime/src/main/java/org/osgi/service/command/Function.java
diff --git a/gogo/gogo.runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java b/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
similarity index 100%
rename from gogo/gogo.runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
rename to gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
diff --git a/gogo/gogo.runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser.java b/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser.java
similarity index 100%
rename from gogo/gogo.runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser.java
rename to gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/shell/TestParser.java
diff --git a/gogo/gogo.runtime/src/test/java/org/apache/felix/gogo/runtime/threadio/TestThreadIO.java b/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/threadio/TestThreadIO.java
similarity index 100%
rename from gogo/gogo.runtime/src/test/java/org/apache/felix/gogo/runtime/threadio/TestThreadIO.java
rename to gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/threadio/TestThreadIO.java