diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
index d9e6b2c..1993d3f 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
@@ -64,10 +64,8 @@
     protected LinkService linkService;
     protected FlowObjectiveService flowObjectiveService;
 
-    protected HashMap<DeviceId, Set<PortNumber>> devicePortMap =
-            new HashMap<DeviceId, Set<PortNumber>>();
-    protected HashMap<PortNumber, DeviceId> portDeviceMap =
-            new HashMap<PortNumber, DeviceId>();
+    protected HashMap<DeviceId, Set<PortNumber>> devicePortMap = new HashMap<>();
+    protected HashMap<PortNumber, DeviceId> portDeviceMap = new HashMap<>();
     //protected HashMap<NeighborSet, Integer> deviceNextObjectiveIds =
     //        new HashMap<NeighborSet, Integer>();
     protected EventuallyConsistentMap<
@@ -113,6 +111,7 @@
      * @param config interface to retrieve the device properties
      * @param linkService link service object
      * @param flowObjService flow objective service object
+     * @param nsNextObjStore next objective store map
      * @return default group handler type
      */
     public static DefaultGroupHandler createGroupHandler(DeviceId deviceId,
@@ -120,9 +119,8 @@
                                                          DeviceProperties config,
                                                          LinkService linkService,
                                                          FlowObjectiveService flowObjService,
-                                                         EventuallyConsistentMap<
-                                                         NeighborSetNextObjectiveStoreKey,
-                                                         Integer> nsNextObjStore) {
+                                                         EventuallyConsistentMap<NeighborSetNextObjectiveStoreKey,
+                                                                 Integer> nsNextObjStore) {
         if (config.isEdgeDevice(deviceId)) {
             return new DefaultEdgeGroupHandler(deviceId, appId, config,
                                                linkService,
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java
index 6623696..e7e8783 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java
@@ -54,15 +54,15 @@
      * @param config interface to retrieve the device properties
      * @param linkService link service object
      * @param flowObjService flow objective service object
+     * @param nsNextObjStore next objective store map
      */
     public PolicyGroupHandler(DeviceId deviceId,
                               ApplicationId appId,
                               DeviceProperties config,
                               LinkService linkService,
                               FlowObjectiveService flowObjService,
-                              EventuallyConsistentMap<
-                              NeighborSetNextObjectiveStoreKey,
-                              Integer> nsNextObjStore) {
+                              EventuallyConsistentMap<NeighborSetNextObjectiveStoreKey,
+                                      Integer> nsNextObjStore) {
         super(deviceId, appId, config, linkService, flowObjService, nsNextObjStore);
     }
 
diff --git a/apps/xos-integration/src/main/java/org/onosproject/xosintegration/cli/package-info.java b/apps/xos-integration/src/main/java/org/onosproject/xosintegration/cli/package-info.java
new file mode 100644
index 0000000..cd7c72e
--- /dev/null
+++ b/apps/xos-integration/src/main/java/org/onosproject/xosintegration/cli/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ * 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.
+ */
+
+/**
+ * XOS integration application CLI commands.
+ */
+package org.onosproject.xosintegration.cli;
\ No newline at end of file
diff --git a/apps/xos-integration/src/main/java/org/onosproject/xosintegration/package-info.java b/apps/xos-integration/src/main/java/org/onosproject/xosintegration/package-info.java
index 41a1ad3..ea2483f 100644
--- a/apps/xos-integration/src/main/java/org/onosproject/xosintegration/package-info.java
+++ b/apps/xos-integration/src/main/java/org/onosproject/xosintegration/package-info.java
@@ -15,7 +15,6 @@
  */
 
 /**
- * Test Application that calls a REST API. One dat it might call XOS to
- * launch a VM.
+ * XOS integration application which relies on XOS REST APIs to manage VMs.
  */
 package org.onosproject.xosintegration;
diff --git a/core/api/src/main/java/org/onosproject/rest/package-info.java b/core/api/src/main/java/org/onosproject/rest/package-info.java
new file mode 100644
index 0000000..15e5d20
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/rest/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ * 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.
+ */
+
+/**
+ * Base abstractions and utilities for developing REST APIs.
+ */
+package org.onosproject.rest;
\ No newline at end of file
diff --git a/docs/external.xml b/docs/external.xml
index e3618dd..53fb5db 100644
--- a/docs/external.xml
+++ b/docs/external.xml
@@ -56,7 +56,7 @@
                         <group>
                             <title>Network Model &amp; Services</title>
                             <packages>
-                                org.onosproject:org.onosproject.*
+                                org.onosproject:org.onosproject.*:org.onosproject.rest
                             </packages>
                         </group>
                         <group>
diff --git a/docs/pom.xml b/docs/pom.xml
index 68dacdf..42bd702 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -55,7 +55,7 @@
                         <group>
                             <title>Network Model &amp; Services</title>
                             <packages>
-                                org.onosproject:org.onosproject.*
+                                org.onosproject:org.onosproject.*:org.onosproject.rest
                             </packages>
                         </group>
                         <group>
@@ -115,7 +115,7 @@
                         <group>
                             <title>GUI, REST &amp; Command-Line</title>
                             <packages>
-                                org.onosproject.ui.impl:org.onosproject.rest:org.onosproject.cli:org.onosproject.rest.*:org.onosproject.cli.*:org.onosproject.codec.impl
+                                org.onosproject.ui.impl*:org.onosproject.rest*:org.onosproject.cli:org.onosproject.rest.*:org.onosproject.cli.*:org.onosproject.codec.impl
                             </packages>
                         </group>
                         <group>
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/overlay/package-info.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/overlay/package-info.java
new file mode 100644
index 0000000..c5eda13
--- /dev/null
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/overlay/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ * 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.
+ */
+
+/**
+ * Base abstractions and utilities for creating topology view overlays; experimental.
+ */
+package org.onosproject.ui.impl.topo.overlay;
\ No newline at end of file
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/package-info.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/package-info.java
new file mode 100644
index 0000000..77d97b9
--- /dev/null
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ * 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.
+ */
+
+/**
+ * Topology view server-side model service with ability for apps to overlay
+ * their own functionality and information; experimental.
+ */
+package org.onosproject.ui.impl.topo;
\ No newline at end of file