Multiple: Update license headers per Apache guidance
diff --git a/doc/design/figures/class_diagram.mp b/doc/design/figures/class_diagram.mp
index d7edbf8..10940f9 100644
--- a/doc/design/figures/class_diagram.mp
+++ b/doc/design/figures/class_diagram.mp
@@ -1,3 +1,20 @@
+% Licensed to the Apache Software Foundation (ASF) under one
+% or more contributor license agreements.  See the NOTICE file
+% distributed with this work for additional information
+% regarding copyright ownership.  The ASF licenses this file
+% to you under the Apache License, Version 2.0 (the
+% "License"); you may not use this file except in compliance
+% with the License.  You may obtain a copy of the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing,
+% software distributed under the License is distributed on an
+% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+% KIND, either express or implied.  See the License for the
+% specific language governing permissions and limitations
+% under the License.
+
 % Metapost figure compiled offline to create the class diagram for modular fold/reduce
 % need MetaUML (https://github.com/ogheorghies/MetaUML) to compile this file
 % to create pdf figure: mptopdf class_diagram.mp
diff --git a/pom.xml b/pom.xml
index e4eefc4..5defa28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,6 @@
               <exclude>doc/design/design.tex</exclude>
               <exclude>doc/design/figures/basics_decision_tree.pdf</exclude>
               <exclude>doc/design/figures/class_diagram-1.pdf</exclude>
-              <exclude>doc/design/figures/class_diagram.mp</exclude>
               <exclude>doc/design/figures/decision_tree_linear_model.pdf</exclude>
               <exclude>doc/design/figures/impurity_measures.pdf</exclude>
               <exclude>doc/design/figures/lanczos_bidiag_segment.pdf</exclude>
diff --git a/src/madpack/sort-module.py b/src/madpack/sort-module.py
index 3c4691d..0d8d478 100644
--- a/src/madpack/sort-module.py
+++ b/src/madpack/sort-module.py
@@ -1,21 +1,4 @@
 #!/usr/bin/env python
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
 
 """
 @file sort-module.py