diff --git a/docs/external-apps b/docs/external-apps
new file mode 100644
index 0000000000..b2e4d89ca9
--- /dev/null
+++ b/docs/external-apps
@@ -0,0 +1,5 @@
+org.onosproject.dhcp
+org.onosproject.cpman
+org.onosproject.olt
+org.onosproject.openstackswitching
+org.onosproject.routing
diff --git a/docs/external-excludes b/docs/external-excludes
index da130e7cad..dade4d4f84 100644
--- a/docs/external-excludes
+++ b/docs/external-excludes
@@ -1,5 +1,6 @@
 *.impl
 *.impl.*
+protobuf.*
 
 org.onlab.jdvue*
 org.onlab.stc*
@@ -10,7 +11,6 @@ org.onosproject.provider*
 org.onosproject.rest
 org.onosproject.cli*
 org.onosproject.tvue
-org.onosproject.dhcp
 org.onosproject.foo
 org.onosproject.mobility
 org.onosproject.proxyarp
@@ -27,7 +27,6 @@ org.onosproject.store.flow
 org.onosproject.store.serializers*
 org.onosproject.openflow*
 org.onosproject.common*
-org.onosproject.routing*
 org.onosproject.bgprouter
 org.onosproject.intentperf
 org.onosproject.maven
@@ -43,9 +42,25 @@ org.onosproject.demo*
 org.onosproject.xosintegration*
 org.onosproject.app.vtn*
 org.onosproject.ovsdb*
+org.onosproject.bgp*
 org.onosproject.pcep*
 org.onosproject.aaa
 org.onosproject.acl*
+org.onosproject.olt.*
+org.onosproject.cpman.*
+org.onosproject.pathpainter*
+org.onosproject.openstackswitching.*
+org.onosproject.openstackrouting*
+org.onosproject.protocol*
+org.onosproject.sfc*
+org.onosproject.vrouter*
+org.onosproject.vpls*
+org.onosproject.netconf*
+org.onosproject.security.store*
+org.onosproject.faultmanagement*
+org.onosproject.iptopology*
+org.onosproject.igmp*
+org.onosproject.pim*
 org.onosproject.cip*
 org.onosproject.acl*
 org.onosproject.vtn*
@@ -54,4 +69,5 @@ org.onosproject.mfwd*
 org.onosproject.mcast*
 org.onosproject.flowanalyzer
 org.onosproject.grpc*
-protobuf.*
+org.onosproject.yangutils.parser.antlrgencode
+org.onosproject.yangutils.*
diff --git a/docs/external.xml b/docs/external.xml
index a8fd9d58ce..2ee82d7401 100644
--- a/docs/external.xml
+++ b/docs/external.xml
@@ -48,10 +48,10 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <show>package</show>
-                    <excludePackageNames>@external-excludes</excludePackageNames>
                     <sourceFileExcludes>
                         <sourceFileExclude>**/generated-sources/**</sourceFileExclude>
                     </sourceFileExcludes>
+                    <excludePackageNames>@external-excludes</excludePackageNames>
                     <docfilessubdirs>true</docfilessubdirs>
                     <doctitle>ONOS Java API (1.5.0-SNAPSHOT)</doctitle>
                     <groups>
@@ -68,6 +68,10 @@
                             <title>Utilities</title>
                             <packages>@utils</packages>
                         </group>
+                        <group>
+                            <title>App &amp; Extensions</title>
+                            <packages>@external-apps</packages>
+                        </group>
                     </groups>
                     <tags>
                         <tag>
diff --git a/docs/internal-apps b/docs/internal-apps
index ba72512739..e3138a22b1 100644
--- a/docs/internal-apps
+++ b/docs/internal-apps
@@ -5,6 +5,7 @@ org.onosproject.aaa
 org.onosproject.fwd
 org.onosproject.dhcp*
 org.onosproject.flowanalyzer
+org.onosproject.cpman*
 org.onosproject.mobility
 org.onosproject.proxyarp
 org.onosproject.calendar
@@ -28,11 +29,14 @@ org.onosproject.cord*
 org.onosproject.mcast*
 org.onosproject.mfwd*
 org.onosproject.mlb*
-org.onosproject.igmp.impl
+org.onosproject.igmp*
+org.onosproject.pim*
+org.onosproject.vpls*
+org.onosproject.vrouter*
 org.onosproject.faultmanagement*
 org.onosproject.iptopology*
 org.onosproject.drivermatrix*
 org.onosproject.pathpainter*
-org.onosproject.openstackswitching*
+org.onosproject.openstack*
 org.onosproject.forwarder*
 org.onosproject.sfc*
diff --git a/docs/internal-bgpls b/docs/internal-bgpls
index f264c7dbd9..25bf23cca0 100644
--- a/docs/internal-bgpls
+++ b/docs/internal-bgpls
@@ -1,2 +1,3 @@
 org.onosproject.bgp.controller*
-org.onosproject.bgpio*
+org.onosproject.bgp*
+org.onosproject.provider.bgp*
diff --git a/docs/internal-drivers b/docs/internal-drivers
index fb2dea4451..90cf08dc6c 100644
--- a/docs/internal-drivers
+++ b/docs/internal-drivers
@@ -1,2 +1 @@
-org.onosproject.driver
-org.onosproject.driver.*
+org.onosproject.driver*
diff --git a/docs/internal-excludes b/docs/internal-excludes
index a24d184d8d..81e6329f2c 100644
--- a/docs/internal-excludes
+++ b/docs/internal-excludes
@@ -5,4 +5,5 @@ org.onlab.thirdparty
 org.onosproject.oecfg
 org.onosproject.maven
 org.onosproject.grpc*
+org.onosproject.yangutils.*
 protobuf.*
diff --git a/docs/internal-ospf b/docs/internal-ospf
new file mode 100644
index 0000000000..7fec14e46e
--- /dev/null
+++ b/docs/internal-ospf
@@ -0,0 +1 @@
+org.onosproject.ospf*
diff --git a/docs/internal-pcep b/docs/internal-pcep
index 8d10514469..b11c2a4bb3 100644
--- a/docs/internal-pcep
+++ b/docs/internal-pcep
@@ -1,2 +1,3 @@
 org.onosproject.pcep*
 org.onosproject.pcepio*
+org.onosproject.provider.pcep*
diff --git a/docs/internal-providers b/docs/internal-providers
index 832fb247ac..11871cd75b 100644
--- a/docs/internal-providers
+++ b/docs/internal-providers
@@ -1 +1,2 @@
 org.onosproject.provider.*
+org.onosproject.protocol.*
diff --git a/docs/internal.xml b/docs/internal.xml
index 03979774d1..aadbc4c3ed 100644
--- a/docs/internal.xml
+++ b/docs/internal.xml
@@ -74,39 +74,10 @@
                             <packages>@internal-stores</packages>
                         </group>
                         <group>
-                            <title>Incubator for Core Subsystems &amp;
-                                Distributed Stores
+                            <title>Incubator for Core Subsystems &amp; Distributed Stores
                             </title>
                             <packages>@internal-incubator</packages>
                         </group>
-                        <group>
-                            <title>OpenFlow Providers &amp; Controller</title>
-                            <packages>@internal-openflow</packages>
-                        </group>
-                        <group>
-                            <title>NetConf Providers</title>
-                            <packages>@internal-netconf</packages>
-                        </group>
-                        <group>
-                            <title>OVSDB Providers</title>
-                            <packages>@internal-ovsdb</packages>
-                        </group>
-                        <group>
-                            <title>PCEP Providers</title>
-                            <packages>@internal-pcep</packages>
-                        </group>
-                        <group>
-                            <title>BGP-LS Providers</title>
-                            <packages>@internal-bgpls</packages>
-                        </group>
-                        <group>
-                            <title>Other Providers</title>
-                            <packages>@internal-providers</packages>
-                        </group>
-                        <group>
-                            <title>Built-in Device Drivers</title>
-                            <packages>@internal-drivers</packages>
-                        </group>
                         <group>
                             <title>Utilities</title>
                             <packages>@utils</packages>
@@ -124,6 +95,42 @@
                             </title>
                             <packages>@internal-test-apps</packages>
                         </group>
+                        <group>
+                            <title>OpenFlow Providers &amp; Controller</title>
+                            <packages>@internal-openflow</packages>
+                        </group>
+                        <group>
+                            <title>NetConf Protocol &amp; Providers</title>
+                            <packages>@internal-netconf</packages>
+                        </group>
+                        <group>
+                            <title>OVSDB Protocol &amp; Providers</title>
+                            <packages>@internal-ovsdb</packages>
+                        </group>
+                        <group>
+                            <title>PCEP Protocol &amp; Providers</title>
+                            <packages>@internal-pcep</packages>
+                        </group>
+                        <group>
+                            <title>BGP-LS Protocol &amp; Providers</title>
+                            <packages>@internal-bgpls</packages>
+                        </group>
+                        <group>
+                            <title>OSPF Protocol &amp; Providers</title>
+                            <packages>@internal-ospf</packages>
+                        </group>
+                        <group>
+                            <title>REST Protocol &amp; Providers</title>
+                            <packages>@internal-restsb</packages>
+                        </group>
+                        <group>
+                            <title>Other Providers</title>
+                            <packages>@internal-providers</packages>
+                        </group>
+                        <group>
+                            <title>Device Drivers</title>
+                            <packages>@internal-drivers</packages>
+                        </group>
                     </groups>
                     <tags>
                         <tag>