diff --git a/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java b/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
index d5960e6..adfc47a 100644
--- a/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
+++ b/gogo/command/src/main/java/org/apache/felix/gogo/command/Files.java
@@ -23,7 +23,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandSession;
 import org.apache.felix.service.command.Descriptor;
 import org.osgi.framework.BundleContext;
 
diff --git a/gogo/pom.xml b/gogo/pom.xml
index 2468b21..8cc7dd3 100644
--- a/gogo/pom.xml
+++ b/gogo/pom.xml
@@ -29,7 +29,7 @@
     <name>Apache Felix Gogo</name>
     <description>Apache Felix Gogo Subproject</description>
     <artifactId>gogo-reactor</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
 
     <modules>
     	<module>gogo-parent</module>
diff --git a/gogo/runtime/pom.xml b/gogo/runtime/pom.xml
index 9fe6d75..6af4bf9 100644
--- a/gogo/runtime/pom.xml
+++ b/gogo/runtime/pom.xml
@@ -57,7 +57,8 @@
                     <instructions>
                         <Export-Package>
                             org.apache.felix.service.command; version=${project.version},
-                            org.apache.felix.service.threadio; version=${project.version}
+                            org.osgi.service.command; version=${project.version},
+                            org.osgi.service.threadio; version=${project.version}
                         </Export-Package>
                         <Import-Package>
                             org.osgi.service.log*; resolution:=optional,
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
index cd970f3..72cb58b 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
@@ -27,8 +27,8 @@
 import java.util.Map.Entry;
 
 import org.apache.felix.gogo.runtime.Tokenizer.Type;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Function;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Function;
 
 public class Closure implements Function, Evaluate
 {
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
index b41ca41..ca0e9cf 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
@@ -30,11 +30,11 @@
 import java.util.Map.Entry;
 
 import org.osgi.framework.BundleContext;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
-import org.apache.felix.service.command.Function;
-import org.apache.felix.service.threadio.ThreadIO;
+import org.osgi.service.command.CommandProcessor;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Converter;
+import org.osgi.service.command.Function;
+import org.osgi.service.threadio.ThreadIO;
 
 public class CommandProcessorImpl implements CommandProcessor
 {
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
index 13400df..378c2ae 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 
-import org.apache.felix.service.command.Function;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Function;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.BundleContext;
 
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
index 13ff3c5..02982a2 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
@@ -21,9 +21,9 @@
 // DWB10: add SCOPE support: https://www.osgi.org/bugzilla/show_bug.cgi?id=51
 package org.apache.felix.gogo.runtime;
 
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
-import org.apache.felix.service.threadio.ThreadIO;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Converter;
+import org.osgi.service.threadio.ThreadIO;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
index 7531835..432543d 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
@@ -26,7 +26,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.apache.felix.service.command.Converter;
+import org.osgi.service.command.Converter;
 
 public class Pipe extends Thread
 {
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
index 7df0e17..2879a98 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandSession;
 import org.apache.felix.service.command.Parameter;
 
 public final class Reflective
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
index 4deefb6..2e8246c 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
@@ -30,10 +30,10 @@
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.Converter;
-import org.apache.felix.service.command.Function;
-import org.apache.felix.service.threadio.ThreadIO;
+import org.osgi.service.command.CommandProcessor;
+import org.osgi.service.command.Converter;
+import org.osgi.service.command.Function;
+import org.osgi.service.threadio.ThreadIO;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class Activator implements BundleActivator
diff --git a/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
index c4e2a12..c3bcd60 100644
--- a/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
@@ -19,7 +19,7 @@
 // DWB20: ThreadIO should check and reset IO if something (e.g. jetty) overrides
 package org.apache.felix.gogo.runtime.threadio;
 
-import org.apache.felix.service.threadio.ThreadIO;
+import org.osgi.service.threadio.ThreadIO;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java b/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
similarity index 97%
rename from gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
rename to gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
index 2d77053..64d8549 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
+++ b/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.service.command;
+package org.osgi.service.command;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java b/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
similarity index 98%
rename from gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
rename to gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
index 6aad74f..4413008 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
+++ b/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.service.command;
+package org.osgi.service.command;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java b/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
similarity index 98%
rename from gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
rename to gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
index c13133a..14c5341 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
+++ b/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.service.command;
+package org.osgi.service.command;
 
 /**
  * A converter is a service that can help create specific object types from a
diff --git a/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java b/gogo/runtime/src/main/java/org/osgi/service/command/Function.java
similarity index 96%
rename from gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
rename to gogo/runtime/src/main/java/org/osgi/service/command/Function.java
index d861cac..a282d80 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
+++ b/gogo/runtime/src/main/java/org/osgi/service/command/Function.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.service.command;
+package org.osgi.service.command;
 
 import java.util.List;
 
diff --git a/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java b/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
similarity index 97%
rename from gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
rename to gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
index 98e78e8..483e198 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
+++ b/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.service.threadio;
+package org.osgi.service.threadio;
 
 import java.io.InputStream;
 import java.io.PrintStream;
diff --git a/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java b/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
index 42ba180..5592dc5 100644
--- a/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
+++ b/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
@@ -19,7 +19,7 @@
 package org.apache.felix.gogo.runtime;
 
 import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandSession;
 
 public class Context extends CommandProcessorImpl
 {
diff --git a/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java b/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
index 5f4268f..e47d0a7 100644
--- a/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
+++ b/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
@@ -22,8 +22,8 @@
 
 import org.apache.felix.gogo.runtime.Parser;
 import org.apache.felix.gogo.runtime.Token;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Function;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Function;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
index af47f6b..280ea5d 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
@@ -23,9 +23,9 @@
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Set;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
+import org.osgi.service.command.CommandProcessor;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Converter;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
index 588baa2..f66a0ae 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Builtin.java
@@ -42,8 +42,8 @@
 
 import org.apache.felix.gogo.options.Option;
 import org.apache.felix.gogo.options.Options;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Converter;
 
 /**
  * gosh built-in commands.
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
index 17d1c5f..1f021e7 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Console.java
@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Converter;
 
 public class Console implements Runnable
 {
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
index b76440a..55aa871 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
@@ -30,8 +30,8 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
-import org.apache.felix.service.command.Converter;
-import org.apache.felix.service.command.Function;
+import org.osgi.service.command.Converter;
+import org.osgi.service.command.Function;
 import org.osgi.service.startlevel.StartLevel;
 
 public class Converters implements Converter
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
index 39b8005..389dca7 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Posix.java
@@ -30,7 +30,7 @@
 
 import org.apache.felix.gogo.options.Option;
 import org.apache.felix.gogo.options.Options;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandSession;
 
 /**
  * Posix-like utilities.
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
index 76bbee2..8a385c5 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Procedural.java
@@ -21,8 +21,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Function;
+import org.osgi.service.command.CommandSession;
+import org.osgi.service.command.Function;
 
 public class Procedural
 {
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
index 3082a35..afc4966 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
@@ -30,8 +30,8 @@
 
 import org.apache.felix.gogo.options.Option;
 import org.apache.felix.gogo.options.Options;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandProcessor;
+import org.osgi.service.command.CommandSession;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 
diff --git a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
index c3acf6d..1581d1e 100644
--- a/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
+++ b/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
@@ -26,8 +26,8 @@
 
 import org.apache.felix.gogo.options.Option;
 import org.apache.felix.gogo.options.Options;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
+import org.osgi.service.command.CommandProcessor;
+import org.osgi.service.command.CommandSession;
 
 /*
  * a very simple Telnet server.