diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/BgpService.java b/apps/routing-api/src/main/java/org/onosproject/routing/BgpService.java
similarity index 96%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/BgpService.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/BgpService.java
index 3901b22..f5d95f2 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/BgpService.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/BgpService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi;
+package org.onosproject.routing;
 
 /**
  * Provides a way of interacting with the BGP protocol component.
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/FibEntry.java b/apps/routing-api/src/main/java/org/onosproject/routing/FibEntry.java
similarity index 98%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/FibEntry.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/FibEntry.java
index 86b40f8..e2e2049 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/FibEntry.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/FibEntry.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi;
+package org.onosproject.routing;
 
 import com.google.common.base.MoreObjects;
 import org.onlab.packet.IpAddress;
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/FibListener.java b/apps/routing-api/src/main/java/org/onosproject/routing/FibListener.java
similarity index 96%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/FibListener.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/FibListener.java
index 218139e..0c8e627 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/FibListener.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/FibListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi;
+package org.onosproject.routing;
 
 import java.util.Collection;
 
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/FibUpdate.java b/apps/routing-api/src/main/java/org/onosproject/routing/FibUpdate.java
similarity index 98%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/FibUpdate.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/FibUpdate.java
index 2b0215c..dacb159 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/FibUpdate.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/FibUpdate.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi;
+package org.onosproject.routing;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/RouteEntry.java b/apps/routing-api/src/main/java/org/onosproject/routing/RouteEntry.java
similarity index 98%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/RouteEntry.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/RouteEntry.java
index 3e861e5..358f707 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/RouteEntry.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/RouteEntry.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi;
+package org.onosproject.routing;
 
 import com.google.common.base.MoreObjects;
 import org.onlab.packet.IpAddress;
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/RouteListener.java b/apps/routing-api/src/main/java/org/onosproject/routing/RouteListener.java
similarity index 96%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/RouteListener.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/RouteListener.java
index 55fa70d..46ed545 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/RouteListener.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/RouteListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi;
+package org.onosproject.routing;
 
 import java.util.Collection;
 
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/RouteUpdate.java b/apps/routing-api/src/main/java/org/onosproject/routing/RouteUpdate.java
similarity index 98%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/RouteUpdate.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/RouteUpdate.java
index 47aa3c2..a5a8e83 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/RouteUpdate.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/RouteUpdate.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi;
+package org.onosproject.routing;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/RoutingService.java b/apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java
similarity index 97%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/RoutingService.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java
index e0f9383..fdd4f2c 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/RoutingService.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/RoutingService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi;
+package org.onosproject.routing;
 
 import java.util.Collection;
 
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/BgpPeer.java b/apps/routing-api/src/main/java/org/onosproject/routing/config/BgpPeer.java
similarity index 98%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/config/BgpPeer.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/config/BgpPeer.java
index 47a3520..3693ca2 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/BgpPeer.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/config/BgpPeer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi.config;
+package org.onosproject.routing.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.MoreObjects;
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/BgpSpeaker.java b/apps/routing-api/src/main/java/org/onosproject/routing/config/BgpSpeaker.java
similarity index 98%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/config/BgpSpeaker.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/config/BgpSpeaker.java
index c19ceb6..b17c74a 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/BgpSpeaker.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/config/BgpSpeaker.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi.config;
+package org.onosproject.routing.config;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/Interface.java b/apps/routing-api/src/main/java/org/onosproject/routing/config/Interface.java
similarity index 98%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/config/Interface.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/config/Interface.java
index 7f7547d..ac9e34b 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/Interface.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/config/Interface.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi.config;
+package org.onosproject.routing.config;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Sets;
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/InterfaceAddress.java b/apps/routing-api/src/main/java/org/onosproject/routing/config/InterfaceAddress.java
similarity index 98%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/config/InterfaceAddress.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/config/InterfaceAddress.java
index 5fa4d64..4bf6e02 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/InterfaceAddress.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/config/InterfaceAddress.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi.config;
+package org.onosproject.routing.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.MoreObjects;
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/RoutingConfigurationService.java b/apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java
similarity index 97%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/config/RoutingConfigurationService.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java
index 385e99d..113daa7 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/RoutingConfigurationService.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/config/RoutingConfigurationService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.routingapi.config;
+package org.onosproject.routing.config;
 
 import org.onlab.packet.IpAddress;
 import org.onosproject.net.ConnectPoint;
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/package-info.java b/apps/routing-api/src/main/java/org/onosproject/routing/config/package-info.java
similarity index 88%
rename from apps/routing-api/src/main/java/org/onosproject/routingapi/config/package-info.java
rename to apps/routing-api/src/main/java/org/onosproject/routing/config/package-info.java
index 7e464da..d033daa 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/package-info.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/config/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * SDN-IP configuration services.
+ * Routing configuration interfaces.
  */
-package org.onosproject.routingapi.config;
+package org.onosproject.routing.config;
diff --git a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/package-info.java b/apps/routing-api/src/main/java/org/onosproject/routing/package-info.java
similarity index 82%
copy from apps/routing-api/src/main/java/org/onosproject/routingapi/config/package-info.java
copy to apps/routing-api/src/main/java/org/onosproject/routing/package-info.java
index 7e464da..66e590b 100644
--- a/apps/routing-api/src/main/java/org/onosproject/routingapi/config/package-info.java
+++ b/apps/routing-api/src/main/java/org/onosproject/routing/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Open Networking Laboratory
+ * Copyright 2015 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.
@@ -15,6 +15,6 @@
  */
 
 /**
- * SDN-IP configuration services.
+ * API for routing libraries.
  */
-package org.onosproject.routingapi.config;
+package org.onosproject.routing;