diff --git a/gogo/runtime/pom.xml b/gogo/runtime/pom.xml
index 667d09d..a29ed2f 100644
--- a/gogo/runtime/pom.xml
+++ b/gogo/runtime/pom.xml
@@ -57,7 +57,8 @@
                     <instructions>
                         <Export-Package>
                             org.apache.felix.service.command;
-                            org.apache.felix.service.threadio; version=${project.version}; status="provisional"; mandatory:="status"
+                            org.apache.felix.service.threadio; version=${project.version}; status="provisional"; mandatory:="status",
+                            org.apache.felix.gogo.api; version=${project.version}
                         </Export-Package>
                         <Import-Package>
                             org.osgi.service.event*; resolution:=optional,
diff --git a/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSessionListener.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/api/CommandSessionListener.java
similarity index 93%
rename from gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSessionListener.java
rename to gogo/runtime/src/main/java/org/apache/felix/gogo/api/CommandSessionListener.java
index 30e9b21..92e27d2 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSessionListener.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/api/CommandSessionListener.java
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.service.command;
+package org.apache.felix.gogo.api;
+
+import org.apache.felix.service.command.CommandSession;
 
 /**
  * Listener for command executions.
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 6cbb70b..3ec9566 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
@@ -32,7 +32,7 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.apache.felix.service.command.CommandSessionListener;
+import org.apache.felix.gogo.api.CommandSessionListener;
 import org.apache.felix.service.command.CommandProcessor;
 import org.apache.felix.service.command.CommandSession;
 import org.apache.felix.service.command.Converter;
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 b60ed65..f7652b0 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
@@ -23,7 +23,7 @@
 
 import org.apache.felix.gogo.runtime.CommandProcessorImpl;
 import org.apache.felix.gogo.runtime.CommandProxy;
-import org.apache.felix.service.command.CommandSessionListener;
+import org.apache.felix.gogo.api.CommandSessionListener;
 import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
index 2ac94d0..2368ce1 100644
--- a/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
+++ b/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
@@ -20,8 +20,8 @@
 
 import java.util.Properties;
 
+import org.apache.felix.gogo.api.CommandSessionListener;
 import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.CommandSessionListener;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;