diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index edf73a4..c4a6f5f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,11 @@
+---
+SPDX-FileType: DOCUMENTATION
 SPDX-License-Identifier: CC-BY-4.0
+---
 
 Contributing
 ============
+
 Thank you for your interest in `tools-java`. The project is open-source software, and bug reports, suggestions, and most especially patches are welcome.
 
 All contributions must include a "Signed-off-by" line in the commit message.
@@ -10,12 +14,14 @@ This indicates that the contribution is made pursuant to the [Developer Certific
 
 Issues
 ------
+
 `tools-java` has a [project page on GitHub](https://github.com/spdx/tools-java/) where you can [create an issue](https://github.com/spdx/tools-java/issues/new) to report a bug, make a suggestion, or propose a substantial change or improvement that you might like to make. You may also wish to contact the SPDX working group technical team through its mailing list, [spdx-tech@lists.spdx.org](mailto:spdx-tech@lists.spdx.org).
 
 If you would like to work on a fix for any issue, please assign the issue to yourself prior to creating a patch.
 
 Patches
 -------
+
 The source code for `spdx-tools` is hosted on [github.com/spdx/tools-java](https://github.com/spdx/tools-java). Please review [open pull requests](https://github.com/spdx/tools-java/pulls) and [active branches](https://github.com/spdx/tools-java/branches) before committing time to a substantial revision. Work along similar lines may already be in progress.
 
 To submit a patch via GitHub, fork the repository, create a topic branch from `master` for your work, and send a pull request when ready. If you would prefer to send a patch or grant access to pull from your own Git repository, please contact the project's contributors by e-mail.
@@ -24,20 +30,19 @@ To contribute an implementation of a feature defined by a version of the SPDX sp
 
 Once implemented, submit a pull request with `spec/X.X` branch as the parent branch.
 
-
 Licensing
 ---------
 
 New **code files** should include a [short-form SPDX ID](https://spdx.org/ids) at the top, indicating the project license for code, which is Apache-2.0. This should look like the following:
 
-```
+```java
 // SPDX-License-Identifier: Apache-2.0
 ```
 
 Developer Certificate of Origin (DCO)
 -------------------------------------
 
-```
+```text
 Developer Certificate of Origin
 Version 1.1
 
@@ -76,4 +81,3 @@ By making a contribution to this project, I certify that:
     maintained indefinitely and may be redistributed consistent with
     this project or the open source license(s) involved.
 ```
-
diff --git a/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java b/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java
index 2d0b245..584fdce 100644
--- a/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java
+++ b/examples/org/spdx/examples/ExistingSpdxDocumentV2Compat.java
@@ -1,6 +1,7 @@
 /**
+ * SPDX-FileCopyrightText: Copyright (c) 2021 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * Copyright (c) 2021 Source Auditor Inc.
  */
 package org.spdx.examples;
 
@@ -33,7 +34,6 @@
  * This example depends on the Spdx-Java-Library and the spdx-java-jackson store libraries
  * 
  * @author Gary O'Neall
- *
  */
 public class ExistingSpdxDocumentV2Compat {
 
@@ -52,7 +52,7 @@ public static void main(String[] args) {
 		}
 		
 		/*
-		 * First thing we need is a store deseralize the SPDX document into.
+		 * First thing we need is a store deserialize the SPDX document into.
 		 * We'll chose the MultiFormatStore since it supports serializing to JSON files
 		 * It takes an underlying model store as the first parameter - the inMemSpdxStore is a simple
 		 * built in store included in the Spdx-Java-Library.  The second parameter is the format
@@ -74,7 +74,7 @@ public static void main(String[] args) {
 		 * license information over to the document model store
 		 */
 		ModelCopyManager copyManager = new ModelCopyManager();
-		// Let's deseralize the document
+		// Let's deserialize the document
 		try (InputStream stream = new FileInputStream(inputFile)) {
 			modelStore.deSerialize(stream, false);
 			
diff --git a/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java b/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java
index 07be22c..f99a182 100644
--- a/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java
+++ b/examples/org/spdx/examples/SimpleSpdxDocumentV2Compat.java
@@ -1,6 +1,7 @@
 /**
+ * SPDX-FileCopyrightText: Copyright (c) 2021 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * Copyright (c) 2021 Source Auditor Inc.
  */
 package org.spdx.examples;
 
@@ -35,7 +36,6 @@
  * This example depends on the Spdx-Java-Library and the spdx-java-jackson store libraries
  * 
  * @author Gary O'Neall
- *
  */
 public class SimpleSpdxDocumentV2Compat {
 
diff --git a/src/main/java/org/spdx/tools/CONTRIBUTING.md b/src/main/java/org/spdx/tools/CONTRIBUTING.md
index 755f112..a41d4ff 100644
--- a/src/main/java/org/spdx/tools/CONTRIBUTING.md
+++ b/src/main/java/org/spdx/tools/CONTRIBUTING.md
@@ -1,15 +1,18 @@
 Contributing
 ============
+
 Thank you for your interest in `Spdx-Java-Library`. The project is open-source software, and bug reports, suggestions, and most especially patches are welcome.
 
 Issues
 ------
+
 `Spdx-Java-Library` has a [project page on GitHub](https://github.com/spdx/Spdx-Java-Library) where you can [create an issue](https://github.com/spdx/Spdx-Java-Library/issues/new/choose) to report a bug, make a suggestion, or propose a substantial change or improvement that you might like to make. You may also wish to contact the SPDX working group technical team through its mailing list, [spdx-tech@lists.spdx.org](mailto:spdx-tech@lists.spdx.org).
 
 If you would like to work on a fix for any issue, please assign the issue to yourself prior to creating a Pull Request.
 
 Pull Requests
 -------
+
 The source code for `Spdx-Java-Library` is hosted on [github.com/spdx/Spdx-Java-Library](https://github.com/spdx/Spdx-Java-Library). Please review [open pull requests](https://github.com/spdx/Spdx-Java-Library/pulls) and [active branches](https://github.com/spdx/Spdx-Java-Library/branches) before committing time to a substantial revision. Work along similar lines may already be in progress.
 
 To submit a pull request via GitHub, fork the repository, create a topic branch from `master` for your work, and send a pull request when ready. If you would prefer to send a patch or grant access to pull from your own Git repository, please contact the project's contributors by e-mail.
@@ -20,4 +23,5 @@ Once implemented, submit a pull request with `spec/X.X` branch as the parent bra
 
 Licensing
 ---------
-However you choose to contribute, please sign-off in each of your commits that you license your contributions under the terms of [the Developer Certificate of Origin](https://developercertificate.org/). Git has utilities for signing off on commits: `git commit -s` signs a current commit, and `git rebase --signoff <revision-range>` retroactively signs a range of past commits.
\ No newline at end of file
+
+However you choose to contribute, please sign-off in each of your commits that you license your contributions under the terms of [the Developer Certificate of Origin](https://developercertificate.org/). Git has utilities for signing off on commits: `git commit -s` signs a current commit, and `git rebase --signoff <revision-range>` retroactively signs a range of past commits.
diff --git a/src/main/java/org/spdx/tools/CompareSpdxDocs.java b/src/main/java/org/spdx/tools/CompareSpdxDocs.java
index 6894031..fdc9629 100644
--- a/src/main/java/org/spdx/tools/CompareSpdxDocs.java
+++ b/src/main/java/org/spdx/tools/CompareSpdxDocs.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools;
 
 import java.io.File;
@@ -44,7 +46,6 @@
  * Document files can be either in RDF/XML  or tag/value format
  *
  * @author Gary O'Neall
- *
  */
 public class CompareSpdxDocs {
 	static final int MIN_ARGS = 2;
@@ -77,6 +78,7 @@ public static void main(String[] args) {
 	}
 
 	/**
+	 * Invoke SPDX document processing functions from the online tool
 	 *
 	 * @param args args[0] is the output Excel file name, all other args are SPDX document file names
 	 * @throws OnlineToolException Exception caught by JPype and displayed to the user
diff --git a/src/main/java/org/spdx/tools/GenerateVerificationCode.java b/src/main/java/org/spdx/tools/GenerateVerificationCode.java
index f84ff34..c125df5 100644
--- a/src/main/java/org/spdx/tools/GenerateVerificationCode.java
+++ b/src/main/java/org/spdx/tools/GenerateVerificationCode.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2011 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2011 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools;
 
 import java.io.File;
@@ -36,7 +38,6 @@
 /**
  * Generates a verification code for a specific directory
  * @author Gary O'Neall
- *
  */
 public class GenerateVerificationCode {
 
diff --git a/src/main/java/org/spdx/tools/InvalidFileNameException.java b/src/main/java/org/spdx/tools/InvalidFileNameException.java
index 8e3e404..9f438fe 100644
--- a/src/main/java/org/spdx/tools/InvalidFileNameException.java
+++ b/src/main/java/org/spdx/tools/InvalidFileNameException.java
@@ -1,26 +1,26 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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.
+ *
  */
 package org.spdx.tools;
 
 /**
- * Illegal paramater fro a file name
+ * Illegal parameter fro a file name
  * @author Gary O'Neall
- *
  */
 public class InvalidFileNameException extends Exception {
 
diff --git a/src/main/java/org/spdx/tools/Main.java b/src/main/java/org/spdx/tools/Main.java
index 94ddfdb..0f1123a 100644
--- a/src/main/java/org/spdx/tools/Main.java
+++ b/src/main/java/org/spdx/tools/Main.java
@@ -1,13 +1,13 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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,
@@ -15,7 +15,6 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
- * SPDX-License-Identifier: Apache-2.0
  */
 package org.spdx.tools;
 
@@ -26,7 +25,6 @@
  * Dispatch individual tools
  * 
  * @author Gary O'Neall
- *
  */
 public class Main {
 
diff --git a/src/main/java/org/spdx/tools/MatchingStandardLicenses.java b/src/main/java/org/spdx/tools/MatchingStandardLicenses.java
index 9d0ddc2..272d95b 100644
--- a/src/main/java/org/spdx/tools/MatchingStandardLicenses.java
+++ b/src/main/java/org/spdx/tools/MatchingStandardLicenses.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2014 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2014 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools;
 
 import java.io.File;
@@ -30,7 +32,6 @@
  * license ID's that are equivalent using the SPDX Legal team's license matching
  * guidelines (http://spdx.org/spdx-license-list/matching-guidelines)
  * @author Gary O'Neall
- *
  */
 public class MatchingStandardLicenses {
 
diff --git a/src/main/java/org/spdx/tools/OnlineToolException.java b/src/main/java/org/spdx/tools/OnlineToolException.java
index ac84aef..59be6fb 100644
--- a/src/main/java/org/spdx/tools/OnlineToolException.java
+++ b/src/main/java/org/spdx/tools/OnlineToolException.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2017 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2017 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,31 +15,29 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools;
 
 /**
  * Default Exception thrown to the Online Tool
  *
  * @author Rohit Lodha
- *
  */
-
 public class OnlineToolException extends Exception {
 
 	/**
-	 * 
+	 * Serial version UID
 	 */
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 *
+	 * Default constructor for OnlineToolException.
 	 */
 	public OnlineToolException() {
 	}
 
 	/**
-	 *
+	 * Constructs an OnlineToolException with the specified message.
 	 * @param arg0
 	 */
 	public OnlineToolException(String arg0) {
@@ -45,7 +45,7 @@ public OnlineToolException(String arg0) {
 	}
 
 	/**
-	 *
+	 * Constructs an OnlineToolException with the specified throwable.
 	 * @param arg0
 	 */
 	public OnlineToolException(Throwable arg0) {
@@ -53,7 +53,7 @@ public OnlineToolException(Throwable arg0) {
 	}
 
 	/**
-	 *
+	 * Constructs an OnlineToolException with the specified message and throwable.
 	 * @param arg0
 	 * @param arg1
 	 */
@@ -62,7 +62,7 @@ public OnlineToolException(String arg0, Throwable arg1) {
 	}
 
 	/**
-	 *
+	 * Constructs an OnlineToolException with the specified message, throwable, and booleans.
 	 * @param arg0
 	 * @param arg1
 	 * @param arg2
diff --git a/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java b/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java
index da78787..299099a 100644
--- a/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java
+++ b/src/main/java/org/spdx/tools/RdfSchemaToJsonContext.java
@@ -1,19 +1,20 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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.
+ *
  */
 package org.spdx.tools;
 
@@ -35,9 +36,8 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
- * Convert an RDF schema file containing SPDX property to a JSON context file for all properties in the SPDX namspace
+ * Convert an RDF schema file containing SPDX property to a JSON context file for all properties in the SPDX namespace
  * @author Gary O'Neall
- *
  */
 public class RdfSchemaToJsonContext {
 	
diff --git a/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java b/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java
index af32803..595257b 100644
--- a/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java
+++ b/src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java
@@ -1,19 +1,20 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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.
+ *
  */
 package org.spdx.tools;
 
@@ -37,9 +38,8 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
- * Convert an RDF schema file containing SPDX property to a JSON schema file for all properties in the SPDX namspace
+ * Convert an RDF schema file containing SPDX property to a JSON schema file for all properties in the SPDX namespace
  * @author Gary O'Neall
- *
  */
 public class RdfSchemaToJsonSchema {
 
@@ -120,7 +120,7 @@ public static void main(String[] args) {
 
 	public static void usage() {
 		System.out.println("Usage:");
-		System.out.println("RdfSchemaToJsonScema rdfSchemaFile jsonSchemaFile");
+		System.out.println("RdfSchemaToJsonSchema rdfSchemaFile jsonSchemaFile");
 		System.out.println("\trdfSchemaFile RDF schema file in RDF/XML format");
 		System.out.println("\tjsonSchemaFile output JSON Schema file");
 	}
diff --git a/src/main/java/org/spdx/tools/RdfSchemaToXsd.java b/src/main/java/org/spdx/tools/RdfSchemaToXsd.java
index 5eed1d3..5482966 100644
--- a/src/main/java/org/spdx/tools/RdfSchemaToXsd.java
+++ b/src/main/java/org/spdx/tools/RdfSchemaToXsd.java
@@ -1,4 +1,23 @@
+/**
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ *   Licensed 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
+ *
+ *       https://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.
+ *
+ */
 package org.spdx.tools;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -16,29 +35,9 @@
 import org.spdx.tools.schema.OwlToXsd;
 import org.spdx.tools.schema.SchemaException;
 
-
-/**
- * Copyright (c) 2020 Source Auditor Inc.
- *
- * SPDX-License-Identifier: Apache-2.0
- * 
- *   Licensed 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.
- */
-
 /**
  * Convert an RDF OWL document to an XML Schema
  * @author Gary O'Neall
- *
  */
 public class RdfSchemaToXsd {
 
diff --git a/src/main/java/org/spdx/tools/SpdxConverter.java b/src/main/java/org/spdx/tools/SpdxConverter.java
index aeb500e..d8c010c 100644
--- a/src/main/java/org/spdx/tools/SpdxConverter.java
+++ b/src/main/java/org/spdx/tools/SpdxConverter.java
@@ -1,19 +1,20 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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.
+ *
  */
 package org.spdx.tools;
 
@@ -47,7 +48,6 @@
  * 
  * the <code>covert(...)</code> methods can be called programmatically to convert files
  * @author Gary O'Neall
- *
  */
 public class SpdxConverter {
     static final Logger logger = LoggerFactory.getLogger(SpdxConverter.class);
diff --git a/src/main/java/org/spdx/tools/SpdxConverterException.java b/src/main/java/org/spdx/tools/SpdxConverterException.java
index bef43d2..ad20b34 100644
--- a/src/main/java/org/spdx/tools/SpdxConverterException.java
+++ b/src/main/java/org/spdx/tools/SpdxConverterException.java
@@ -1,13 +1,13 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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,
@@ -15,15 +15,13 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
- * SPDX-License-Identifier: Apache-2.0
  */
 package org.spdx.tools;
 
 /**
- * @author Gary O'Neall
- * 
  * Exceptions related to the SPDX converter utility
  *
+ * @author Gary O'Neall
  */
 public class SpdxConverterException extends Exception {
 
diff --git a/src/main/java/org/spdx/tools/SpdxToolsHelper.java b/src/main/java/org/spdx/tools/SpdxToolsHelper.java
index 5c525b7..4c37030 100644
--- a/src/main/java/org/spdx/tools/SpdxToolsHelper.java
+++ b/src/main/java/org/spdx/tools/SpdxToolsHelper.java
@@ -1,13 +1,13 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -15,7 +15,6 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
- * SPDX-License-Identifier: Apache-2.0
  */
 package org.spdx.tools;
 
@@ -56,7 +55,6 @@
  * Static helper methods for the various tools
  *
  * @author Gary O'Neall
- *
  */
 public class SpdxToolsHelper {
 
diff --git a/src/main/java/org/spdx/tools/SpdxVerificationException.java b/src/main/java/org/spdx/tools/SpdxVerificationException.java
index 65faf49..5a75b45 100644
--- a/src/main/java/org/spdx/tools/SpdxVerificationException.java
+++ b/src/main/java/org/spdx/tools/SpdxVerificationException.java
@@ -1,13 +1,13 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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,
@@ -15,15 +15,13 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
- * SPDX-License-Identifier: Apache-2.0
  */
 package org.spdx.tools;
 
 /**
- * @author Gary O'Neall
- * 
  * Exceptions for the SPDX Verify tools
  *
+ * @author Gary O'Neall
  */
 public class SpdxVerificationException extends Exception {
 
diff --git a/src/main/java/org/spdx/tools/SpdxVersion.java b/src/main/java/org/spdx/tools/SpdxVersion.java
index b432b60..eec1812 100644
--- a/src/main/java/org/spdx/tools/SpdxVersion.java
+++ b/src/main/java/org/spdx/tools/SpdxVersion.java
@@ -1,13 +1,13 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -15,7 +15,6 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
- * SPDX-License-Identifier: Apache-2.0
  */
 package org.spdx.tools;
 
diff --git a/src/main/java/org/spdx/tools/SpdxViewer.java b/src/main/java/org/spdx/tools/SpdxViewer.java
index 269a894..cd2c37a 100644
--- a/src/main/java/org/spdx/tools/SpdxViewer.java
+++ b/src/main/java/org/spdx/tools/SpdxViewer.java
@@ -1,12 +1,13 @@
-package org.spdx.tools;
 /**
- * Copyright (c) 2010 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2010 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -15,7 +16,7 @@
  *   limitations under the License.
  *
  */
-
+package org.spdx.tools;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -37,7 +38,6 @@
  * @author Gary O'Neall
  * @version 0.1
  */
-
 public class SpdxViewer {
 
 	static final int MIN_ARGS = 1;
@@ -48,9 +48,7 @@ public class SpdxViewer {
 	 * Pretty Printer for an SPDX Document
 	 *
      * @param args args[0] SPDX file path; args[1] [RDFXML|JSON|XLS|XLSX|YAML|TAG] an optional file type - if not present, file type of the to file will be used
-     * 
 	 */
-
 	public static void main(String[] args) {
 		if (args.length < MIN_ARGS) {
 			System.err
diff --git a/src/main/java/org/spdx/tools/Verify.java b/src/main/java/org/spdx/tools/Verify.java
index de421f2..0942914 100644
--- a/src/main/java/org/spdx/tools/Verify.java
+++ b/src/main/java/org/spdx/tools/Verify.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools;
 
 import java.io.File;
@@ -46,7 +48,6 @@
 /**
  * Verifies an SPDX document and lists any verification errors
  * @author Gary O'Neall
- *
  */
 public class Verify {
 
diff --git a/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java b/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java
index e42492f..6d1c1dc 100644
--- a/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java
+++ b/src/main/java/org/spdx/tools/compare/AbstractFileCompareSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.List;
@@ -35,7 +37,6 @@
  * The first column is the file path, second column indicates if all documents are equal,
  * columns 3 through N are for the values of the individual documents
  * @author Gary O'Neall
- *
  */
 public abstract class AbstractFileCompareSheet extends AbstractSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/AbstractSheet.java b/src/main/java/org/spdx/tools/compare/AbstractSheet.java
index e44cfb4..207d7b6 100644
--- a/src/main/java/org/spdx/tools/compare/AbstractSheet.java
+++ b/src/main/java/org/spdx/tools/compare/AbstractSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2011 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2011 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -38,7 +40,6 @@
 /**
  * Abstract class representing a workbook sheet used in storing structured data
  * @author Gary O'Neall
- *
  */
 public abstract class AbstractSheet {
 	
diff --git a/src/main/java/org/spdx/tools/compare/CompareHelper.java b/src/main/java/org/spdx/tools/compare/CompareHelper.java
index ad7121f..381af00 100644
--- a/src/main/java/org/spdx/tools/compare/CompareHelper.java
+++ b/src/main/java/org/spdx/tools/compare/CompareHelper.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.net.URI;
@@ -40,7 +42,6 @@
 /**
  * Helper class for comparisons
  * @author Gary O'Neall
- *
  */
 public class CompareHelper {
 
diff --git a/src/main/java/org/spdx/tools/compare/CreatorSheet.java b/src/main/java/org/spdx/tools/compare/CreatorSheet.java
index 882760b..1e0477b 100644
--- a/src/main/java/org/spdx/tools/compare/CreatorSheet.java
+++ b/src/main/java/org/spdx/tools/compare/CreatorSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Arrays;
@@ -35,7 +37,6 @@
  * Column 1 describes if the creator is the same or different
  * Columns 2 through N are for creators in each of the documents
  * @author Gary O'Neall
- *
  */
 public class CreatorSheet extends AbstractSheet {
 	private static final int COL_WIDTH = 50;
diff --git a/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java b/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java
index 28af862..a8ec948 100644
--- a/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java
+++ b/src/main/java/org/spdx/tools/compare/DocumentAnnotationSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.Serializable;
@@ -35,7 +37,6 @@
 /**
  * Sheet for document level annotations
  * @author Gary O'Neall
- *
  */
 public class DocumentAnnotationSheet extends AbstractSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java b/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java
index 9237bd6..b7f1dae 100644
--- a/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java
+++ b/src/main/java/org/spdx/tools/compare/DocumentRelationshipSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.Serializable;
@@ -37,7 +39,6 @@
 /**
  * Sheet for document level relationships
  * @author Gary O'Neall
- *
  */
 public class DocumentRelationshipSheet extends AbstractSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/DocumentSheet.java b/src/main/java/org/spdx/tools/compare/DocumentSheet.java
index b0e2a1a..efd8650 100644
--- a/src/main/java/org/spdx/tools/compare/DocumentSheet.java
+++ b/src/main/java/org/spdx/tools/compare/DocumentSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.List;
@@ -36,7 +38,6 @@
  * The first row summarizes which fields are different, the subsequent rows are the
  * specific date from each result
  * @author Gary O'Neall
- *
  */
 public class DocumentSheet extends AbstractSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java b/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java
index 7c3cb2f..4cac713 100644
--- a/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java
+++ b/src/main/java/org/spdx/tools/compare/ExternalReferencesSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.Serializable;
@@ -37,7 +39,6 @@
 /**
  * Sheet that compares the external document references
  * @author Gary O'Neall
- *
  */
 public class ExternalReferencesSheet extends AbstractSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java b/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java
index 0c23d7c..5971296 100644
--- a/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java
+++ b/src/main/java/org/spdx/tools/compare/ExtractedLicenseSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.Serializable;
@@ -40,7 +42,6 @@
  * Column 1 contains the extracted text
  * Columns 2 through N contains the license information in the format licenseId [licenseName] {licenceUrls} (licenseComment)
  * @author Gary O'Neall
- *
  */
 public class ExtractedLicenseSheet extends AbstractSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java b/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java
index 21b372f..4a6e79a 100644
--- a/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileAnnotationSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -25,7 +27,6 @@
 /**
  * Sheet comparing file annotations
  * @author Gary O'Neall
- *
  */
 public class FileAnnotationSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java b/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java
index 36a9020..737f886 100644
--- a/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileAttributionSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Collection;
@@ -28,7 +30,6 @@
 /**
  * Sheet with results for file contributor comparison results
  * @author Gary O'Neall
- *
  */
 public class FileAttributionSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java b/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java
index f063b54..d2d11bd 100644
--- a/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileChecksumSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Objects;
@@ -28,7 +30,6 @@
 /**
  * Sheet of comparison results for file checksums
  * @author Gary O'Neall
- *
  */
 public class FileChecksumSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileCommentSheet.java b/src/main/java/org/spdx/tools/compare/FileCommentSheet.java
index c809b24..021558f 100644
--- a/src/main/java/org/spdx/tools/compare/FileCommentSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileCommentSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Optional;
@@ -25,9 +27,8 @@
 import org.spdx.utility.compare.SpdxComparer;
 
 /**
- * Sheet continaing results for file comment comparison
+ * Sheet containing results for file comment comparison
  * @author Gary O'Neall
- *
  */
 public class FileCommentSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java b/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java
index 24f6cfb..d616012 100644
--- a/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileConcludedSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -25,8 +27,8 @@
 
 
 /**
+ * Sheet with results for file concluded license comparison results
  * @author Source Auditor
- *
  */
 public class FileConcludedSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java b/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java
index 5812a9a..871ff33 100644
--- a/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileContributorsSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Collection;
@@ -27,7 +29,6 @@
 /**
  * Sheet with results for file AttributionText comparison results
  * @author Gary O'Neall
- *
  */
 public class FileContributorsSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java b/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java
index 6de6819..eb52526 100644
--- a/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileCopyrightSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -25,7 +27,6 @@
 /**
  * Sheet comparing file copyrights
  * @author Gary O'Neall
- *
  */
 public class FileCopyrightSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java b/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java
index 8c71fc7..7475a48 100644
--- a/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileLicenseCommentsSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Optional;
@@ -28,7 +30,6 @@
 /**
  * Sheet of comparison results for file license comments
  * @author Gary O'Neall
- *
  */
 public class FileLicenseCommentsSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java b/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java
index 7881578..78313be 100644
--- a/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileLicenseInfoSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Collection;
@@ -30,7 +32,6 @@
 /**
  * Sheet of the comparison results for the file seen licenses
  * @author Gary O'Neall
- *
  */
 public class FileLicenseInfoSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java b/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java
index 0832232..56b526d 100644
--- a/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileNoticeSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Optional;
@@ -27,7 +29,6 @@
 /**
  * Sheet for file notice comparison results
  * @author Gary O'Neall
- *
  */
 public class FileNoticeSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java b/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java
index c389860..9bd2db3 100644
--- a/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileRelationshipSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -25,7 +27,6 @@
 /**
  * Sheet comparing file relationships
  * @author Gary O'Neall
- *
  */
 public class FileRelationshipSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java b/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java
index d870ebc..9a56d5f 100644
--- a/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileSpdxIdSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -22,8 +24,8 @@
 import org.spdx.utility.compare.SpdxComparer;
 
 /**
- * @author Gary
- *
+ * Sheet comparing file SPDX IDs
+ * @author Gary O'Neall
  */
 public class FileSpdxIdSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/FileTypeSheet.java b/src/main/java/org/spdx/tools/compare/FileTypeSheet.java
index 0e8c954..55bb071 100644
--- a/src/main/java/org/spdx/tools/compare/FileTypeSheet.java
+++ b/src/main/java/org/spdx/tools/compare/FileTypeSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Arrays;
@@ -29,7 +31,6 @@
 /**
  * Sheet containing File Type
  * @author Gary O'Neall
- *
  */
 public class FileTypeSheet extends AbstractFileCompareSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java b/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java
index dedd571..2ad3478 100644
--- a/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java
+++ b/src/main/java/org/spdx/tools/compare/MultiDocumentSpreadsheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.File;
@@ -59,7 +61,6 @@
  *   - verification: List of any verification errors
  *
  * @author Gary O'Neall
- *
  */
 public class MultiDocumentSpreadsheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java b/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java
index e98437c..170e50a 100644
--- a/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java
+++ b/src/main/java/org/spdx/tools/compare/NormalizedFileNameComparator.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.Serializable;
@@ -25,7 +27,6 @@
  *  - File separator character is "/"
  *  - Must begin with "./"
  * @author Gary O'Neall
- *
  */
 public class NormalizedFileNameComparator implements Comparator<Optional<String>>, Serializable {
 
@@ -36,6 +37,7 @@ public class NormalizedFileNameComparator implements Comparator<Optional<String>
 	static final char DOS_SEPARATOR = '\\';
 	static final char UNIX_SEPARATOR = '/';
 	static final String RELATIVE_DIR = "./";
+
 	/* (non-Javadoc)
 	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
 	 */
diff --git a/src/main/java/org/spdx/tools/compare/PackageSheet.java b/src/main/java/org/spdx/tools/compare/PackageSheet.java
index 2d33d62..67a6159 100644
--- a/src/main/java/org/spdx/tools/compare/PackageSheet.java
+++ b/src/main/java/org/spdx/tools/compare/PackageSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Arrays;
@@ -39,12 +41,12 @@
 import org.spdx.utility.compare.SpdxCompareException;
 import org.spdx.utility.compare.SpdxComparer;
 import org.spdx.utility.compare.SpdxPackageComparer;
+
 /**
  * Document level fields for comparison spreadsheet
  * Column1 is the document field name, column2 indicates if all docs are equal,
  * columns3 through columnN are document specific field values
  * @author Gary O'Neall
- *
  */
 public class PackageSheet extends AbstractSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/SnippetSheet.java b/src/main/java/org/spdx/tools/compare/SnippetSheet.java
index ac0dbe7..6f50d6c 100644
--- a/src/main/java/org/spdx/tools/compare/SnippetSheet.java
+++ b/src/main/java/org/spdx/tools/compare/SnippetSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2016 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2016 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Arrays;
@@ -38,9 +40,8 @@
 import org.spdx.utility.compare.SpdxSnippetComparer;
 
 /**
- * Comparsion sheet for SPDX Snippets
- * @author Gary O'Neall
- *
+ * Comparison sheet for SPDX Snippets
+ * @author Gary O'Neal
  */
 public class SnippetSheet extends AbstractSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/VerificationSheet.java b/src/main/java/org/spdx/tools/compare/VerificationSheet.java
index 235a998..945d487 100644
--- a/src/main/java/org/spdx/tools/compare/VerificationSheet.java
+++ b/src/main/java/org/spdx/tools/compare/VerificationSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.List;
@@ -28,9 +30,9 @@
 
 /**
  * Worksheet containing verification errors
+ *
  * Columns are package names, rows are individual verification errors
  * @author Gary O'Neall
- *
  */
 public class VerificationSheet extends AbstractSheet {
 
diff --git a/src/main/java/org/spdx/tools/compare/package-info.java b/src/main/java/org/spdx/tools/compare/package-info.java
index 9b41c4a..f5ad148 100644
--- a/src/main/java/org/spdx/tools/compare/package-info.java
+++ b/src/main/java/org/spdx/tools/compare/package-info.java
@@ -1,13 +1,13 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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,
@@ -15,12 +15,11 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
- * SPDX-License-Identifier: Apache-2.0
  */
+
 /**
- * @author Gary O'Neall
- * 
  * Classes related to the Compare SPDX Docs utilities
  *
+ * @author Gary O'Neall
  */
-package org.spdx.tools.compare;
\ No newline at end of file
+package org.spdx.tools.compare;
diff --git a/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java b/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java
index af16822..f945e8e 100644
--- a/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java
+++ b/src/main/java/org/spdx/tools/schema/AbstractOwlRdfConverter.java
@@ -1,19 +1,20 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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.
+ *
  */
 package org.spdx.tools.schema;
 
@@ -51,7 +52,6 @@
  * Abstract class for implementing classes which convert from RDF/XML OWL format to some other format
  * 
  * @author Gary O'Neall
- *
  */
 public class AbstractOwlRdfConverter {
 	
diff --git a/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java b/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java
index 792fa37..b205af2 100644
--- a/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java
+++ b/src/main/java/org/spdx/tools/schema/OwlToJsonContext.java
@@ -1,19 +1,20 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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.
+ *
  */
 package org.spdx.tools.schema;
 
@@ -38,7 +39,6 @@
  * Convert OWL RDF schema to a JSON Context file
  * 
  * @author Gary O'Neall
- *
  */
 public class OwlToJsonContext extends AbstractOwlRdfConverter {
 
diff --git a/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java b/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java
index 790c87f..beb7b84 100644
--- a/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java
+++ b/src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java
@@ -1,19 +1,20 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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.
+ *
  */
 package org.spdx.tools.schema;
 
@@ -46,10 +47,9 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
- * @author Gary O'Neall
- *
  * Converts from RDF/OWL RDF/XML documents to JSON Schema draft 7
  *
+ * @author Gary O'Neall
  */
 public class OwlToJsonSchema extends AbstractOwlRdfConverter {
 
diff --git a/src/main/java/org/spdx/tools/schema/OwlToXsd.java b/src/main/java/org/spdx/tools/schema/OwlToXsd.java
index 24c4741..60c0a15 100644
--- a/src/main/java/org/spdx/tools/schema/OwlToXsd.java
+++ b/src/main/java/org/spdx/tools/schema/OwlToXsd.java
@@ -1,19 +1,20 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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.
+ *
  */
 package org.spdx.tools.schema;
 
@@ -60,7 +61,6 @@
  * 
  * 
  * @author Gary O'Neall
- *
  */
 public class OwlToXsd extends AbstractOwlRdfConverter {
 	
diff --git a/src/main/java/org/spdx/tools/schema/SchemaException.java b/src/main/java/org/spdx/tools/schema/SchemaException.java
index e009b2b..77d88e6 100644
--- a/src/main/java/org/spdx/tools/schema/SchemaException.java
+++ b/src/main/java/org/spdx/tools/schema/SchemaException.java
@@ -1,53 +1,63 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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.
+ *
  */
 package org.spdx.tools.schema;
 
 /**
- * @author gary
+ * Exception thrown for schema-related errors
  *
+ * @author Gary O'Neall
  */
 public class SchemaException extends Exception {
 
 	/**
-	 * 
+	 * Serial version UID for serialization
 	 */
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * @param message
+	 * Constructs a new SchemaException with the specified detail message
+	 *
+	 * @param message the detail message
 	 */
 	public SchemaException(String message) {
 		super(message);
 	}
 
 	/**
-	 * @param message
-	 * @param cause
+	 * Constructs a new SchemaException with the specified detail message and
+	 * cause
+	 *
+	 * @param message the detail message
+	 * @param cause   the cause
 	 */
 	public SchemaException(String message, Throwable cause) {
 		super(message, cause);
 	}
 
 	/**
-	 * @param message
-	 * @param cause
-	 * @param enableSuppression
-	 * @param writableStackTrace
+	 * Constructs a new SchemaException with the specified detail message,
+	 * cause, and configurations
+	 * 
+	 * @param message            the detail message
+	 * @param cause              the cause
+	 * @param enableSuppression  whether or not suppression is enabled
+	 * @param writableStackTrace whether or not the stack trace is writable
 	 */
 	public SchemaException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
 		super(message, cause, enableSuppression, writableStackTrace);
diff --git a/src/main/java/org/spdx/tools/schema/package-info.java b/src/main/java/org/spdx/tools/schema/package-info.java
index a317a47..8610df2 100644
--- a/src/main/java/org/spdx/tools/schema/package-info.java
+++ b/src/main/java/org/spdx/tools/schema/package-info.java
@@ -1,20 +1,22 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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.
+ *
  */
+
 /**
  * This package contains classes implementing tools for managing various schemas for the SPDX documents.
  * 
@@ -23,6 +25,5 @@
  * - RDF/OWL in RDF/XML format
  * - JSON Schema Draft 7
  * - JSON LD (Linked Data)
- *
  */
 package org.spdx.tools.schema;
\ No newline at end of file
diff --git a/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java b/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java
index 8f1f85c..d72556c 100644
--- a/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java
+++ b/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java
@@ -1,13 +1,13 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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,
@@ -15,7 +15,6 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
- * SPDX-License-Identifier: Apache-2.0
  */
 package org.spdx.tools;
 
@@ -41,10 +40,9 @@
 import junit.framework.TestCase;
 
 /**
- * @author Gary O'Neall
- * 
  * Test cases for CompareSpdxDocs
  *
+ * @author Gary O'Neall
  */
 public class CompareSpdxDocsTest extends TestCase {
 
@@ -65,7 +63,7 @@ public class CompareSpdxDocsTest extends TestCase {
 	static final String TEST_XML_FILE_PATH_23 = TEST_DIR + File.separator + "SPDXXMLExample-v2.3.spdx.xml";
 	static final String TEST_YAML_FILE_PATH_23 = TEST_DIR + File.separator + "SPDXYAMLExample-2.3.spdx.yaml";
 
-	static final String TEST_DIFF_FILE_COMMNENT_FILE_PATH = TEST_DIR + File.separator + "DifferentFileComment.spdx.yaml";
+	static final String TEST_DIFF_FILE_COMMENT_FILE_PATH = TEST_DIR + File.separator + "DifferentFileComment.spdx.yaml";
 	
 
 
@@ -137,7 +135,7 @@ public void testCompareDocumentsv22() throws OnlineToolException, SpreadsheetExc
 	public void testDifferentDocuments() throws OnlineToolException, SpreadsheetException {
 		String outputFilePath = tempDirPath + File.separator + "comp.xlsx";
 		String[] params = new String[] {outputFilePath, 
-				TEST_YAML_FILE_PATH_22, TEST_DIFF_FILE_COMMNENT_FILE_PATH
+				TEST_YAML_FILE_PATH_22, TEST_DIFF_FILE_COMMENT_FILE_PATH
 		};
 		CompareSpdxDocs.onlineFunction(params);
 		MultiDocumentSpreadsheet result = new MultiDocumentSpreadsheet(new File(outputFilePath), false, true);
diff --git a/src/test/java/org/spdx/tools/GenerateVerificationCodeTest.java b/src/test/java/org/spdx/tools/GenerateVerificationCodeTest.java
index 5c437a7..5e3b753 100644
--- a/src/test/java/org/spdx/tools/GenerateVerificationCodeTest.java
+++ b/src/test/java/org/spdx/tools/GenerateVerificationCodeTest.java
@@ -1,3 +1,8 @@
+/**
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.spdx.tools;
 
 import java.io.File;
diff --git a/src/test/java/org/spdx/tools/SpdxConverterTestV2.java b/src/test/java/org/spdx/tools/SpdxConverterTestV2.java
index 547ff58..ce8402c 100644
--- a/src/test/java/org/spdx/tools/SpdxConverterTestV2.java
+++ b/src/test/java/org/spdx/tools/SpdxConverterTestV2.java
@@ -1,13 +1,13 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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,
@@ -15,7 +15,6 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
- * SPDX-License-Identifier: Apache-2.0
  */
 package org.spdx.tools;
 
@@ -47,8 +46,7 @@
 import junit.framework.TestCase;
 
 /**
- * @author gary
- *
+ * @author Gary O'Neall
  */
 public class SpdxConverterTestV2 extends TestCase {
 	
diff --git a/src/test/java/org/spdx/tools/SpdxConverterTestV3.java b/src/test/java/org/spdx/tools/SpdxConverterTestV3.java
index 608a23e..dadc29f 100644
--- a/src/test/java/org/spdx/tools/SpdxConverterTestV3.java
+++ b/src/test/java/org/spdx/tools/SpdxConverterTestV3.java
@@ -1,6 +1,7 @@
 /**
+ * SPDX-FileCopyrightText: Copyright (c) 2024 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * Copyright (c) 2024 Source Auditor Inc.
  */
 package org.spdx.tools;
 
@@ -32,8 +33,9 @@
 import junit.framework.TestCase;
 
 /**
- * @author gary
+ * Test SPDX converter v3
  *
+ * @author Gary O'Neall
  */
 public class SpdxConverterTestV3 extends TestCase {
 	
diff --git a/src/test/java/org/spdx/tools/VerifyTest.java b/src/test/java/org/spdx/tools/VerifyTest.java
index 7b2f627..f2d03fe 100644
--- a/src/test/java/org/spdx/tools/VerifyTest.java
+++ b/src/test/java/org/spdx/tools/VerifyTest.java
@@ -1,3 +1,8 @@
+/**
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.spdx.tools;
 
 import java.io.File;
diff --git a/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java b/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java
index 3d022e2..d32d63f 100644
--- a/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java
+++ b/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java
@@ -1,3 +1,8 @@
+/**
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
+ */
 package org.spdx.tools.schema;
 
 import java.io.File;
diff --git a/testResources/sourcefiles/AbstractFileCompareSheet.java b/testResources/sourcefiles/AbstractFileCompareSheet.java
index 2e481a4..f908977 100644
--- a/testResources/sourcefiles/AbstractFileCompareSheet.java
+++ b/testResources/sourcefiles/AbstractFileCompareSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.List;
@@ -35,7 +37,6 @@
  * The first column is the file path, second column indicates if all documents are equal,
  * columns 3 through N are for the values of the individual documents
  * @author Gary O'Neall
- *
  */
 public abstract class AbstractFileCompareSheet extends AbstractSheet {
 
diff --git a/testResources/sourcefiles/AbstractSheet.java b/testResources/sourcefiles/AbstractSheet.java
index 88a2be1..c302bbe 100644
--- a/testResources/sourcefiles/AbstractSheet.java
+++ b/testResources/sourcefiles/AbstractSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2011 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2011 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -38,7 +40,6 @@
 /**
  * Abstract class representing a workbook sheet used in storing structured data
  * @author Gary O'Neall
- *
  */
 public abstract class AbstractSheet {
 	
diff --git a/testResources/sourcefiles/CompareHelper.java b/testResources/sourcefiles/CompareHelper.java
index c90a146..ed3631e 100644
--- a/testResources/sourcefiles/CompareHelper.java
+++ b/testResources/sourcefiles/CompareHelper.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.net.URI;
@@ -40,7 +42,6 @@
 /**
  * Helper class for comparisons
  * @author Gary O'Neall
- *
  */
 public class CompareHelper {
 
diff --git a/testResources/sourcefiles/CreatorSheet.java b/testResources/sourcefiles/CreatorSheet.java
index 4f2bc7e..a9edca4 100644
--- a/testResources/sourcefiles/CreatorSheet.java
+++ b/testResources/sourcefiles/CreatorSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Arrays;
@@ -34,7 +36,6 @@
  * Column 1 describes if the creator is the same or different
  * Columns 2 through N are for creators in each of the documents
  * @author Gary O'Neall
- *
  */
 public class CreatorSheet extends AbstractSheet {
 	private static final int COL_WIDTH = 50;
diff --git a/testResources/sourcefiles/DocumentAnnotationSheet.java b/testResources/sourcefiles/DocumentAnnotationSheet.java
index 9b879cc..4eb1087 100644
--- a/testResources/sourcefiles/DocumentAnnotationSheet.java
+++ b/testResources/sourcefiles/DocumentAnnotationSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.Serializable;
@@ -34,7 +36,6 @@
 /**
  * Sheet for document level annotations
  * @author Gary O'Neall
- *
  */
 public class DocumentAnnotationSheet extends AbstractSheet {
 
diff --git a/testResources/sourcefiles/DocumentRelationshipSheet.java b/testResources/sourcefiles/DocumentRelationshipSheet.java
index 84c4da3..36116eb 100644
--- a/testResources/sourcefiles/DocumentRelationshipSheet.java
+++ b/testResources/sourcefiles/DocumentRelationshipSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.Serializable;
@@ -34,7 +36,6 @@
 /**
  * Sheet for document level relationships
  * @author Gary O'Neall
- *
  */
 public class DocumentRelationshipSheet extends AbstractSheet {
 
diff --git a/testResources/sourcefiles/DocumentSheet.java b/testResources/sourcefiles/DocumentSheet.java
index 0b9f378..ebe5b07 100644
--- a/testResources/sourcefiles/DocumentSheet.java
+++ b/testResources/sourcefiles/DocumentSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.List;
@@ -34,7 +36,6 @@
  * The first row summarizes which fields are different, the subsequent rows are the
  * specific date from each result
  * @author Gary O'Neall
- *
  */
 public class DocumentSheet extends AbstractSheet {
 
diff --git a/testResources/sourcefiles/ExternalReferencesSheet.java b/testResources/sourcefiles/ExternalReferencesSheet.java
index f5f3ecd..d9d8753 100644
--- a/testResources/sourcefiles/ExternalReferencesSheet.java
+++ b/testResources/sourcefiles/ExternalReferencesSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.Serializable;
@@ -35,7 +37,6 @@
 /**
  * Sheet that compares the external document references
  * @author Gary O'Neall
- *
  */
 public class ExternalReferencesSheet extends AbstractSheet {
 
diff --git a/testResources/sourcefiles/ExtractedLicenseSheet.java b/testResources/sourcefiles/ExtractedLicenseSheet.java
index d18f7fe..2437aac 100644
--- a/testResources/sourcefiles/ExtractedLicenseSheet.java
+++ b/testResources/sourcefiles/ExtractedLicenseSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.Serializable;
@@ -40,7 +42,6 @@
  * Column 1 contains the extracted text
  * Columns 2 through N contains the license information in the format licenseId [licenseName] {licenceUrls} (licenseComment)
  * @author Gary O'Neall
- *
  */
 public class ExtractedLicenseSheet extends AbstractSheet {
 
diff --git a/testResources/sourcefiles/FileAnnotationSheet.java b/testResources/sourcefiles/FileAnnotationSheet.java
index 1b1f3f7..86d3dab 100644
--- a/testResources/sourcefiles/FileAnnotationSheet.java
+++ b/testResources/sourcefiles/FileAnnotationSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -25,7 +27,6 @@
 /**
  * Sheet comparing file annotations
  * @author Gary O'Neall
- *
  */
 public class FileAnnotationSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileAttributionSheet.java b/testResources/sourcefiles/FileAttributionSheet.java
index 1850612..31be291 100644
--- a/testResources/sourcefiles/FileAttributionSheet.java
+++ b/testResources/sourcefiles/FileAttributionSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Collection;
@@ -28,7 +30,6 @@
 /**
  * Sheet with results for file contributor comparison results
  * @author Gary O'Neall
- *
  */
 public class FileAttributionSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileChecksumSheet.java b/testResources/sourcefiles/FileChecksumSheet.java
index 1f0f248..e046f72 100644
--- a/testResources/sourcefiles/FileChecksumSheet.java
+++ b/testResources/sourcefiles/FileChecksumSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Objects;
@@ -28,7 +30,6 @@
 /**
  * Sheet of comparison results for file checksums
  * @author Gary O'Neall
- *
  */
 public class FileChecksumSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileCommentSheet.java b/testResources/sourcefiles/FileCommentSheet.java
index 10597b8..45b98c6 100644
--- a/testResources/sourcefiles/FileCommentSheet.java
+++ b/testResources/sourcefiles/FileCommentSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -23,9 +25,8 @@
 import org.spdx.utility.compare.SpdxComparer;
 
 /**
- * Sheet continaing results for file comment comparison
+ * Sheet containing results for file comment comparison
  * @author Gary O'Neall
- *
  */
 public class FileCommentSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileConcludedSheet.java b/testResources/sourcefiles/FileConcludedSheet.java
index c1e96db..e6d5884 100644
--- a/testResources/sourcefiles/FileConcludedSheet.java
+++ b/testResources/sourcefiles/FileConcludedSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -23,10 +25,8 @@
 import org.spdx.utility.compare.SpdxCompareException;
 import org.spdx.utility.compare.SpdxComparer;
 
-
 /**
  * @author Source Auditor
- *
  */
 public class FileConcludedSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileContributorsSheet.java b/testResources/sourcefiles/FileContributorsSheet.java
index 165e812..00e8dba 100644
--- a/testResources/sourcefiles/FileContributorsSheet.java
+++ b/testResources/sourcefiles/FileContributorsSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Collection;
@@ -27,7 +29,6 @@
 /**
  * Sheet with results for file AttributionText comparison results
  * @author Gary O'Neall
- *
  */
 public class FileContributorsSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileCopyrightSheet.java b/testResources/sourcefiles/FileCopyrightSheet.java
index d63e014..0448492 100644
--- a/testResources/sourcefiles/FileCopyrightSheet.java
+++ b/testResources/sourcefiles/FileCopyrightSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -25,7 +27,6 @@
 /**
  * Sheet comparing file copyrights
  * @author Gary O'Neall
- *
  */
 public class FileCopyrightSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileLicenseCommentsSheet.java b/testResources/sourcefiles/FileLicenseCommentsSheet.java
index a34abe1..e75d38f 100644
--- a/testResources/sourcefiles/FileLicenseCommentsSheet.java
+++ b/testResources/sourcefiles/FileLicenseCommentsSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -26,7 +28,6 @@
 /**
  * Sheet of comparison results for file license comments
  * @author Gary O'Neall
- *
  */
 public class FileLicenseCommentsSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileLicenseInfoSheet.java b/testResources/sourcefiles/FileLicenseInfoSheet.java
index 7760f9c..d98e8ea 100644
--- a/testResources/sourcefiles/FileLicenseInfoSheet.java
+++ b/testResources/sourcefiles/FileLicenseInfoSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Collection;
@@ -30,7 +32,6 @@
 /**
  * Sheet of the comparison results for the file seen licenses
  * @author Gary O'Neall
- *
  */
 public class FileLicenseInfoSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileNoticeSheet.java b/testResources/sourcefiles/FileNoticeSheet.java
index 03d1652..20903b0 100644
--- a/testResources/sourcefiles/FileNoticeSheet.java
+++ b/testResources/sourcefiles/FileNoticeSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Optional;
@@ -27,7 +29,6 @@
 /**
  * Sheet for file notice comparison results
  * @author Gary O'Neall
- *
  */
 public class FileNoticeSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileRelationshipSheet.java b/testResources/sourcefiles/FileRelationshipSheet.java
index e424286..0ac675e 100644
--- a/testResources/sourcefiles/FileRelationshipSheet.java
+++ b/testResources/sourcefiles/FileRelationshipSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -25,7 +27,6 @@
 /**
  * Sheet comparing file relationships
  * @author Gary O'Neall
- *
  */
 public class FileRelationshipSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileSpdxIdSheet.java b/testResources/sourcefiles/FileSpdxIdSheet.java
index 1ca68bf..2e1602d 100644
--- a/testResources/sourcefiles/FileSpdxIdSheet.java
+++ b/testResources/sourcefiles/FileSpdxIdSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2015 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import org.apache.poi.ss.usermodel.Workbook;
@@ -22,8 +24,8 @@
 import org.spdx.utility.compare.SpdxComparer;
 
 /**
- * @author Gary
- *
+ * Sheet containing file SPDX ID
+ * @author Gary O'Neall
  */
 public class FileSpdxIdSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/FileTypeSheet.java b/testResources/sourcefiles/FileTypeSheet.java
index c6fb446..c12abb2 100644
--- a/testResources/sourcefiles/FileTypeSheet.java
+++ b/testResources/sourcefiles/FileTypeSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Arrays;
@@ -29,7 +31,6 @@
 /**
  * Sheet containing File Type
  * @author Gary O'Neall
- *
  */
 public class FileTypeSheet extends AbstractFileCompareSheet {
 
diff --git a/testResources/sourcefiles/MultiDocumentSpreadsheet.java b/testResources/sourcefiles/MultiDocumentSpreadsheet.java
index bba8104..ba33332 100644
--- a/testResources/sourcefiles/MultiDocumentSpreadsheet.java
+++ b/testResources/sourcefiles/MultiDocumentSpreadsheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.File;
@@ -59,7 +61,6 @@
  *   - verification: List of any verification errors
  *
  * @author Gary O'Neall
- *
  */
 public class MultiDocumentSpreadsheet {
 
diff --git a/testResources/sourcefiles/NormalizedFileNameComparator.java b/testResources/sourcefiles/NormalizedFileNameComparator.java
index e98437c..9a65cb3 100644
--- a/testResources/sourcefiles/NormalizedFileNameComparator.java
+++ b/testResources/sourcefiles/NormalizedFileNameComparator.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.io.Serializable;
@@ -25,7 +27,6 @@
  *  - File separator character is "/"
  *  - Must begin with "./"
  * @author Gary O'Neall
- *
  */
 public class NormalizedFileNameComparator implements Comparator<Optional<String>>, Serializable {
 
diff --git a/testResources/sourcefiles/PackageSheet.java b/testResources/sourcefiles/PackageSheet.java
index f6d3d0e..c99e9f8 100644
--- a/testResources/sourcefiles/PackageSheet.java
+++ b/testResources/sourcefiles/PackageSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Arrays;
@@ -43,7 +45,6 @@
  * Column1 is the document field name, column2 indicates if all docs are equal,
  * columns3 through columnN are document specific field values
  * @author Gary O'Neall
- *
  */
 public class PackageSheet extends AbstractSheet {
 
diff --git a/testResources/sourcefiles/SnippetSheet.java b/testResources/sourcefiles/SnippetSheet.java
index 0147ecb..e9a0c45 100644
--- a/testResources/sourcefiles/SnippetSheet.java
+++ b/testResources/sourcefiles/SnippetSheet.java
@@ -1,11 +1,13 @@
 /**
- * Copyright (c) 2016 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2016 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -13,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.Arrays;
@@ -38,9 +40,8 @@
 import org.spdx.utility.compare.SpdxSnippetComparer;
 
 /**
- * Comparsion sheet for SPDX Snippets
+ * Comparison sheet for SPDX Snippets
  * @author Gary O'Neall
- *
  */
 public class SnippetSheet extends AbstractSheet {
 
diff --git a/testResources/sourcefiles/VerificationSheet.java b/testResources/sourcefiles/VerificationSheet.java
index 235a998..d00cdbe 100644
--- a/testResources/sourcefiles/VerificationSheet.java
+++ b/testResources/sourcefiles/VerificationSheet.java
@@ -1,12 +1,14 @@
 /**
- * Copyright (c) 2013 Source Auditor Inc.
- * Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Source Auditor Inc.
+ * SPDX-FileCopyrightText: Copyright (c) 2013 Black Duck Software Inc.
+ * SPDX-FileType: SOURCE
+ * SPDX-License-Identifier: Apache-2.0
  *
  *   Licensed 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
+ *       https://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,
@@ -14,7 +16,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
-*/
+ */
 package org.spdx.tools.compare;
 
 import java.util.List;
@@ -30,7 +32,6 @@
  * Worksheet containing verification errors
  * Columns are package names, rows are individual verification errors
  * @author Gary O'Neall
- *
  */
 public class VerificationSheet extends AbstractSheet {
 
diff --git a/testResources/sourcefiles/package-info.java b/testResources/sourcefiles/package-info.java
index 9b41c4a..f5ad148 100644
--- a/testResources/sourcefiles/package-info.java
+++ b/testResources/sourcefiles/package-info.java
@@ -1,13 +1,13 @@
 /**
- * Copyright (c) 2020 Source Auditor Inc.
- *
+ * SPDX-FileCopyrightText: Copyright (c) 2020 Source Auditor Inc.
+ * SPDX-FileType: SOURCE
  * SPDX-License-Identifier: Apache-2.0
- * 
+ *
  *   Licensed 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
+ *       https://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,
@@ -15,12 +15,11 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  *
- * SPDX-License-Identifier: Apache-2.0
  */
+
 /**
- * @author Gary O'Neall
- * 
  * Classes related to the Compare SPDX Docs utilities
  *
+ * @author Gary O'Neall
  */
-package org.spdx.tools.compare;
\ No newline at end of file
+package org.spdx.tools.compare;