diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/AddPeerCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/AddPeerCommand.java
similarity index 97%
rename from apps/sdnip/src/main/java/org/onosproject/sdnip/cli/AddPeerCommand.java
rename to apps/routing/src/main/java/org/onosproject/routing/cli/AddPeerCommand.java
index 81231ab..d3162ed 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/AddPeerCommand.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/AddPeerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2016 Open Networking Laboratory
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.sdnip.cli;
+package org.onosproject.routing.cli;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/AddSpeakerCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/AddSpeakerCommand.java
similarity index 96%
rename from apps/sdnip/src/main/java/org/onosproject/sdnip/cli/AddSpeakerCommand.java
rename to apps/routing/src/main/java/org/onosproject/routing/cli/AddSpeakerCommand.java
index 8435385..e414239 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/AddSpeakerCommand.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/AddSpeakerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2016 Open Networking Laboratory
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.sdnip.cli;
+package org.onosproject.routing.cli;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/RemovePeerCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/RemovePeerCommand.java
similarity index 96%
rename from apps/sdnip/src/main/java/org/onosproject/sdnip/cli/RemovePeerCommand.java
rename to apps/routing/src/main/java/org/onosproject/routing/cli/RemovePeerCommand.java
index bfc6fb7..e3f7ff3 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/RemovePeerCommand.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/RemovePeerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2016 Open Networking Laboratory
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.sdnip.cli;
+package org.onosproject.routing.cli;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/RemoveSpeakerCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/RemoveSpeakerCommand.java
similarity index 96%
rename from apps/sdnip/src/main/java/org/onosproject/sdnip/cli/RemoveSpeakerCommand.java
rename to apps/routing/src/main/java/org/onosproject/routing/cli/RemoveSpeakerCommand.java
index 6a51b42..2ce6da2 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/RemoveSpeakerCommand.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/RemoveSpeakerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2016 Open Networking Laboratory
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.sdnip.cli;
+package org.onosproject.routing.cli;
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
diff --git a/apps/routing/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/routing/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index d5ca246..ab9c620 100644
--- a/apps/routing/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/apps/routing/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -37,5 +37,17 @@
     <command>
       <action class="org.onosproject.routing.cli.PrimaryChangeCommand"/>
     </command>
+    <command>
+      <action class="org.onosproject.routing.cli.AddSpeakerCommand"/>
+    </command>
+    <command>
+      <action class="org.onosproject.routing.cli.RemoveSpeakerCommand"/>
+    </command>
+    <command>
+      <action class="org.onosproject.routing.cli.AddPeerCommand"/>
+    </command>
+    <command>
+      <action class="org.onosproject.routing.cli.RemovePeerCommand"/>
+    </command>
   </command-bundle>
 </blueprint>
diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/package-info.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/package-info.java
deleted file mode 100644
index 73ea2a4..0000000
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2014 Open Networking Laboratory
- *
- * Licensed 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.
- */
-
-/**
- * SDN-IP command-line handlers.
- */
-package org.onosproject.sdnip.cli;
diff --git a/apps/sdnip/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/sdnip/src/main/resources/OSGI-INF/blueprint/shell-config.xml
deleted file mode 100644
index 0238d46..0000000
--- a/apps/sdnip/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  ~ Copyright 2014 Open Networking Laboratory
-  ~
-  ~ Licensed 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.
-  -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-
-  <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
-    <command>
-      <action class="org.onosproject.sdnip.cli.AddSpeakerCommand"/>
-    </command>
-    <command>
-      <action class="org.onosproject.sdnip.cli.RemoveSpeakerCommand"/>
-    </command>
-    <command>
-      <action class="org.onosproject.sdnip.cli.AddPeerCommand"/>
-    </command>
-    <command>
-      <action class="org.onosproject.sdnip.cli.RemovePeerCommand"/>
-    </command>
-  </command-bundle>
-</blueprint>