Move license header to the top of the file
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/package-info.java b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/package-info.java
index 78eaac6..1b9272c 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/handlers/package-info.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/handlers/package-info.java
@@ -1,10 +1,3 @@
-/**
- * The {@code handlers} package contains
- * {@link org.apache.commons.digester3.annotations.AnnotationHandler}
- * implementations.
- */
-package org.apache.commons.digester3.annotations.handlers;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -23,3 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/**
+ * The {@code handlers} package contains
+ * {@link org.apache.commons.digester3.annotations.AnnotationHandler}
+ * implementations.
+ */
+package org.apache.commons.digester3.annotations.handlers;
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/package-info.java b/core/src/main/java/org/apache/commons/digester3/annotations/package-info.java
index 503f33a..06238f7 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/package-info.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/package-info.java
@@ -1,9 +1,3 @@
-/**
- * The {@code annotations} package provides for Java5 Annotations
- * meta data-based definition of rules for {@code Digester}.
- */
-package org.apache.commons.digester3.annotations;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,3 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/**
+ * The {@code annotations} package provides for Java5 Annotations
+ * meta data-based definition of rules for {@code Digester}.
+ */
+package org.apache.commons.digester3.annotations;
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/reflect/package-info.java b/core/src/main/java/org/apache/commons/digester3/annotations/reflect/package-info.java
index cca5bb7..4a8f71f 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/reflect/package-info.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/reflect/package-info.java
@@ -1,9 +1,3 @@
-/**
- * The {@code reflect} package supply missing JVM classes to alow user
- * manipulate entities as {@link java.lang.reflect.AnnotatedElement}.
- */
-package org.apache.commons.digester3.annotations.reflect;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,3 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/**
+ * The {@code reflect} package supply missing JVM classes to alow user
+ * manipulate entities as {@link java.lang.reflect.AnnotatedElement}.
+ */
+package org.apache.commons.digester3.annotations.reflect;
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/rules/package-info.java b/core/src/main/java/org/apache/commons/digester3/annotations/rules/package-info.java
index 9aa724b..099a214 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/rules/package-info.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/rules/package-info.java
@@ -1,8 +1,3 @@
-/**
- * Classes contained in this package are annotations that reflect Digester rules.
- */
-package org.apache.commons.digester3.annotations.rules;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,3 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/**
+ * Classes contained in this package are annotations that reflect Digester rules.
+ */
+package org.apache.commons.digester3.annotations.rules;
diff --git a/core/src/main/java/org/apache/commons/digester3/annotations/utils/package-info.java b/core/src/main/java/org/apache/commons/digester3/annotations/utils/package-info.java
index 14739f8..b0744e6 100644
--- a/core/src/main/java/org/apache/commons/digester3/annotations/utils/package-info.java
+++ b/core/src/main/java/org/apache/commons/digester3/annotations/utils/package-info.java
@@ -1,8 +1,3 @@
-/**
- * Contains commons utilities classes for Java5 Annotations manipulation.
- */
-package org.apache.commons.digester3.annotations.utils;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,3 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/**
+ * Contains commons utilities classes for Java5 Annotations manipulation.
+ */
+package org.apache.commons.digester3.annotations.utils;
diff --git a/core/src/main/java/org/apache/commons/digester3/binder/package-info.java b/core/src/main/java/org/apache/commons/digester3/binder/package-info.java
index 259b431..e691075 100644
--- a/core/src/main/java/org/apache/commons/digester3/binder/package-info.java
+++ b/core/src/main/java/org/apache/commons/digester3/binder/package-info.java
@@ -1,10 +1,3 @@
-/**
- * The Digester EDSL allows configure Digester using fluent APIs.
- *
- * @since 3.0
- */
-package org.apache.commons.digester3.binder;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -23,3 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/**
+ * The Digester EDSL allows configure Digester using fluent APIs.
+ *
+ * @since 3.0
+ */
+package org.apache.commons.digester3.binder;
diff --git a/core/src/main/java/org/apache/commons/digester3/package-info.java b/core/src/main/java/org/apache/commons/digester3/package-info.java
index ad1fd85..b8ebba7 100644
--- a/core/src/main/java/org/apache/commons/digester3/package-info.java
+++ b/core/src/main/java/org/apache/commons/digester3/package-info.java
@@ -1,11 +1,3 @@
-/**
- * The {@code xmlrules} package provides for XML-based definition of
- * rules for {@code Digester}. This improves maintainability of Java code,
- * as rules are now defined in XML and read into {@code Digester}
- * at run-time.
- */
-package org.apache.commons.digester3;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -24,3 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/**
+ * The {@code xmlrules} package provides for XML-based definition of
+ * rules for {@code Digester}. This improves maintainability of Java code,
+ * as rules are now defined in XML and read into {@code Digester}
+ * at run-time.
+ */
+package org.apache.commons.digester3;
diff --git a/core/src/main/java/org/apache/commons/digester3/plugins/package-info.java b/core/src/main/java/org/apache/commons/digester3/plugins/package-info.java
index 2d7ae24..81a8cf4 100644
--- a/core/src/main/java/org/apache/commons/digester3/plugins/package-info.java
+++ b/core/src/main/java/org/apache/commons/digester3/plugins/package-info.java
@@ -1,9 +1,3 @@
-/**
- * The {@code plugins} package provides an easy mechanism whereby new
- * digestion rules can be added dynamically during a digestion.
- */
-package org.apache.commons.digester3.plugins;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,3 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/**
+ * The {@code plugins} package provides an easy mechanism whereby new
+ * digestion rules can be added dynamically during a digestion.
+ */
+package org.apache.commons.digester3.plugins;
diff --git a/core/src/main/java/org/apache/commons/digester3/plugins/strategies/package-info.java b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/package-info.java
index f7d21b6..45495e5 100644
--- a/core/src/main/java/org/apache/commons/digester3/plugins/strategies/package-info.java
+++ b/core/src/main/java/org/apache/commons/digester3/plugins/strategies/package-info.java
@@ -1,9 +1,3 @@
-/**
- * The {@code plugins.strategies} package contains "rule-finding" strategy
- * classes, and their associated "helper" loader classes.
- */
-package org.apache.commons.digester3.plugins.strategies;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,3 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/**
+ * The {@code plugins.strategies} package contains "rule-finding" strategy
+ * classes, and their associated "helper" loader classes.
+ */
+package org.apache.commons.digester3.plugins.strategies;
diff --git a/core/src/main/java/org/apache/commons/digester3/substitution/package-info.java b/core/src/main/java/org/apache/commons/digester3/substitution/package-info.java
index 80f3f52..110344c 100644
--- a/core/src/main/java/org/apache/commons/digester3/substitution/package-info.java
+++ b/core/src/main/java/org/apache/commons/digester3/substitution/package-info.java
@@ -1,9 +1,3 @@
-/**
- * The {@code substitution} provides for manipulation of xml attributes and
- * element body text before the data is processed by any Rule objects.
- */
-package org.apache.commons.digester3.substitution;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,3 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+/**
+ * The {@code substitution} provides for manipulation of xml attributes and
+ * element body text before the data is processed by any Rule objects.
+ */
+package org.apache.commons.digester3.substitution;