diff --git a/apps/tvue/src/main/java/org/onlab/onos/tvue/package-info.java b/apps/tvue/src/main/java/org/onlab/onos/tvue/package-info.java
new file mode 100644
index 0000000..b2f7775
--- /dev/null
+++ b/apps/tvue/src/main/java/org/onlab/onos/tvue/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * REST resources for the sample topology viewer application.
+ */
+package org.onlab.onos.tvue;
\ No newline at end of file
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/package-info.java b/cli/src/main/java/org/onlab/onos/cli/net/package-info.java
new file mode 100644
index 0000000..31feab0
--- /dev/null
+++ b/cli/src/main/java/org/onlab/onos/cli/net/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Administrative console command-line extensions for interacting with the
+ * network model &amp; services.
+ */
+package org.onlab.onos.cli.net;
diff --git a/cli/src/main/java/org/onlab/onos/cli/package-info.java b/cli/src/main/java/org/onlab/onos/cli/package-info.java
new file mode 100644
index 0000000..58a9ce0
--- /dev/null
+++ b/cli/src/main/java/org/onlab/onos/cli/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Administrative console command-line extensions.
+ */
+package org.onlab.onos.cli;
diff --git a/cli/src/main/javadoc/org/onlab/onos/cli/net/package.html b/cli/src/main/javadoc/org/onlab/onos/cli/net/package.html
deleted file mode 100644
index f939275..0000000
--- a/cli/src/main/javadoc/org/onlab/onos/cli/net/package.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<body>
-Administrative console command-line extensions for interacting with the
-network model &amp; services.
-</body>
diff --git a/cli/src/main/javadoc/org/onlab/onos/cli/package.html b/cli/src/main/javadoc/org/onlab/onos/cli/package.html
deleted file mode 100644
index dacfec0..0000000
--- a/cli/src/main/javadoc/org/onlab/onos/cli/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Administrative console command-line extensions.
-</body>
diff --git a/core/api/src/main/java/org/onlab/onos/event/package-info.java b/core/api/src/main/java/org/onlab/onos/event/package-info.java
new file mode 100644
index 0000000..e2a82f6
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/event/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Local event delivery subsystem interfaces &amp; supporting abstractions.
+ */
+package org.onlab.onos.event;
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/package-info.java b/core/api/src/main/java/org/onlab/onos/net/device/package-info.java
new file mode 100644
index 0000000..ea66ebf
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/device/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Infrastructure device model &amp; related services API definitions.
+ */
+package org.onlab.onos.net.device;
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/package-info.java b/core/api/src/main/java/org/onlab/onos/net/flow/package-info.java
new file mode 100644
index 0000000..76bee78
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Flow rule model &amp; related services API definitions.
+ */
+package org.onlab.onos.net.flow;
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/package-info.java b/core/api/src/main/java/org/onlab/onos/net/host/package-info.java
new file mode 100644
index 0000000..79fd0da
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/host/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * End-station host model &amp; related services API definitions.
+ */
+package org.onlab.onos.net.host;
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/package-info.java b/core/api/src/main/java/org/onlab/onos/net/link/package-info.java
new file mode 100644
index 0000000..c44f1aa
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/link/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Infrastructure link model &amp; related services API definitions.
+ */
+package org.onlab.onos.net.link;
diff --git a/core/api/src/main/java/org/onlab/onos/net/package-info.java b/core/api/src/main/java/org/onlab/onos/net/package-info.java
new file mode 100644
index 0000000..cb8ec54
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Network model entities &amp; service API definitions.
+ */
+package org.onlab.onos.net;
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/package-info.java b/core/api/src/main/java/org/onlab/onos/net/packet/package-info.java
new file mode 100644
index 0000000..4643f6e
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/packet/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Mechanism for processing inbound packets intercepted from the data plane and
+ * for emitting outbound packets onto the data plane.
+ */
+package org.onlab.onos.net.packet;
diff --git a/core/api/src/main/java/org/onlab/onos/net/provider/package-info.java b/core/api/src/main/java/org/onlab/onos/net/provider/package-info.java
new file mode 100644
index 0000000..51deeaa
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/provider/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Base abstractions related to network entity providers and their brokers.
+ */
+package org.onlab.onos.net.provider;
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/package-info.java b/core/api/src/main/java/org/onlab/onos/net/topology/package-info.java
new file mode 100644
index 0000000..e2ef485
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/net/topology/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Network topology model &amp; related services API definitions.
+ */
+package org.onlab.onos.net.topology;
diff --git a/core/api/src/main/java/org/onlab/onos/package-info.java b/core/api/src/main/java/org/onlab/onos/package-info.java
new file mode 100644
index 0000000..65ef461
--- /dev/null
+++ b/core/api/src/main/java/org/onlab/onos/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * ONOS Core API definitions.
+ */
+package org.onlab.onos;
diff --git a/core/api/src/main/javadoc/org/onlab/onos/event/package.html b/core/api/src/main/javadoc/org/onlab/onos/event/package.html
deleted file mode 100644
index 1591f3d..0000000
--- a/core/api/src/main/javadoc/org/onlab/onos/event/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Local event delivery subsystem interfaces &amp; supporting abstractions.
-</body>
\ No newline at end of file
diff --git a/core/api/src/main/javadoc/org/onlab/onos/net/device/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/device/package.html
deleted file mode 100644
index 521a30a..0000000
--- a/core/api/src/main/javadoc/org/onlab/onos/net/device/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Infrastructure device model &amp; related services API definitions.
-</body>
\ No newline at end of file
diff --git a/core/api/src/main/javadoc/org/onlab/onos/net/flow/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/flow/package.html
deleted file mode 100644
index 46028d4..0000000
--- a/core/api/src/main/javadoc/org/onlab/onos/net/flow/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Flow rule model &amp; related services API definitions.
-</body>
\ No newline at end of file
diff --git a/core/api/src/main/javadoc/org/onlab/onos/net/host/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/host/package.html
deleted file mode 100644
index e076f65..0000000
--- a/core/api/src/main/javadoc/org/onlab/onos/net/host/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-End-station host model &amp; related services API definitions.
-</body>
\ No newline at end of file
diff --git a/core/api/src/main/javadoc/org/onlab/onos/net/link/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/link/package.html
deleted file mode 100644
index 50972e2..0000000
--- a/core/api/src/main/javadoc/org/onlab/onos/net/link/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Infrastructure link model &amp; related services API definitions.
-</body>
\ No newline at end of file
diff --git a/core/api/src/main/javadoc/org/onlab/onos/net/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/package.html
deleted file mode 100644
index 7d2cd0a..0000000
--- a/core/api/src/main/javadoc/org/onlab/onos/net/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Network model entities &amp; service API definitions.
-</body>
\ No newline at end of file
diff --git a/core/api/src/main/javadoc/org/onlab/onos/net/packet/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/packet/package.html
deleted file mode 100644
index c95ee9b..0000000
--- a/core/api/src/main/javadoc/org/onlab/onos/net/packet/package.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<body>
-Mechanism for processing inbound packets intercepted from the data plane and
-for emitting outbound packets onto the data plane.
-</body>
\ No newline at end of file
diff --git a/core/api/src/main/javadoc/org/onlab/onos/net/provider/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/provider/package.html
deleted file mode 100644
index 75c9ed4..0000000
--- a/core/api/src/main/javadoc/org/onlab/onos/net/provider/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Base abstractions related to network entity providers and their brokers.
-</body>
\ No newline at end of file
diff --git a/core/api/src/main/javadoc/org/onlab/onos/net/topology/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/topology/package.html
deleted file mode 100644
index 7601432..0000000
--- a/core/api/src/main/javadoc/org/onlab/onos/net/topology/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Network topology model &amp; related services API definitions.
-</body>
\ No newline at end of file
diff --git a/core/api/src/main/javadoc/org/onlab/onos/package.html b/core/api/src/main/javadoc/org/onlab/onos/package.html
deleted file mode 100644
index cda72f5..0000000
--- a/core/api/src/main/javadoc/org/onlab/onos/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-ONOS Core API definitions.
-</body>
\ No newline at end of file
diff --git a/core/trivial/src/main/java/org/onlab/onos/event/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/event/impl/package-info.java
new file mode 100644
index 0000000..46722ad
--- /dev/null
+++ b/core/trivial/src/main/java/org/onlab/onos/event/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Local event dispatching mechanism.
+ */
+package org.onlab.onos.event.impl;
diff --git a/core/trivial/src/main/java/org/onlab/onos/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/impl/package-info.java
new file mode 100644
index 0000000..a13db9d
--- /dev/null
+++ b/core/trivial/src/main/java/org/onlab/onos/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core infrastructure implementations.
+ */
+package org.onlab.onos.impl;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/device/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/device/impl/package-info.java
new file mode 100644
index 0000000..a50e32d
--- /dev/null
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/device/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core subsystem for tracking infrastructure devices.
+ */
+package org.onlab.onos.net.trivial.device.impl;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/package-info.java
new file mode 100644
index 0000000..87a4a85
--- /dev/null
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/host/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core subsystem for tracking edn-station hosts.
+ */
+package org.onlab.onos.net.trivial.host.impl;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/link/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/link/impl/package-info.java
new file mode 100644
index 0000000..09279a7
--- /dev/null
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/link/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core subsystem for tracking infrastructure links.
+ */
+package org.onlab.onos.net.trivial.link.impl;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/packet/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/packet/impl/package-info.java
new file mode 100644
index 0000000..5471948
--- /dev/null
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/packet/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core subsystem for processing inbound packets and emitting outbound packets.
+ */
+package org.onlab.onos.net.trivial.packet.impl;
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/package-info.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/package-info.java
new file mode 100644
index 0000000..770f38d
--- /dev/null
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/topology/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Core subsystem for tracking consistent topology graph views.
+ */
+package org.onlab.onos.net.trivial.topology.impl;
diff --git a/core/trivial/src/main/javadoc/org/onlab/onos/event/impl/package.html b/core/trivial/src/main/javadoc/org/onlab/onos/event/impl/package.html
deleted file mode 100644
index 87f0d91..0000000
--- a/core/trivial/src/main/javadoc/org/onlab/onos/event/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Local event dispatching mechanism.
-</body>
\ No newline at end of file
diff --git a/core/trivial/src/main/javadoc/org/onlab/onos/impl/package.html b/core/trivial/src/main/javadoc/org/onlab/onos/impl/package.html
deleted file mode 100644
index 84500a8..0000000
--- a/core/trivial/src/main/javadoc/org/onlab/onos/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Core infrastructure implementations.
-</body>
\ No newline at end of file
diff --git a/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/device/impl/package.html b/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/device/impl/package.html
deleted file mode 100644
index 2195da2..0000000
--- a/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/device/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Core subsystem for tracking infrastructure devices.
-</body>
\ No newline at end of file
diff --git a/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/host/impl/package.html b/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/host/impl/package.html
deleted file mode 100644
index 79f7bb0..0000000
--- a/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/host/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Core subsystem for tracking edn-station hosts.
-</body>
\ No newline at end of file
diff --git a/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/link/impl/package.html b/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/link/impl/package.html
deleted file mode 100644
index 5bba317..0000000
--- a/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/link/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Core subsystem for tracking infrastructure links.
-</body>
\ No newline at end of file
diff --git a/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/topology/impl/package.html b/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/topology/impl/package.html
deleted file mode 100644
index b4cca07..0000000
--- a/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/topology/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Core subsystem for tracking consistent topology graph views.
-</body>
\ No newline at end of file
diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/driver/package-info.java b/of/api/src/main/java/org/onlab/onos/of/controller/driver/package-info.java
new file mode 100644
index 0000000..f64ba6c
--- /dev/null
+++ b/of/api/src/main/java/org/onlab/onos/of/controller/driver/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * OpenFlow controller switch driver API.
+ */
+package org.onlab.onos.of.controller.driver;
diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/package-info.java b/of/api/src/main/java/org/onlab/onos/of/controller/package-info.java
new file mode 100644
index 0000000..888bcce
--- /dev/null
+++ b/of/api/src/main/java/org/onlab/onos/of/controller/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * OpenFlow controller API.
+ */
+package org.onlab.onos.of.controller;
diff --git a/of/api/src/main/javadoc/org/onlab/onos/of/controller/driver/package.html b/of/api/src/main/javadoc/org/onlab/onos/of/controller/driver/package.html
deleted file mode 100644
index 53260e8..0000000
--- a/of/api/src/main/javadoc/org/onlab/onos/of/controller/driver/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-OpenFlow controller switch driver API.
-</body>
\ No newline at end of file
diff --git a/of/api/src/main/javadoc/org/onlab/onos/of/controller/package.html b/of/api/src/main/javadoc/org/onlab/onos/of/controller/package.html
deleted file mode 100644
index 91f754f..0000000
--- a/of/api/src/main/javadoc/org/onlab/onos/of/controller/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-OpenFlow controller API.
-</body>
\ No newline at end of file
diff --git a/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/annotations/package-info.java b/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/annotations/package-info.java
new file mode 100644
index 0000000..7bf2f1f
--- /dev/null
+++ b/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/annotations/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Controller logging annotations - do be deprecated.
+ */
+package org.onlab.onos.of.controller.impl.annotations;
diff --git a/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/package-info.java b/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/package-info.java
new file mode 100644
index 0000000..f5b4544
--- /dev/null
+++ b/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Implementation of the OpenFlow controller IO subsystem.
+ */
+package org.onlab.onos.of.controller.impl;
diff --git a/of/ctl/src/main/java/org/onlab/onos/of/drivers/impl/package-info.java b/of/ctl/src/main/java/org/onlab/onos/of/drivers/impl/package-info.java
new file mode 100644
index 0000000..ca25356
--- /dev/null
+++ b/of/ctl/src/main/java/org/onlab/onos/of/drivers/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * OpenFlow base switch drivers implementations.
+ */
+package org.onlab.onos.of.drivers.impl;
diff --git a/of/ctl/src/main/javadoc/org/onlab/onos/of/controller/impl/annotations/package.html b/of/ctl/src/main/javadoc/org/onlab/onos/of/controller/impl/annotations/package.html
deleted file mode 100644
index ea3b987..0000000
--- a/of/ctl/src/main/javadoc/org/onlab/onos/of/controller/impl/annotations/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Controller logging annotations - do be deprecated.
-</body>
\ No newline at end of file
diff --git a/of/ctl/src/main/javadoc/org/onlab/onos/of/controller/impl/package.html b/of/ctl/src/main/javadoc/org/onlab/onos/of/controller/impl/package.html
deleted file mode 100644
index a3eb2c8..0000000
--- a/of/ctl/src/main/javadoc/org/onlab/onos/of/controller/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Implementation of the OpenFlow controller IO subsystem.
-</body>
\ No newline at end of file
diff --git a/of/ctl/src/main/javadoc/org/onlab/onos/of/drivers/impl/package.html b/of/ctl/src/main/javadoc/org/onlab/onos/of/drivers/impl/package.html
deleted file mode 100644
index 79a7708..0000000
--- a/of/ctl/src/main/javadoc/org/onlab/onos/of/drivers/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-OpenFlow base switch drivers implementations.
-</body>
\ No newline at end of file
diff --git a/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/package-info.java b/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/package-info.java
new file mode 100644
index 0000000..0bb63f3
--- /dev/null
+++ b/providers/of/device/src/main/java/org/onlab/onos/provider/of/device/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provider that uses OpenFlow controller as a means of infrastructure device discovery.
+ */
+package org.onlab.onos.provider.of.device.impl;
diff --git a/providers/of/device/src/main/javadoc/org/onlab/onos/provider/of/device/impl/package.html b/providers/of/device/src/main/javadoc/org/onlab/onos/provider/of/device/impl/package.html
deleted file mode 100644
index cae24c0..0000000
--- a/providers/of/device/src/main/javadoc/org/onlab/onos/provider/of/device/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Provider that uses OpenFlow controller as a means of infrastructure device discovery.
-</body>
\ No newline at end of file
diff --git a/providers/of/host/src/main/java/org/onlab/onos/provider/of/host/impl/package-info.java b/providers/of/host/src/main/java/org/onlab/onos/provider/of/host/impl/package-info.java
new file mode 100644
index 0000000..fed54ec
--- /dev/null
+++ b/providers/of/host/src/main/java/org/onlab/onos/provider/of/host/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provider that uses OpenFlow controller as a means of host discovery and tracking.
+ */
+package org.onlab.onos.provider.of.host.impl;
diff --git a/providers/of/host/src/main/javadoc/org/onlab/onos/provider/of/host/impl/package.html b/providers/of/host/src/main/javadoc/org/onlab/onos/provider/of/host/impl/package.html
deleted file mode 100644
index fda13cc..0000000
--- a/providers/of/host/src/main/javadoc/org/onlab/onos/provider/of/host/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Provider that uses OpenFlow controller as a means of host discovery and tracking.
-</body>
\ No newline at end of file
diff --git a/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/package-info.java b/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/package-info.java
new file mode 100644
index 0000000..1b853ab
--- /dev/null
+++ b/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provider that uses OpenFlow controller as a means of infrastructure link inference.
+ */
+package org.onlab.onos.provider.of.link.impl;
diff --git a/providers/of/link/src/main/javadoc/org/onlab/onos/provider/of/link/impl/package.html b/providers/of/link/src/main/javadoc/org/onlab/onos/provider/of/link/impl/package.html
deleted file mode 100644
index 3307196..0000000
--- a/providers/of/link/src/main/javadoc/org/onlab/onos/provider/of/link/impl/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Provider that uses OpenFlow controller as a means of infrastructure link inference.
-</body>
\ No newline at end of file
diff --git a/providers/of/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/package-info.java b/providers/of/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/package-info.java
new file mode 100644
index 0000000..29c23c5
--- /dev/null
+++ b/providers/of/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Provider that uses OpenFlow controller as a means of intercepting and
+ * emitting packets.
+ */
+package org.onlab.onos.provider.of.packet.impl;
\ No newline at end of file
diff --git a/utils/junit/src/main/java/org/onlab/junit/package-info.java b/utils/junit/src/main/java/org/onlab/junit/package-info.java
new file mode 100644
index 0000000..f07507d
--- /dev/null
+++ b/utils/junit/src/main/java/org/onlab/junit/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Utilities to assist in developing JUnit tests.
+ */
+package org.onlab.junit;
diff --git a/utils/junit/src/main/javadoc/org/onlab/junit/package.html b/utils/junit/src/main/javadoc/org/onlab/junit/package.html
deleted file mode 100644
index 4e84cb9..0000000
--- a/utils/junit/src/main/javadoc/org/onlab/junit/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Utilities to assist in developing JUnit tests.
-</body>
\ No newline at end of file
diff --git a/utils/misc/src/main/java/org/onlab/graph/package-info.java b/utils/misc/src/main/java/org/onlab/graph/package-info.java
new file mode 100644
index 0000000..e4f9d4c
--- /dev/null
+++ b/utils/misc/src/main/java/org/onlab/graph/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Graph abstractions and graph path finding algorithms.
+ */
+package org.onlab.graph;
diff --git a/utils/misc/src/main/java/org/onlab/packet/package-info.java b/utils/misc/src/main/java/org/onlab/packet/package-info.java
new file mode 100644
index 0000000..7160ddc
--- /dev/null
+++ b/utils/misc/src/main/java/org/onlab/packet/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Utilities for decoding and encoding packets of various network protocols
+ * and encapsulations.
+ */
+package org.onlab.packet;
diff --git a/utils/misc/src/main/java/org/onlab/util/package-info.java b/utils/misc/src/main/java/org/onlab/util/package-info.java
new file mode 100644
index 0000000..7d7dcdb
--- /dev/null
+++ b/utils/misc/src/main/java/org/onlab/util/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Miscellaneous domain-agnostic utilities.
+ */
+package org.onlab.util;
diff --git a/utils/misc/src/main/javadoc/org/onlab/graph/package.html b/utils/misc/src/main/javadoc/org/onlab/graph/package.html
deleted file mode 100644
index fe266ac..0000000
--- a/utils/misc/src/main/javadoc/org/onlab/graph/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Graph abstractions and graph path finding algorithms.
-</body>
\ No newline at end of file
diff --git a/utils/misc/src/main/javadoc/org/onlab/packet/package.html b/utils/misc/src/main/javadoc/org/onlab/packet/package.html
deleted file mode 100644
index 78ce3e6..0000000
--- a/utils/misc/src/main/javadoc/org/onlab/packet/package.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<body>
-Utilities for decoding and encoding packets of various network protocols
-and encapsulations.
-</body>
diff --git a/utils/misc/src/main/javadoc/org/onlab/util/package.html b/utils/misc/src/main/javadoc/org/onlab/util/package.html
deleted file mode 100644
index f3de0e7..0000000
--- a/utils/misc/src/main/javadoc/org/onlab/util/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Miscellaneous domain-agnostic utilities.
-</body>
\ No newline at end of file
diff --git a/utils/osgi/src/main/java/org/onlab/osgi/package-info.java b/utils/osgi/src/main/java/org/onlab/osgi/package-info.java
new file mode 100644
index 0000000..6d9a24c
--- /dev/null
+++ b/utils/osgi/src/main/java/org/onlab/osgi/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Facilities for building testable components in OSGi independent fashion.
+ */
+package org.onlab.osgi;
diff --git a/utils/osgi/src/main/javadoc/org/onlab/osgi/package.html b/utils/osgi/src/main/javadoc/org/onlab/osgi/package.html
deleted file mode 100644
index b833050..0000000
--- a/utils/osgi/src/main/javadoc/org/onlab/osgi/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Facilities for building testable components in OSGi independent fashion.
-</body>
\ No newline at end of file
diff --git a/utils/rest/src/main/java/org/onlab/rest/package-info.java b/utils/rest/src/main/java/org/onlab/rest/package-info.java
new file mode 100644
index 0000000..978a25c
--- /dev/null
+++ b/utils/rest/src/main/java/org/onlab/rest/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Facilities for building JAX-RS web resources.
+ */
+package org.onlab.rest;
diff --git a/utils/rest/src/main/javadoc/org/onlab/rest/package.html b/utils/rest/src/main/javadoc/org/onlab/rest/package.html
deleted file mode 100644
index 09b098f..0000000
--- a/utils/rest/src/main/javadoc/org/onlab/rest/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Facilities for building JAX-RS web resources.
-</body>
\ No newline at end of file
diff --git a/web/api/src/main/java/org/onlab/onos/rest/package-info.java b/web/api/src/main/java/org/onlab/onos/rest/package-info.java
new file mode 100644
index 0000000..ac3665f
--- /dev/null
+++ b/web/api/src/main/java/org/onlab/onos/rest/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Set of resources implementing the ONOS REST API.
+ */
+package org.onlab.onos.rest;
diff --git a/web/api/src/main/javadoc/org/onlab/onos/rest/package.html b/web/api/src/main/javadoc/org/onlab/onos/rest/package.html
deleted file mode 100644
index 81c00df..0000000
--- a/web/api/src/main/javadoc/org/onlab/onos/rest/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Set of resources implementing the ONOS REST API.
-</body>
\ No newline at end of file
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/package-info.java b/web/gui/src/main/java/org/onlab/onos/gui/package-info.java
new file mode 100644
index 0000000..26ee6d5
--- /dev/null
+++ b/web/gui/src/main/java/org/onlab/onos/gui/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Set of resources providing data for the ONOS GUI.
+ */
+package org.onlab.onos.gui;
diff --git a/web/gui/src/main/javadoc/org/onlab/onos/gui/package.html b/web/gui/src/main/javadoc/org/onlab/onos/gui/package.html
deleted file mode 100644
index 40769bf..0000000
--- a/web/gui/src/main/javadoc/org/onlab/onos/gui/package.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-Set of resources providing data for the ONOS GUI.
-</body>
\ No newline at end of file