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