diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/package.html b/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/package.html
new file mode 100644
index 00000000000..9b16566de75
--- /dev/null
+++ b/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+FieldType plugins that have additional dependencies.
+
+
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package.html b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package.html
new file mode 100644
index 00000000000..8a45c1b364b
--- /dev/null
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+{@link org.apache.solr.handler.clustering.carrot2.CarrotClusteringEngine} and related classes for use in the {@link org.apache.solr.handler.clustering.ClusteringComponent}.
+
+
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package.html b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package.html
new file mode 100644
index 00000000000..4483ad9987c
--- /dev/null
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+{@link org.apache.solr.handler.clustering.ClusteringComponent} and common APIs for specific implementations.
+
+
diff --git a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/package.html b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/package.html
new file mode 100644
index 00000000000..4eec59e9743
--- /dev/null
+++ b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Plugins for DataImportHandler that have additional dependencies.
+
+
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package.html b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package.html
new file mode 100644
index 00000000000..09d1b58055c
--- /dev/null
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Utility classes for parsing & modeling DIH configuration.
+
+
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package.html b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package.html
new file mode 100644
index 00000000000..0e3460d84b1
--- /dev/null
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+{@link org.apache.solr.handler.dataimport.DataImportHandler} and related code.
+
+
diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package.html b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package.html
new file mode 100644
index 00000000000..3cb450e95e1
--- /dev/null
+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+{@link org.apache.solr.handler.extraction.ExtractingRequestHandler} and related code.
+
+
diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/package.html b/solr/contrib/langid/src/java/org/apache/solr/update/processor/package.html
new file mode 100644
index 00000000000..f2f8b81dbfb
--- /dev/null
+++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Various implementations of {@link org.apache.solr.update.processor.LanguageIdentifierUpdateProcessor} and their factories.
+
+
diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package.html b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package.html
new file mode 100644
index 00000000000..33a12cd08ae
--- /dev/null
+++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+{@link org.apache.solr.uima.processor.UIMAUpdateRequestProcessorFactory} and related code.
+
+
diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/package.html b/solr/contrib/velocity/src/java/org/apache/solr/response/package.html
new file mode 100644
index 00000000000..8815326898a
--- /dev/null
+++ b/solr/contrib/velocity/src/java/org/apache/solr/response/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+{@link org.apache.solr.response.VelocityResponseWriter} and related code.
+
+
diff --git a/solr/solrj/src/java/org/apache/noggit/package.html b/solr/solrj/src/java/org/apache/noggit/package.html
new file mode 100644
index 00000000000..1aa8fc9c644
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/noggit/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+JSON streaming parser and serializer.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package.html b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package.html
new file mode 100644
index 00000000000..c3ea70a1f87
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Annotation based mapping of client objects to Solr documents.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package.html b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package.html
new file mode 100644
index 00000000000..5355c614495
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Concrete implementations of client API classes.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/package.html b/solr/solrj/src/java/org/apache/solr/client/solrj/package.html
new file mode 100644
index 00000000000..69cfdf2ff1d
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Primary APIs for communicating with a Solr Server from a Java client.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/package.html b/solr/solrj/src/java/org/apache/solr/client/solrj/request/package.html
new file mode 100644
index 00000000000..97af688fcf3
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Convenience classes for dealing with various types of Solr requests.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/package.html b/solr/solrj/src/java/org/apache/solr/client/solrj/response/package.html
new file mode 100644
index 00000000000..898c4484421
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Convenience classes for dealing with various types of Solr responses.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/package.html b/solr/solrj/src/java/org/apache/solr/client/solrj/util/package.html
new file mode 100644
index 00000000000..982ff76f10f
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Utilities for Solr client applications.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/package.html b/solr/solrj/src/java/org/apache/solr/common/cloud/package.html
new file mode 100644
index 00000000000..30a5f219e2d
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Common Solr Cloud and ZooKeeper related classes reused on both clients & server.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/common/luke/package.html b/solr/solrj/src/java/org/apache/solr/common/luke/package.html
new file mode 100644
index 00000000000..ecceaecca55
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/common/luke/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Common constants used by the LukeRequestHandler.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/common/package.html b/solr/solrj/src/java/org/apache/solr/common/package.html
new file mode 100644
index 00000000000..a2f80ea558d
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/common/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Common classes reused on both clients & server for dealing with {@link org.apache.solr.common.SolrInputDocument documents to be indexed} and {@link org.apache.solr.common.SolrDocumentList result documents}.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/package.html b/solr/solrj/src/java/org/apache/solr/common/params/package.html
new file mode 100644
index 00000000000..9f5f13cdebe
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/common/params/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Parameter constants and enumerations.
+
+
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/package.html b/solr/solrj/src/java/org/apache/solr/common/util/package.html
new file mode 100644
index 00000000000..1bb069fece9
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/common/util/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Common utility classes reused on both clients & server.
+
+
diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/package.html b/solr/test-framework/src/java/org/apache/solr/analysis/package.html
new file mode 100644
index 00000000000..4c716c0ea61
--- /dev/null
+++ b/solr/test-framework/src/java/org/apache/solr/analysis/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Factories for Mock analysis classes that can be used in test configurations.
+
+
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/package.html b/solr/test-framework/src/java/org/apache/solr/cloud/package.html
new file mode 100644
index 00000000000..6486c0b4692
--- /dev/null
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Base classes and utilities for creating and testing Solr Cloud clusters.
+
+
diff --git a/solr/test-framework/src/java/org/apache/solr/core/package.html b/solr/test-framework/src/java/org/apache/solr/core/package.html
new file mode 100644
index 00000000000..9aca6a86ecf
--- /dev/null
+++ b/solr/test-framework/src/java/org/apache/solr/core/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Factories for Mock classes that can be used in test configurations
+
+
diff --git a/solr/test-framework/src/java/org/apache/solr/package.html b/solr/test-framework/src/java/org/apache/solr/package.html
new file mode 100644
index 00000000000..6175b842669
--- /dev/null
+++ b/solr/test-framework/src/java/org/apache/solr/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Common base classes for implementing tests.
+
+
diff --git a/solr/test-framework/src/java/org/apache/solr/update/processor/package.html b/solr/test-framework/src/java/org/apache/solr/update/processor/package.html
new file mode 100644
index 00000000000..8c8c74a16e7
--- /dev/null
+++ b/solr/test-framework/src/java/org/apache/solr/update/processor/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Mock classes for testing Update Processor chains.
+
+
diff --git a/solr/test-framework/src/java/org/apache/solr/util/package.html b/solr/test-framework/src/java/org/apache/solr/util/package.html
new file mode 100644
index 00000000000..56b5aba85bc
--- /dev/null
+++ b/solr/test-framework/src/java/org/apache/solr/util/package.html
@@ -0,0 +1,22 @@
+
+
+
+
+Misc utilities useful when implementing test cases.
+
+