diff --git a/src/NuGetLicense/LicenseValidator/LicenseValidationResult.cs b/src/NuGetLicense/LicenseValidator/LicenseValidationResult.cs
index 80e0f88d..ccc0d739 100644
--- a/src/NuGetLicense/LicenseValidator/LicenseValidationResult.cs
+++ b/src/NuGetLicense/LicenseValidator/LicenseValidationResult.cs
@@ -20,5 +20,15 @@ public record LicenseValidationResult(string PackageId,
         public string? License { get; set; } = License;
         public string? LicenseUrl { get; set; } = LicenseUrl;
         public LicenseInformationOrigin LicenseInformationOrigin { get; set; } = LicenseInformationOrigin;
+
+        public override string ToString() => $"{nameof(LicenseValidationResult)} {{{nameof(PackageId)} = {PackageId}, " +
+                                                                                 $"{nameof(PackageVersion)} = {PackageVersion}, " +
+                                                                                 $"{nameof(PackageProjectUrl)} = {PackageProjectUrl}, " +
+                                                                                 $"{nameof(Copyright)} = {Copyright}, " +
+                                                                                 $"{nameof(Authors)} = {Authors}, " +
+                                                                                 $"{nameof(ValidationErrors)} = [{string.Join(",", ValidationErrors)}], " +
+                                                                                 $"{nameof(License)} = {License}, " +
+                                                                                 $"{nameof(LicenseUrl)} = {LicenseUrl}, " +
+                                                                                 $"{nameof(LicenseInformationOrigin)} = {LicenseInformationOrigin}}}";
     }
 }
diff --git a/src/NuGetLicense/LicenseValidator/LicenseValidator.cs b/src/NuGetLicense/LicenseValidator/LicenseValidator.cs
index 02115be9..bcf71f38 100644
--- a/src/NuGetLicense/LicenseValidator/LicenseValidator.cs
+++ b/src/NuGetLicense/LicenseValidator/LicenseValidator.cs
@@ -158,8 +158,8 @@ private async Task ValidateLicenseByMetadataAsync(IPackageMetadata info,
                     }
                 case LicenseType.File:
                     {
-                        string? matchedLicense = _fileLicenseMatcher.Match(info.LicenseMetadata.License);
-                        SpdxExpression? licenseExpression = matchedLicense is null ? null : SpdxExpressionParser.Parse(matchedLicense, _ => true, _ => true);
+                        string matchedLicense = _fileLicenseMatcher.Match(info.LicenseMetadata.License);
+                        SpdxExpression? licenseExpression = string.IsNullOrEmpty(matchedLicense) ? null : SpdxExpressionParser.Parse(matchedLicense, _ => true, _ => true);
                         if (IsValidLicenseExpression(licenseExpression))
                         {
                             await StoreLicenseAsync(info.LicenseMetadata.License, info.Identity, token);
@@ -173,7 +173,7 @@ private async Task ValidateLicenseByMetadataAsync(IPackageMetadata info,
                             AddOrUpdateLicense(result,
                                 info,
                                 LicenseInformationOrigin.File,
-                                new ValidationError("Cannot determine license from license file", context),
+                                new ValidationError("Unable to determine license from the given license file", context),
                                 info.LicenseMetadata.License);
                         }
                         break;
diff --git a/src/SPDXLicenseMatcher/FastLicenseMatcher.cs b/src/SPDXLicenseMatcher/FastLicenseMatcher.cs
index 5950d174..1173f511 100644
--- a/src/SPDXLicenseMatcher/FastLicenseMatcher.cs
+++ b/src/SPDXLicenseMatcher/FastLicenseMatcher.cs
@@ -45,7 +45,7 @@ public FastLicenseMatcher(IDictionary<string, ILicense> licenses)
 
             _templateInstructions = builder.ToImmutable();
         }
-        public string? Match(string licenseText) => string.Join(" OR ", FindMatchingLicenses(licenseText));
+        public string Match(string licenseText) => string.Join(" OR ", FindMatchingLicenses(licenseText));
 
         public IEnumerable<string> FindMatchingLicenses(string licenseText)
         {
diff --git a/src/SPDXLicenseMatcher/ILicenseMatcher.cs b/src/SPDXLicenseMatcher/ILicenseMatcher.cs
index 00b6cb4b..910e2fe7 100644
--- a/src/SPDXLicenseMatcher/ILicenseMatcher.cs
+++ b/src/SPDXLicenseMatcher/ILicenseMatcher.cs
@@ -5,6 +5,6 @@ namespace SPDXLicenseMatcher
 {
     public interface ILicenseMatcher
     {
-        string? Match(string licenseText);
+        string Match(string licenseText);
     }
 }
diff --git a/src/SPDXLicenseMatcher/LicenseMatcher.cs b/src/SPDXLicenseMatcher/LicenseMatcher.cs
index b1a85643..82cffe66 100644
--- a/src/SPDXLicenseMatcher/LicenseMatcher.cs
+++ b/src/SPDXLicenseMatcher/LicenseMatcher.cs
@@ -11,6 +11,6 @@ namespace SPDXLicenseMatcher
     /// </summary>
     public class LicenseMatcher : ILicenseMatcher
     {
-        public string? Match(string licenseText) => string.Join(" OR ", LicenseCompareHelper.GetMatchingLicenses(licenseText));
+        public string Match(string licenseText) => string.Join(" OR ", LicenseCompareHelper.GetMatchingLicenses(licenseText));
     }
 }
diff --git a/tests/NuGetLicense.Test/LicenseValidator/LicenseValidatorTest.cs b/tests/NuGetLicense.Test/LicenseValidator/LicenseValidatorTest.cs
index 3972246c..264dca78 100644
--- a/tests/NuGetLicense.Test/LicenseValidator/LicenseValidatorTest.cs
+++ b/tests/NuGetLicense.Test/LicenseValidator/LicenseValidatorTest.cs
@@ -135,8 +135,8 @@ public async Task ValidatingLicenses_Should_IgnorePackage_If_PackageNameMatchesE
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -145,7 +145,7 @@ public async Task ValidatingLicenses_Should_IgnorePackage_If_PackageNameMatchesE
                             null,
                             null,
                             LicenseInformationOrigin.Ignored)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -167,8 +167,8 @@ public async Task ValidatingLicenses_Should_NotIgnorePackage_If_PackageNameDoesN
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -177,7 +177,7 @@ public async Task ValidatingLicenses_Should_NotIgnorePackage_If_PackageNameDoesN
                             null,
                             null,
                             LicenseInformationOrigin.Expression)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -201,8 +201,8 @@ public async Task ValidatingLicenses_Should_IgnorePackage_If_IgnoreWildcardMatch
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -211,7 +211,7 @@ public async Task ValidatingLicenses_Should_IgnorePackage_If_IgnoreWildcardMatch
                             null,
                             null,
                             LicenseInformationOrigin.Ignored)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -235,8 +235,8 @@ public async Task ValidatingLicenses_Should_IgnorePackage_If_IgnoreWildcardMatch
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -245,7 +245,7 @@ public async Task ValidatingLicenses_Should_IgnorePackage_If_IgnoreWildcardMatch
                             null,
                             null,
                             LicenseInformationOrigin.Ignored)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -270,8 +270,8 @@ public async Task ValidatingLicenses_Should_IgnorePackage_If_IgnoreWildcardMatch
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -280,7 +280,7 @@ public async Task ValidatingLicenses_Should_IgnorePackage_If_IgnoreWildcardMatch
                             null,
                             null,
                             LicenseInformationOrigin.Ignored)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -301,8 +301,8 @@ public async Task ValidatingLicenses_Should_IgnorePackage_If_IgnoreWildcardMatch
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -311,7 +311,7 @@ public async Task ValidatingLicenses_Should_IgnorePackage_If_IgnoreWildcardMatch
                             null,
                             null,
                             LicenseInformationOrigin.Ignored)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -333,8 +333,8 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -343,7 +343,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                             null,
                             null,
                             LicenseInformationOrigin.Expression)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -367,8 +367,8 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
 
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -377,7 +377,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                             null,
                             null,
                             LicenseInformationOrigin.Expression)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -401,8 +401,8 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
 
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -411,7 +411,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                             null,
                             null,
                             LicenseInformationOrigin.Expression)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -458,8 +458,8 @@ public async Task ValidatingLicensesWithOverwriteLicenseInformation_Should_GiveC
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -468,7 +468,7 @@ public async Task ValidatingLicensesWithOverwriteLicenseInformation_Should_GiveC
                             null,
                             null,
                             LicenseInformationOrigin.Overwrite)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -499,8 +499,8 @@ public async Task ValidatingLicensesWithMatchingLicenseUrl_Should_GiveCorrectVal
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -509,7 +509,7 @@ public async Task ValidatingLicensesWithMatchingLicenseUrl_Should_GiveCorrectVal
                             null,
                             null,
                             LicenseInformationOrigin.Url)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -531,8 +531,8 @@ public async Task ValidatingLicensesWithMatchingLicenseUrl_Should_GiveCorrectVal
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -541,12 +541,12 @@ public async Task ValidatingLicensesWithMatchingLicenseUrl_Should_GiveCorrectVal
                             null,
                             null,
                             LicenseInformationOrigin.Url)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
         [Test]
-        public async Task ValidatingLicensesWithFileLicenseMetadata_Should_GiveCorrectResult()
+        public async Task ValidatingLicensesWithFileLicenseMetadata_Should_GiveCorrectResult_When_Matched()
         {
             var fixture = new Fixture();
             fixture.Customizations.Add(new NuGetVersionBuilder());
@@ -567,8 +567,8 @@ public async Task ValidatingLicensesWithFileLicenseMetadata_Should_GiveCorrectRe
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -578,7 +578,45 @@ public async Task ValidatingLicensesWithFileLicenseMetadata_Should_GiveCorrectRe
                             null,
                             LicenseInformationOrigin.File,
                             [])
-                    })
+                    ])
+                    .Using(new LicenseValidationResultValueEqualityComparer()));
+        }
+
+        [Test]
+        public async Task ValidatingLicensesWithFileLicenseMetadata_Should_GiveCorrectResult_When_Not_Matched()
+        {
+            var fixture = new Fixture();
+            fixture.Customizations.Add(new NuGetVersionBuilder());
+            string packageId = fixture.Create<string>();
+            INuGetVersion packageVersion = fixture.Create<INuGetVersion>();
+            string license = fixture.Create<string>();
+
+            _uut = new NuGetLicense.LicenseValidator.LicenseValidator(_licenseMapping,
+                Array.Empty<string>(),
+                _fileDownloader,
+                _licenseMatcher,
+                _ignoredLicenses);
+
+            IPackageMetadata package = SetupPackageWithLicenseInformationOfType(packageId, packageVersion, license, LicenseType.File);
+            _licenseMatcher.Match(license).Returns(string.Empty);
+
+            IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
+
+            Assert.That(result,
+                Is.EquivalentTo(
+                    [
+                        new LicenseValidationResult(packageId,
+                            packageVersion,
+                            _projectUrl.ToString(),
+                            license,
+                            null,
+                            null,
+                            null,
+                            LicenseInformationOrigin.File,
+                            [
+                                new ValidationError("Unable to determine license from the given license file", _context)
+                            ])
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -599,8 +637,8 @@ public async Task ValidatingLicensesWithoutLicenseInformation_Should_GiveCorrect
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -614,7 +652,7 @@ public async Task ValidatingLicensesWithoutLicenseInformation_Should_GiveCorrect
                                 new ValidationError("No license information found",
                                     _context)
                             })
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -630,8 +668,8 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -645,7 +683,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                                 new ValidationError($"License \"{license}\" not found in list of supported licenses",
                                     _context)
                             })
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -668,8 +706,8 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
 
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -683,7 +721,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                                 new ValidationError($"License \"{expression}\" not found in list of supported licenses",
                                     _context)
                             })
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -708,8 +746,8 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
 
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -723,7 +761,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                                 new ValidationError($"License \"{expression}\" not found in list of supported licenses",
                                     _context)
                             })
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -739,8 +777,8 @@ public async Task ValidatingLicensesWithOverwriteLicenseInformation_Should_GiveC
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -754,7 +792,7 @@ public async Task ValidatingLicensesWithOverwriteLicenseInformation_Should_GiveC
                                 new ValidationError($"License \"{license}\" not found in list of supported licenses",
                                     _context)
                             })
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -770,8 +808,8 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -780,7 +818,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                             null,
                             null,
                             LicenseInformationOrigin.Expression)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -797,8 +835,8 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
 
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -807,7 +845,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                             null,
                             null,
                             LicenseInformationOrigin.Expression)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -825,8 +863,8 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
 
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -835,7 +873,7 @@ public async Task ValidatingLicensesWithExpressionLicenseInformation_Should_Give
                             null,
                             null,
                             LicenseInformationOrigin.Expression)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -851,8 +889,8 @@ public async Task ValidatingLicensesWithOverwriteLicenseInformation_Should_GiveC
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -861,7 +899,7 @@ public async Task ValidatingLicensesWithOverwriteLicenseInformation_Should_GiveC
                             null,
                             null,
                             LicenseInformationOrigin.Overwrite)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -877,8 +915,8 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_GiveCorrec
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -892,7 +930,7 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_GiveCorrec
                                 new ValidationError($"License \"{urlMatch.Value}\" not found in list of supported licenses",
                                     _context)
                             })
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -963,8 +1001,8 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_GiveCorrec
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -973,7 +1011,7 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_GiveCorrec
                             null,
                             null,
                             LicenseInformationOrigin.Url)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -989,8 +1027,8 @@ public async Task ValidatingLicensesWithNotMatchingUrlInformation_Should_GiveCor
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -1004,7 +1042,7 @@ public async Task ValidatingLicensesWithNotMatchingUrlInformation_Should_GiveCor
                                 new ValidationError($"Cannot determine License type for url {licenseUrl}",
                                     _context)
                             })
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -1028,8 +1066,8 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_GiveCorrec
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -1038,7 +1076,7 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_GiveCorrec
                             null,
                             null,
                             LicenseInformationOrigin.Url)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -1062,8 +1100,8 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_GiveCorrec
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -1072,7 +1110,7 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_GiveCorrec
                             null,
                             null,
                             LicenseInformationOrigin.Url)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
         [Test]
@@ -1095,8 +1133,8 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_Create_Val
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -1110,7 +1148,7 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_Create_Val
                                 new ValidationError($"License \"{licenseExpression}\" not found in list of supported licenses",
                                     _context)
                             })
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -1134,8 +1172,8 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_Create_Val
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -1149,7 +1187,7 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_Create_Val
                                 new ValidationError($"License \"{licenseExpression}\" not found in list of supported licenses",
                                     _context)
                             })
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -1173,8 +1211,8 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_Create_Val
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -1188,7 +1226,7 @@ public async Task ValidatingLicensesWithMatchingUrlInformation_Should_Create_Val
                                 new ValidationError($"License \"{licenseExpression}\" not found in list of supported licenses",
                                     _context)
                             })
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -1210,8 +1248,8 @@ public async Task ValidatingLicenses_ShouldContainCopyright(
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -1220,7 +1258,7 @@ public async Task ValidatingLicenses_ShouldContainCopyright(
                             copyright,
                             null,
                             LicenseInformationOrigin.Ignored)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
 
@@ -1242,8 +1280,8 @@ public async Task ValidatingLicenses_ShouldContainAuthors(
             IEnumerable<LicenseValidationResult> result = await _uut.Validate(CreateInput(package, _context), _token.Token);
 
             Assert.That(result,
-                Is.EquivalentTo(new[]
-                    {
+                Is.EquivalentTo(
+                    [
                         new LicenseValidationResult(packageId,
                             packageVersion,
                             _projectUrl.ToString(),
@@ -1252,7 +1290,7 @@ public async Task ValidatingLicenses_ShouldContainAuthors(
                             null,
                             authors,
                             LicenseInformationOrigin.Ignored)
-                    })
+                    ])
                     .Using(new LicenseValidationResultValueEqualityComparer()));
         }
     }
diff --git a/tests/NuGetUtility.Test/Architecture/ArchitectureTest.cs b/tests/NuGetUtility.Test/Architecture/ArchitectureTest.cs
index 3d543680..1c64cc62 100644
--- a/tests/NuGetUtility.Test/Architecture/ArchitectureTest.cs
+++ b/tests/NuGetUtility.Test/Architecture/ArchitectureTest.cs
@@ -12,7 +12,7 @@ public abstract class ArchitectureTest
 
         protected ArchitectureTest()
         {
-            Types = Types.InAssemblies(new[] { Assembly.Load(AssemblyNames.NuGetUtility) });
+            Types = Types.InAssemblies([Assembly.Load(AssemblyNames.NuGetUtility)]);
         }
 
         internal static class AssemblyNames
diff --git a/tests/SPDXLicenseMatcher.Test/LicenseMatcherTest.cs b/tests/SPDXLicenseMatcher.Test/LicenseMatcherTest.cs
index 4c5a3c8b..c4627eb6 100644
--- a/tests/SPDXLicenseMatcher.Test/LicenseMatcherTest.cs
+++ b/tests/SPDXLicenseMatcher.Test/LicenseMatcherTest.cs
@@ -10,20 +10,23 @@ public record Case(string Identifier, string Content);
         public class AllSpdxLicensesFastLicenseMatcher : ILicenseMatcher
         {
             private readonly FastLicenseMatcher _fastLicenseMatcher = new FastLicenseMatcher(Spdx.Licenses.SpdxLicenseStore.Licenses);
-            public string? Match(string licenseText) => _fastLicenseMatcher.Match(licenseText);
+            public string Match(string licenseText) => _fastLicenseMatcher.Match(licenseText);
         }
 
         [ClassDataSource<AllSpdxLicensesFastLicenseMatcher>(Shared = SharedType.PerTestSession)]
         public required AllSpdxLicensesFastLicenseMatcher FastlicenseMatcher { get; init; }
 
-        public static class LicenseMatcherTestSource
+#pragma warning disable S101 // Types should be named in PascalCase
+        public static class SPDXLicensesTestSource
+#pragma warning restore S101 // Types should be named in PascalCase
         {
-            private static readonly int s_prefixLength = "SPDXLicenseMatcher.Test.TestLicenses.".Length;
+            private const string PREFIX = "SPDXLicenseMatcher.Test.SPDXLicenses.";
+            private static readonly int s_prefixLength = PREFIX.Length;
             private static readonly int s_postfixLength = ".txt".Length;
             public static IEnumerable<Func<Case>> GetCases()
             {
                 var executingAssembly = System.Reflection.Assembly.GetExecutingAssembly();
-                foreach (string name in executingAssembly.GetManifestResourceNames().Where(n => n.EndsWith("txt")))
+                foreach (string name in executingAssembly.GetManifestResourceNames().Where(n => n.StartsWith(PREFIX)).Where(n => n.EndsWith("txt")))
                 {
                     string expectedIdentifier = name.Substring(s_prefixLength, name.Length - s_postfixLength - s_prefixLength);
                     using var reader = new StreamReader(executingAssembly.GetManifestResourceStream(name)!);
@@ -32,11 +35,26 @@ public static IEnumerable<Func<Case>> GetCases()
             }
         }
 
+#pragma warning disable S101 // Types should be named in PascalCase
+        public static class NonSPDXLicensesTestSource
+#pragma warning restore S101 // Types should be named in PascalCase
+        {
+            private const string PREFIX = "SPDXLicenseMatcher.Test.NonSpdxTestLicenses.";
+            public static IEnumerable<Func<string>> GetCases()
+            {
+                var executingAssembly = System.Reflection.Assembly.GetExecutingAssembly();
+                foreach (string name in executingAssembly.GetManifestResourceNames().Where(n => n.StartsWith(PREFIX)).Where(n => n.EndsWith("txt")))
+                {
+                    using var reader = new StreamReader(executingAssembly.GetManifestResourceStream(name)!);
+                    yield return () => reader.ReadToEnd();
+                }
+            }
+        }
 
 #pragma warning disable S125 // Sections of code should not be commented out
         /*
                 [Test]
-                [MethodDataSource(typeof(LicenseMatcherTestSource), nameof(LicenseMatcherTestSource.GetCases))]
+                [MethodDataSource(typeof(SPDXLicensesTestSource), nameof(SPDXLicensesTestSource.GetCases))]
                 [Skip("these tests run very slow")]
                 public async Task License_Matcher_Should_Pick_Correct_License(Case @case)
                 {
@@ -48,10 +66,17 @@ public async Task License_Matcher_Should_Pick_Correct_License(Case @case)
 #pragma warning restore S125 // Sections of code should not be commented out
 
         [Test]
-        [MethodDataSource(typeof(LicenseMatcherTestSource), nameof(LicenseMatcherTestSource.GetCases))]
+        [MethodDataSource(typeof(SPDXLicensesTestSource), nameof(SPDXLicensesTestSource.GetCases))]
         public async Task Fast_License_Matcher_Should_Pick_Correct_License(Case @case)
         {
             await Assert.That(FastlicenseMatcher.Match(@case.Content)).Contains(@case.Identifier);
         }
+
+        [Test]
+        [MethodDataSource(typeof(NonSPDXLicensesTestSource), nameof(NonSPDXLicensesTestSource.GetCases))]
+        public async Task Fast_License_Matcher_Should_Not_Pick_A_License(string licenseText)
+        {
+            await Assert.That(FastlicenseMatcher.Match(licenseText)).IsEmpty();
+        }
     }
 }
diff --git a/tests/SPDXLicenseMatcher.Test/NonSpdxTestLicenses/DummyTestLicense.txt b/tests/SPDXLicenseMatcher.Test/NonSpdxTestLicenses/DummyTestLicense.txt
new file mode 100644
index 00000000..e93a8d35
--- /dev/null
+++ b/tests/SPDXLicenseMatcher.Test/NonSpdxTestLicenses/DummyTestLicense.txt
@@ -0,0 +1 @@
+This is just a dummy test license that matches nothing.
diff --git a/tests/SPDXLicenseMatcher.Test/SPDXLicenseMatcher.Test.csproj b/tests/SPDXLicenseMatcher.Test/SPDXLicenseMatcher.Test.csproj
index 99ac1036..bdb7088f 100644
--- a/tests/SPDXLicenseMatcher.Test/SPDXLicenseMatcher.Test.csproj
+++ b/tests/SPDXLicenseMatcher.Test/SPDXLicenseMatcher.Test.csproj
@@ -28,6 +28,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="TestLicenses\*" />
+    <EmbeddedResource Include="SPDXLicenses\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="NonSpdxTestLicenses\*" />
   </ItemGroup>
 </Project>
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/0BSD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/0BSD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/0BSD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/0BSD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/3D-Slicer-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/3D-Slicer-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/3D-Slicer-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/3D-Slicer-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AAL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AAL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AAL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AAL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ADSL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ADSL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ADSL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ADSL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AFL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AFL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AFL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AFL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AFL-1.2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AFL-1.2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AFL-1.2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AFL-1.2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AFL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AFL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AFL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AFL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AFL-2.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AFL-2.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AFL-2.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AFL-2.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AFL-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AFL-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AFL-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AFL-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AGPL-1.0-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AGPL-1.0-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AGPL-1.0-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AGPL-1.0-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AGPL-3.0-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AGPL-3.0-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AGPL-3.0-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AGPL-3.0-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AMD-newlib.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AMD-newlib.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AMD-newlib.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AMD-newlib.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AMDPLPA.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AMDPLPA.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AMDPLPA.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AMDPLPA.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AML-glslang.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AML-glslang.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AML-glslang.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AML-glslang.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AML.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AML.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AML.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AML.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AMPAS.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AMPAS.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AMPAS.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AMPAS.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ANTLR-PD-fallback.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ANTLR-PD-fallback.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ANTLR-PD-fallback.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ANTLR-PD-fallback.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ANTLR-PD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ANTLR-PD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ANTLR-PD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ANTLR-PD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/APAFML.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/APAFML.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/APAFML.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/APAFML.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/APL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/APL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/APL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/APL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/APSL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/APSL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/APSL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/APSL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/APSL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/APSL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/APSL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/APSL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/APSL-1.2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/APSL-1.2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/APSL-1.2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/APSL-1.2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/APSL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/APSL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/APSL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/APSL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ASWF-Digital-Assets-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ASWF-Digital-Assets-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ASWF-Digital-Assets-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ASWF-Digital-Assets-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ASWF-Digital-Assets-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ASWF-Digital-Assets-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ASWF-Digital-Assets-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ASWF-Digital-Assets-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Abstyles.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Abstyles.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Abstyles.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Abstyles.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/AdaCore-doc.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/AdaCore-doc.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/AdaCore-doc.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/AdaCore-doc.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Adobe-2006.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Adobe-2006.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Adobe-2006.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Adobe-2006.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Adobe-Display-PostScript.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Adobe-Display-PostScript.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Adobe-Display-PostScript.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Adobe-Display-PostScript.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Adobe-Glyph.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Adobe-Glyph.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Adobe-Glyph.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Adobe-Glyph.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Adobe-Utopia.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Adobe-Utopia.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Adobe-Utopia.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Adobe-Utopia.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Afmparse.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Afmparse.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Afmparse.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Afmparse.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Aladdin.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Aladdin.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Aladdin.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Aladdin.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Apache-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Apache-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Apache-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Apache-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Apache-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Apache-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Apache-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Apache-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Apache-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Apache-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Apache-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Apache-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/App-s2p.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/App-s2p.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/App-s2p.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/App-s2p.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Arphic-1999.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Arphic-1999.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Arphic-1999.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Arphic-1999.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Artistic-1.0-Perl.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Artistic-1.0-Perl.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Artistic-1.0-Perl.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Artistic-1.0-Perl.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Artistic-1.0-cl8.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Artistic-1.0-cl8.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Artistic-1.0-cl8.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Artistic-1.0-cl8.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Artistic-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Artistic-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Artistic-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Artistic-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Artistic-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Artistic-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Artistic-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Artistic-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Artistic-dist.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Artistic-dist.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Artistic-dist.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Artistic-dist.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Aspell-RU.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Aspell-RU.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Aspell-RU.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Aspell-RU.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-1-Clause.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-1-Clause.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-1-Clause.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-1-Clause.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause-Darwin.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause-Darwin.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause-Darwin.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause-Darwin.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause-Patent.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause-Patent.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause-Patent.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause-Patent.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause-Views.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause-Views.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause-Views.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause-Views.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause-first-lines.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause-first-lines.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause-first-lines.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause-first-lines.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause-pkgconf-disclaimer.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause-pkgconf-disclaimer.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause-pkgconf-disclaimer.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause-pkgconf-disclaimer.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-2-Clause.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-2-Clause.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-Attribution.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-Attribution.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-Attribution.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-Attribution.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-Clear.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-Clear.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-Clear.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-Clear.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-HP.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-HP.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-HP.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-HP.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-LBNL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-LBNL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-LBNL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-LBNL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-Modification.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-Modification.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-Modification.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-Modification.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-No-Military-License.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-No-Military-License.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-No-Military-License.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-No-Military-License.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-No-Nuclear-License-2014.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-No-Nuclear-License-2014.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-No-Nuclear-License-2014.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-No-Nuclear-License-2014.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-No-Nuclear-License.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-No-Nuclear-License.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-No-Nuclear-License.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-No-Nuclear-License.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-No-Nuclear-Warranty.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-No-Nuclear-Warranty.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-No-Nuclear-Warranty.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-No-Nuclear-Warranty.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-Open-MPI.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-Open-MPI.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-Open-MPI.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-Open-MPI.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-Sun.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-Sun.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-Sun.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-Sun.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-acpica.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-acpica.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-acpica.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-acpica.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-flex.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-flex.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause-flex.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause-flex.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-3-Clause.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-3-Clause.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-4-Clause-Shortened.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-4-Clause-Shortened.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-4-Clause-Shortened.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-4-Clause-Shortened.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-4-Clause-UC.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-4-Clause-UC.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-4-Clause-UC.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-4-Clause-UC.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-4-Clause.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-4-Clause.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-4-Clause.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-4-Clause.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-4.3RENO.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-4.3RENO.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-4.3RENO.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-4.3RENO.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-4.3TAHOE.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-4.3TAHOE.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-4.3TAHOE.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-4.3TAHOE.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Advertising-Acknowledgement.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Advertising-Acknowledgement.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Advertising-Acknowledgement.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Advertising-Acknowledgement.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Attribution-HPND-disclaimer.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Attribution-HPND-disclaimer.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Attribution-HPND-disclaimer.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Attribution-HPND-disclaimer.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Inferno-Nettverk.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Inferno-Nettverk.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Inferno-Nettverk.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Inferno-Nettverk.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Protection.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Protection.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Protection.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Protection.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Source-Code.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Source-Code.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Source-Code.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Source-Code.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Source-beginning-file.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Source-beginning-file.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Source-beginning-file.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Source-beginning-file.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Systemics-W3Works.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Systemics-W3Works.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Systemics-W3Works.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Systemics-W3Works.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Systemics.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Systemics.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSD-Systemics.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSD-Systemics.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BSL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BSL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BSL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BUSL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BUSL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BUSL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BUSL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Baekmuk.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Baekmuk.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Baekmuk.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Baekmuk.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Bahyph.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Bahyph.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Bahyph.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Bahyph.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Barr.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Barr.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Barr.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Barr.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Beerware.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Beerware.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Beerware.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Beerware.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BitTorrent-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BitTorrent-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BitTorrent-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BitTorrent-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BitTorrent-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BitTorrent-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BitTorrent-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BitTorrent-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Bitstream-Charter.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Bitstream-Charter.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Bitstream-Charter.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Bitstream-Charter.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Bitstream-Vera.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Bitstream-Vera.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Bitstream-Vera.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Bitstream-Vera.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/BlueOak-1.0.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/BlueOak-1.0.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/BlueOak-1.0.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/BlueOak-1.0.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Boehm-GC-without-fee.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Boehm-GC-without-fee.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Boehm-GC-without-fee.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Boehm-GC-without-fee.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Boehm-GC.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Boehm-GC.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Boehm-GC.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Boehm-GC.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Borceux.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Borceux.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Borceux.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Borceux.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Brian-Gladman-2-Clause.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Brian-Gladman-2-Clause.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Brian-Gladman-2-Clause.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Brian-Gladman-2-Clause.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Brian-Gladman-3-Clause.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Brian-Gladman-3-Clause.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Brian-Gladman-3-Clause.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Brian-Gladman-3-Clause.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/C-UDA-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/C-UDA-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/C-UDA-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/C-UDA-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CAL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CAL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CAL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CAL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CATOSL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CATOSL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CATOSL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CATOSL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-2.5-AU.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-2.5-AU.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-2.5-AU.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-2.5-AU.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-2.5.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-2.5.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-2.5.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-2.5.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-AT.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-AT.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-AT.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-AT.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-AU.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-AU.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-AU.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-AU.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-DE.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-DE.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-DE.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-DE.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-IGO.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-IGO.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-IGO.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-IGO.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-NL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-NL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-NL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-NL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-US.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-US.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0-US.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0-US.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-4.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-4.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-4.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-4.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-2.5.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-2.5.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-2.5.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-2.5.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-3.0-DE.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-3.0-DE.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-3.0-DE.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-3.0-DE.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-4.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-4.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-4.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-4.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-2.5.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-2.5.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-2.5.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-2.5.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-3.0-DE.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-3.0-DE.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-3.0-DE.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-3.0-DE.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-3.0-IGO.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-3.0-IGO.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-3.0-IGO.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-3.0-IGO.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-4.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-4.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-ND-4.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-ND-4.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-2.0-DE.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-2.0-DE.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-2.0-DE.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-2.0-DE.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-2.0-FR.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-2.0-FR.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-2.0-FR.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-2.0-FR.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-2.0-UK.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-2.0-UK.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-2.0-UK.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-2.0-UK.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-2.5.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-2.5.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-2.5.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-2.5.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-3.0-DE.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-3.0-DE.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-3.0-DE.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-3.0-DE.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-3.0-IGO.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-3.0-IGO.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-3.0-IGO.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-3.0-IGO.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-4.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-4.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-NC-SA-4.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-NC-SA-4.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-2.5.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-2.5.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-2.5.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-2.5.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-3.0-DE.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-3.0-DE.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-3.0-DE.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-3.0-DE.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-4.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-4.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-ND-4.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-ND-4.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-2.0-UK.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-2.0-UK.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-2.0-UK.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-2.0-UK.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-2.1-JP.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-2.1-JP.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-2.1-JP.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-2.1-JP.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-2.5.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-2.5.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-2.5.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-2.5.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-3.0-AT.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-3.0-AT.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-3.0-AT.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-3.0-AT.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-3.0-DE.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-3.0-DE.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-3.0-DE.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-3.0-DE.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-3.0-IGO.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-3.0-IGO.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-3.0-IGO.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-3.0-IGO.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-4.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-4.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-BY-SA-4.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-BY-SA-4.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-PDDC.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-PDDC.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-PDDC.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-PDDC.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-PDM-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-PDM-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-PDM-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-PDM-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC-SA-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-SA-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC-SA-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC-SA-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CC0-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC0-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CC0-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CC0-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CDDL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDDL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CDDL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDDL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CDDL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDDL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CDDL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDDL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CDL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CDL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CDLA-Permissive-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDLA-Permissive-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CDLA-Permissive-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDLA-Permissive-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CDLA-Permissive-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDLA-Permissive-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CDLA-Permissive-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDLA-Permissive-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CDLA-Sharing-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDLA-Sharing-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CDLA-Sharing-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CDLA-Sharing-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-2.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-2.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-2.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-2.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-B.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-B.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-B.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-B.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-C.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-C.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CECILL-C.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CECILL-C.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CERN-OHL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CERN-OHL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CERN-OHL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CERN-OHL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CERN-OHL-1.2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CERN-OHL-1.2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CERN-OHL-1.2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CERN-OHL-1.2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CERN-OHL-P-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CERN-OHL-P-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CERN-OHL-P-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CERN-OHL-P-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CERN-OHL-S-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CERN-OHL-S-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CERN-OHL-S-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CERN-OHL-S-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CERN-OHL-W-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CERN-OHL-W-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CERN-OHL-W-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CERN-OHL-W-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CFITSIO.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CFITSIO.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CFITSIO.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CFITSIO.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CMU-Mach-nodoc.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CMU-Mach-nodoc.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CMU-Mach-nodoc.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CMU-Mach-nodoc.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CMU-Mach.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CMU-Mach.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CMU-Mach.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CMU-Mach.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CNRI-Jython.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CNRI-Jython.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CNRI-Jython.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CNRI-Jython.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CNRI-Python-GPL-Compatible.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CNRI-Python-GPL-Compatible.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CNRI-Python-GPL-Compatible.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CNRI-Python-GPL-Compatible.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CNRI-Python.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CNRI-Python.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CNRI-Python.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CNRI-Python.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/COIL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/COIL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/COIL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/COIL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CPAL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CPAL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CPAL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CPAL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CPOL-1.02.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CPOL-1.02.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CPOL-1.02.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CPOL-1.02.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CUA-OPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CUA-OPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CUA-OPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CUA-OPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Caldera-no-preamble.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Caldera-no-preamble.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Caldera-no-preamble.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Caldera-no-preamble.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Caldera.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Caldera.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Caldera.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Caldera.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Catharon.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Catharon.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Catharon.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Catharon.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ClArtistic.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ClArtistic.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ClArtistic.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ClArtistic.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Clips.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Clips.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Clips.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Clips.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Community-Spec-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Community-Spec-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Community-Spec-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Community-Spec-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Condor-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Condor-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Condor-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Condor-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Cornell-Lossless-JPEG.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Cornell-Lossless-JPEG.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Cornell-Lossless-JPEG.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Cornell-Lossless-JPEG.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Cronyx.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Cronyx.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Cronyx.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Cronyx.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Crossword.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Crossword.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Crossword.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Crossword.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CryptoSwift.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CryptoSwift.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CryptoSwift.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CryptoSwift.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/CrystalStacker.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/CrystalStacker.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/CrystalStacker.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/CrystalStacker.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Cube.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Cube.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Cube.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Cube.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/D-FSL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/D-FSL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/D-FSL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/D-FSL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DEC-3-Clause.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DEC-3-Clause.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DEC-3-Clause.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DEC-3-Clause.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DL-DE-BY-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DL-DE-BY-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DL-DE-BY-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DL-DE-BY-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DL-DE-ZERO-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DL-DE-ZERO-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DL-DE-ZERO-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DL-DE-ZERO-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DOC.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DOC.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DOC.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DOC.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DRL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DRL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DRL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DRL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DRL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DRL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DRL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DRL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DSDP.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DSDP.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DSDP.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DSDP.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DocBook-DTD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DocBook-DTD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DocBook-DTD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DocBook-DTD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DocBook-Schema.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DocBook-Schema.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DocBook-Schema.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DocBook-Schema.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DocBook-Stylesheet.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DocBook-Stylesheet.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DocBook-Stylesheet.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DocBook-Stylesheet.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/DocBook-XML.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/DocBook-XML.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/DocBook-XML.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/DocBook-XML.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Dotseqn.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Dotseqn.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Dotseqn.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Dotseqn.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ECL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ECL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ECL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ECL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ECL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ECL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ECL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ECL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/EFL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/EFL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/EFL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/EFL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/EFL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/EFL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/EFL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/EFL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/EPICS.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/EPICS.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/EPICS.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/EPICS.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/EPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/EPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/EPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/EPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/EPL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/EPL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/EPL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/EPL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/EUDatagrid.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/EUDatagrid.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/EUDatagrid.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/EUDatagrid.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/EUPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/EUPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/EUPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/EUPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/EUPL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/EUPL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/EUPL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/EUPL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/EUPL-1.2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/EUPL-1.2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/EUPL-1.2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/EUPL-1.2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Elastic-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Elastic-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Elastic-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Elastic-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Entessa.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Entessa.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Entessa.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Entessa.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ErlPL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ErlPL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ErlPL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ErlPL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Eurosym.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Eurosym.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Eurosym.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Eurosym.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FBM.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FBM.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FBM.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FBM.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FDK-AAC.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FDK-AAC.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FDK-AAC.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FDK-AAC.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FSFAP-no-warranty-disclaimer.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFAP-no-warranty-disclaimer.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FSFAP-no-warranty-disclaimer.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFAP-no-warranty-disclaimer.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FSFAP.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFAP.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FSFAP.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFAP.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FSFUL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFUL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FSFUL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFUL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FSFULLR.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFULLR.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FSFULLR.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFULLR.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FSFULLRSD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFULLRSD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FSFULLRSD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFULLRSD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FSFULLRWD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFULLRWD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FSFULLRWD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSFULLRWD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FSL-1.1-ALv2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSL-1.1-ALv2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FSL-1.1-ALv2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSL-1.1-ALv2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FSL-1.1-MIT.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSL-1.1-MIT.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FSL-1.1-MIT.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FSL-1.1-MIT.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FTL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FTL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FTL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FTL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Fair.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Fair.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Fair.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Fair.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Ferguson-Twofish.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Ferguson-Twofish.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Ferguson-Twofish.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Ferguson-Twofish.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Frameworx-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Frameworx-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Frameworx-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Frameworx-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FreeBSD-DOC.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FreeBSD-DOC.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FreeBSD-DOC.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FreeBSD-DOC.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/FreeImage.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/FreeImage.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/FreeImage.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/FreeImage.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Furuseth.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Furuseth.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Furuseth.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Furuseth.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GCR-docs.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GCR-docs.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GCR-docs.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GCR-docs.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-invariants-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-invariants-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-invariants-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-invariants-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-invariants-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-invariants-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-invariants-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-invariants-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-no-invariants-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-no-invariants-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-no-invariants-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-no-invariants-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-no-invariants-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-no-invariants-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-no-invariants-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-no-invariants-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.1-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.1-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-invariants-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-invariants-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-invariants-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-invariants-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-invariants-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-invariants-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-invariants-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-invariants-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-no-invariants-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-no-invariants-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-no-invariants-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-no-invariants-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-no-invariants-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-no-invariants-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-no-invariants-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-no-invariants-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.2-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.2-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-invariants-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-invariants-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-invariants-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-invariants-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-invariants-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-invariants-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-invariants-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-invariants-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-no-invariants-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-no-invariants-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-no-invariants-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-no-invariants-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-no-invariants-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-no-invariants-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-no-invariants-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-no-invariants-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GFDL-1.3-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GFDL-1.3-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GL2PS.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GL2PS.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GL2PS.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GL2PS.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GLWTPL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GLWTPL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GLWTPL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GLWTPL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-1.0-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-1.0-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-1.0-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-1.0-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-1.0-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-1.0-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-1.0-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-1.0-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-2.0-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-2.0-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-2.0-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-2.0-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-2.0-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-2.0-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-2.0-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-2.0-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-3.0-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-3.0-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-3.0-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-3.0-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-3.0-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-3.0-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/GPL-3.0-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/GPL-3.0-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Game-Programming-Gems.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Game-Programming-Gems.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Game-Programming-Gems.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Game-Programming-Gems.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Giftware.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Giftware.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Giftware.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Giftware.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Glide.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Glide.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Glide.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Glide.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Glulxe.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Glulxe.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Glulxe.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Glulxe.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Graphics-Gems.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Graphics-Gems.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Graphics-Gems.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Graphics-Gems.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Gutmann.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Gutmann.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Gutmann.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Gutmann.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HDF5.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HDF5.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HDF5.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HDF5.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HIDAPI.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HIDAPI.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HIDAPI.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HIDAPI.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HP-1986.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HP-1986.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HP-1986.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HP-1986.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HP-1989.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HP-1989.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HP-1989.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HP-1989.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-DEC.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-DEC.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-DEC.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-DEC.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Fenneberg-Livingston.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Fenneberg-Livingston.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Fenneberg-Livingston.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Fenneberg-Livingston.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-INRIA-IMAG.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-INRIA-IMAG.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-INRIA-IMAG.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-INRIA-IMAG.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Intel.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Intel.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Intel.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Intel.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Kevlin-Henney.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Kevlin-Henney.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Kevlin-Henney.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Kevlin-Henney.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-MIT-disclaimer.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-MIT-disclaimer.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-MIT-disclaimer.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-MIT-disclaimer.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Markus-Kuhn.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Markus-Kuhn.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Markus-Kuhn.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Markus-Kuhn.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Netrek.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Netrek.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Netrek.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Netrek.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Pbmplus.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Pbmplus.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-Pbmplus.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-Pbmplus.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-UC-export-US.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-UC-export-US.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-UC-export-US.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-UC-export-US.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-UC.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-UC.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-UC.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-UC.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-doc-sell.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-doc-sell.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-doc-sell.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-doc-sell.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-doc.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-doc.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-doc.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-doc.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-export-US-acknowledgement.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-export-US-acknowledgement.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-export-US-acknowledgement.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-export-US-acknowledgement.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-export-US-modify.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-export-US-modify.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-export-US-modify.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-export-US-modify.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-export-US.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-export-US.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-export-US.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-export-US.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-export2-US.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-export2-US.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-export2-US.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-export2-US.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-merchantability-variant.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-merchantability-variant.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-merchantability-variant.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-merchantability-variant.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-sell-MIT-disclaimer-xserver.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-sell-MIT-disclaimer-xserver.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-sell-MIT-disclaimer-xserver.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-sell-MIT-disclaimer-xserver.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-sell-regexpr.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-sell-regexpr.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-sell-regexpr.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-sell-regexpr.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-sell-variant-MIT-disclaimer-rev.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-sell-variant-MIT-disclaimer-rev.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-sell-variant-MIT-disclaimer-rev.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-sell-variant-MIT-disclaimer-rev.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-sell-variant-MIT-disclaimer.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-sell-variant-MIT-disclaimer.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-sell-variant-MIT-disclaimer.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-sell-variant-MIT-disclaimer.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-sell-variant.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-sell-variant.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND-sell-variant.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND-sell-variant.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HPND.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HPND.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HPND.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HTMLTIDY.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HTMLTIDY.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HTMLTIDY.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HTMLTIDY.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/HaskellReport.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/HaskellReport.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/HaskellReport.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/HaskellReport.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Hippocratic-2.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Hippocratic-2.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Hippocratic-2.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Hippocratic-2.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/IBM-pibs.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/IBM-pibs.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/IBM-pibs.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/IBM-pibs.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ICU.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ICU.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ICU.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ICU.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/IEC-Code-Components-EULA.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/IEC-Code-Components-EULA.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/IEC-Code-Components-EULA.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/IEC-Code-Components-EULA.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/IJG-short.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/IJG-short.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/IJG-short.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/IJG-short.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/IJG.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/IJG.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/IJG.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/IJG.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/IPA.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/IPA.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/IPA.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/IPA.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/IPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/IPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/IPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/IPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ISC-Veillard.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ISC-Veillard.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ISC-Veillard.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ISC-Veillard.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ISC.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ISC.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ISC.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ISC.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ImageMagick.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ImageMagick.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ImageMagick.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ImageMagick.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Imlib2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Imlib2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Imlib2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Imlib2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Info-ZIP.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Info-ZIP.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Info-ZIP.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Info-ZIP.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Inner-Net-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Inner-Net-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Inner-Net-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Inner-Net-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/InnoSetup.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/InnoSetup.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/InnoSetup.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/InnoSetup.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Intel-ACPI.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Intel-ACPI.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Intel-ACPI.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Intel-ACPI.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Intel.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Intel.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Intel.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Intel.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Interbase-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Interbase-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Interbase-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Interbase-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/JPL-image.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/JPL-image.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/JPL-image.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/JPL-image.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/JPNIC.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/JPNIC.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/JPNIC.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/JPNIC.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/JSON.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/JSON.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/JSON.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/JSON.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Jam.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Jam.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Jam.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Jam.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/JasPer-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/JasPer-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/JasPer-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/JasPer-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Kastrup.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Kastrup.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Kastrup.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Kastrup.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Kazlib.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Kazlib.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Kazlib.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Kazlib.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Knuth-CTAN.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Knuth-CTAN.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Knuth-CTAN.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Knuth-CTAN.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LAL-1.2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LAL-1.2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LAL-1.2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LAL-1.2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LAL-1.3.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LAL-1.3.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LAL-1.3.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LAL-1.3.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-2.0-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-2.0-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-2.0-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-2.0-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-2.0-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-2.0-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-2.0-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-2.0-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-2.1-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-2.1-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-2.1-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-2.1-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-2.1-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-2.1-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-2.1-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-2.1-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-3.0-only.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-3.0-only.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-3.0-only.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-3.0-only.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-3.0-or-later.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-3.0-or-later.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LGPL-3.0-or-later.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPL-3.0-or-later.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LGPLLR.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPLLR.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LGPLLR.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LGPLLR.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LOOP.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LOOP.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LOOP.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LOOP.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LPD-document.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPD-document.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LPD-document.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPD-document.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LPL-1.02.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPL-1.02.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LPL-1.02.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPL-1.02.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LPPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LPPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LPPL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPPL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LPPL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPPL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LPPL-1.2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPPL-1.2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LPPL-1.2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPPL-1.2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LPPL-1.3a.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPPL-1.3a.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LPPL-1.3a.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPPL-1.3a.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LPPL-1.3c.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPPL-1.3c.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LPPL-1.3c.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LPPL-1.3c.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LZMA-SDK-9.11-to-9.20.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LZMA-SDK-9.11-to-9.20.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LZMA-SDK-9.11-to-9.20.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LZMA-SDK-9.11-to-9.20.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LZMA-SDK-9.22.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LZMA-SDK-9.22.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LZMA-SDK-9.22.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LZMA-SDK-9.22.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Latex2e-translated-notice.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Latex2e-translated-notice.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Latex2e-translated-notice.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Latex2e-translated-notice.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Latex2e.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Latex2e.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Latex2e.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Latex2e.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Leptonica.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Leptonica.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Leptonica.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Leptonica.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LiLiQ-P-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LiLiQ-P-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LiLiQ-P-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LiLiQ-P-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LiLiQ-R-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LiLiQ-R-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LiLiQ-R-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LiLiQ-R-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/LiLiQ-Rplus-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/LiLiQ-Rplus-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/LiLiQ-Rplus-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/LiLiQ-Rplus-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Libpng.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Libpng.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Libpng.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Libpng.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Linux-OpenIB.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Linux-OpenIB.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Linux-OpenIB.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Linux-OpenIB.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Linux-man-pages-1-para.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Linux-man-pages-1-para.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Linux-man-pages-1-para.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Linux-man-pages-1-para.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Linux-man-pages-copyleft-2-para.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Linux-man-pages-copyleft-2-para.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Linux-man-pages-copyleft-2-para.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Linux-man-pages-copyleft-2-para.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Linux-man-pages-copyleft-var.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Linux-man-pages-copyleft-var.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Linux-man-pages-copyleft-var.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Linux-man-pages-copyleft-var.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Linux-man-pages-copyleft.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Linux-man-pages-copyleft.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Linux-man-pages-copyleft.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Linux-man-pages-copyleft.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Lucida-Bitmap-Fonts.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Lucida-Bitmap-Fonts.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Lucida-Bitmap-Fonts.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Lucida-Bitmap-Fonts.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIPS.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIPS.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIPS.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIPS.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-CMU.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-CMU.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-CMU.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-CMU.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-Click.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-Click.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-Click.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-Click.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-Festival.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-Festival.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-Festival.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-Festival.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-Khronos-old.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-Khronos-old.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-Khronos-old.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-Khronos-old.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-Modern-Variant.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-Modern-Variant.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-Modern-Variant.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-Modern-Variant.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-Wu.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-Wu.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-Wu.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-Wu.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-advertising.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-advertising.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-advertising.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-advertising.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-enna.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-enna.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-enna.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-enna.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-feh.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-feh.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-feh.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-feh.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-open-group.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-open-group.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-open-group.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-open-group.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-testregex.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-testregex.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT-testregex.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT-testregex.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MIT.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MIT.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MIT.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MITNFA.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MITNFA.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MITNFA.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MITNFA.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MMIXware.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MMIXware.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MMIXware.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MMIXware.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MPEG-SSG.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MPEG-SSG.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MPEG-SSG.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MPEG-SSG.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MPL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MPL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MPL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MPL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MPL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MPL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MPL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MPL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MS-LPL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MS-LPL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MS-LPL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MS-LPL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MS-PL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MS-PL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MS-PL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MS-PL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MS-RL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MS-RL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MS-RL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MS-RL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MTLL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MTLL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MTLL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MTLL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Mackerras-3-Clause-acknowledgment.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Mackerras-3-Clause-acknowledgment.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Mackerras-3-Clause-acknowledgment.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Mackerras-3-Clause-acknowledgment.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Mackerras-3-Clause.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Mackerras-3-Clause.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Mackerras-3-Clause.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Mackerras-3-Clause.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MakeIndex.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MakeIndex.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MakeIndex.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MakeIndex.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Martin-Birgmeier.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Martin-Birgmeier.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Martin-Birgmeier.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Martin-Birgmeier.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/McPhee-slideshow.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/McPhee-slideshow.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/McPhee-slideshow.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/McPhee-slideshow.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Minpack.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Minpack.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Minpack.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Minpack.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MirOS.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MirOS.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MirOS.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MirOS.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Motosoto.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Motosoto.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Motosoto.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Motosoto.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MulanPSL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MulanPSL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MulanPSL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MulanPSL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/MulanPSL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/MulanPSL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/MulanPSL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/MulanPSL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Multics.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Multics.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Multics.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Multics.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Mup.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Mup.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Mup.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Mup.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NAIST-2003.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NAIST-2003.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NAIST-2003.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NAIST-2003.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NASA-1.3.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NASA-1.3.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NASA-1.3.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NASA-1.3.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NBPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NBPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NBPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NBPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NCBI-PD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NCBI-PD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NCBI-PD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NCBI-PD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NCGL-UK-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NCGL-UK-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NCGL-UK-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NCGL-UK-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NCL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NCL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NCL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NCL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NCSA.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NCSA.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NCSA.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NCSA.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NGPL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NGPL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NGPL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NGPL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NICTA-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NICTA-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NICTA-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NICTA-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NIST-PD-fallback.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NIST-PD-fallback.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NIST-PD-fallback.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NIST-PD-fallback.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NIST-PD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NIST-PD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NIST-PD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NIST-PD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NIST-Software.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NIST-Software.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NIST-Software.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NIST-Software.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NLOD-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NLOD-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NLOD-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NLOD-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NLOD-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NLOD-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NLOD-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NLOD-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NLPL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NLPL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NLPL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NLPL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NOSL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NOSL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NOSL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NOSL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NPL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NPL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NPL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NPL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NPOSL-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NPOSL-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NPOSL-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NPOSL-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NRL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NRL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NRL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NRL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NTIA-PD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NTIA-PD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NTIA-PD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NTIA-PD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NTP-0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NTP-0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NTP-0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NTP-0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NTP.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NTP.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NTP.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NTP.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Naumen.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Naumen.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Naumen.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Naumen.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/NetCDF.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/NetCDF.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/NetCDF.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/NetCDF.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Newsletr.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Newsletr.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Newsletr.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Newsletr.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Nokia.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Nokia.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Nokia.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Nokia.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Noweb.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Noweb.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Noweb.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Noweb.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/O-UDA-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/O-UDA-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/O-UDA-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/O-UDA-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OAR.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OAR.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OAR.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OAR.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OCCT-PL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OCCT-PL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OCCT-PL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OCCT-PL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OCLC-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OCLC-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OCLC-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OCLC-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ODC-By-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ODC-By-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ODC-By-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ODC-By-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ODbL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ODbL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ODbL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ODbL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OFFIS.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFFIS.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OFFIS.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFFIS.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.0-RFN.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.0-RFN.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.0-RFN.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.0-RFN.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.0-no-RFN.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.0-no-RFN.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.0-no-RFN.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.0-no-RFN.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.1-RFN.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.1-RFN.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.1-RFN.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.1-RFN.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.1-no-RFN.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.1-no-RFN.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.1-no-RFN.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.1-no-RFN.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OFL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OFL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OGC-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGC-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OGC-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGC-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OGDL-Taiwan-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGDL-Taiwan-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OGDL-Taiwan-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGDL-Taiwan-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OGL-Canada-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGL-Canada-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OGL-Canada-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGL-Canada-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OGL-UK-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGL-UK-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OGL-UK-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGL-UK-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OGL-UK-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGL-UK-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OGL-UK-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGL-UK-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OGL-UK-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGL-UK-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OGL-UK-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGL-UK-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OGTSL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGTSL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OGTSL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OGTSL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-1.2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-1.2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-1.2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-1.2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-1.3.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-1.3.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-1.3.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-1.3.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-1.4.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-1.4.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-1.4.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-1.4.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.0.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.0.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.0.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.0.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.2.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.2.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.2.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.2.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.2.2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.2.2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.2.2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.2.2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.3.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.3.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.3.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.3.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.4.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.4.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.4.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.4.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.5.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.5.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.5.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.5.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.6.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.6.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.6.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.6.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.7.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.7.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.7.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.7.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.8.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.8.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLDAP-2.8.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLDAP-2.8.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OLFL-1.3.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLFL-1.3.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OLFL-1.3.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OLFL-1.3.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OML.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OML.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OML.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OML.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OPL-UK-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OPL-UK-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OPL-UK-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OPL-UK-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OPUBL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OPUBL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OPUBL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OPUBL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OSET-PL-2.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSET-PL-2.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OSET-PL-2.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSET-PL-2.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OSL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OSL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OSL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OSL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OSL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OSL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OSL-2.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSL-2.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OSL-2.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSL-2.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OSL-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSL-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OSL-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OSL-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OpenPBS-2.3.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OpenPBS-2.3.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OpenPBS-2.3.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OpenPBS-2.3.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OpenSSL-standalone.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OpenSSL-standalone.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OpenSSL-standalone.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OpenSSL-standalone.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OpenSSL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OpenSSL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OpenSSL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OpenSSL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/OpenVision.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/OpenVision.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/OpenVision.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/OpenVision.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/PADL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/PADL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/PADL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/PADL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/PDDL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/PDDL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/PDDL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/PDDL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/PHP-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/PHP-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/PHP-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/PHP-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/PHP-3.01.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/PHP-3.01.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/PHP-3.01.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/PHP-3.01.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/PPL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/PPL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/PPL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/PPL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/PSF-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/PSF-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/PSF-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/PSF-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Parity-6.0.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Parity-6.0.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Parity-6.0.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Parity-6.0.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Parity-7.0.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Parity-7.0.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Parity-7.0.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Parity-7.0.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Pixar.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Pixar.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Pixar.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Pixar.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Plexus.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Plexus.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Plexus.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Plexus.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/PolyForm-Noncommercial-1.0.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/PolyForm-Noncommercial-1.0.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/PolyForm-Noncommercial-1.0.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/PolyForm-Noncommercial-1.0.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/PolyForm-Small-Business-1.0.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/PolyForm-Small-Business-1.0.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/PolyForm-Small-Business-1.0.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/PolyForm-Small-Business-1.0.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/PostgreSQL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/PostgreSQL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/PostgreSQL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/PostgreSQL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Python-2.0.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Python-2.0.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Python-2.0.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Python-2.0.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Python-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Python-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Python-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Python-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/QPL-1.0-INRIA-2004.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/QPL-1.0-INRIA-2004.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/QPL-1.0-INRIA-2004.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/QPL-1.0-INRIA-2004.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/QPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/QPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/QPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/QPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Qhull.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Qhull.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Qhull.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Qhull.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/RHeCos-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/RHeCos-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/RHeCos-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/RHeCos-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/RPL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/RPL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/RPL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/RPL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/RPL-1.5.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/RPL-1.5.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/RPL-1.5.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/RPL-1.5.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/RPSL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/RPSL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/RPSL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/RPSL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/RSA-MD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/RSA-MD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/RSA-MD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/RSA-MD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/RSCPL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/RSCPL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/RSCPL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/RSCPL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Rdisc.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Rdisc.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Rdisc.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Rdisc.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Ruby-pty.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Ruby-pty.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Ruby-pty.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Ruby-pty.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Ruby.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Ruby.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Ruby.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Ruby.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SAX-PD-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SAX-PD-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SAX-PD-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SAX-PD-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SAX-PD.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SAX-PD.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SAX-PD.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SAX-PD.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SCEA.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SCEA.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SCEA.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SCEA.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SGI-B-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SGI-B-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SGI-B-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SGI-B-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SGI-B-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SGI-B-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SGI-B-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SGI-B-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SGI-B-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SGI-B-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SGI-B-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SGI-B-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SGI-OpenGL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SGI-OpenGL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SGI-OpenGL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SGI-OpenGL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SGP4.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SGP4.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SGP4.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SGP4.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SHL-0.5.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SHL-0.5.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SHL-0.5.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SHL-0.5.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SHL-0.51.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SHL-0.51.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SHL-0.51.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SHL-0.51.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SISSL-1.2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SISSL-1.2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SISSL-1.2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SISSL-1.2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SISSL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SISSL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SISSL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SISSL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SMAIL-GPL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SMAIL-GPL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SMAIL-GPL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SMAIL-GPL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SMLNJ.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SMLNJ.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SMLNJ.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SMLNJ.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SMPPL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SMPPL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SMPPL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SMPPL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SNIA.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SNIA.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SNIA.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SNIA.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SOFA.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SOFA.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SOFA.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SOFA.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SSH-OpenSSH.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SSH-OpenSSH.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SSH-OpenSSH.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SSH-OpenSSH.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SSH-short.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SSH-short.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SSH-short.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SSH-short.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SSLeay-standalone.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SSLeay-standalone.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SSLeay-standalone.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SSLeay-standalone.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SSPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SSPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SSPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SSPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SUL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SUL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SUL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SUL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SWL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SWL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SWL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SWL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Saxpath.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Saxpath.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Saxpath.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Saxpath.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SchemeReport.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SchemeReport.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SchemeReport.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SchemeReport.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Sendmail-8.23.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sendmail-8.23.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Sendmail-8.23.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sendmail-8.23.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Sendmail-Open-Source-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sendmail-Open-Source-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Sendmail-Open-Source-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sendmail-Open-Source-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Sendmail.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sendmail.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Sendmail.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sendmail.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SimPL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SimPL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SimPL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SimPL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Sleepycat.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sleepycat.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Sleepycat.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sleepycat.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Soundex.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Soundex.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Soundex.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Soundex.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Spencer-86.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Spencer-86.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Spencer-86.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Spencer-86.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Spencer-94.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Spencer-94.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Spencer-94.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Spencer-94.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Spencer-99.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Spencer-99.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Spencer-99.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Spencer-99.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SugarCRM-1.1.3.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SugarCRM-1.1.3.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SugarCRM-1.1.3.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SugarCRM-1.1.3.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Sun-PPP-2000.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sun-PPP-2000.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Sun-PPP-2000.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sun-PPP-2000.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Sun-PPP.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sun-PPP.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Sun-PPP.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Sun-PPP.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/SunPro.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/SunPro.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/SunPro.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/SunPro.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Symlinks.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Symlinks.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Symlinks.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Symlinks.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TAPR-OHL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TAPR-OHL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TAPR-OHL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TAPR-OHL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TCL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TCL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TCL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TCL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TCP-wrappers.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TCP-wrappers.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TCP-wrappers.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TCP-wrappers.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TGPPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TGPPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TGPPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TGPPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TMate.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TMate.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TMate.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TMate.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TORQUE-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TORQUE-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TORQUE-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TORQUE-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TOSL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TOSL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TOSL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TOSL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TPDL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TPDL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TPDL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TPDL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TTWL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TTWL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TTWL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TTWL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TTYP0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TTYP0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TTYP0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TTYP0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TU-Berlin-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TU-Berlin-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TU-Berlin-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TU-Berlin-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TU-Berlin-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TU-Berlin-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TU-Berlin-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TU-Berlin-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TermReadKey.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TermReadKey.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TermReadKey.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TermReadKey.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ThirdEye.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ThirdEye.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ThirdEye.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ThirdEye.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/TrustedQSL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/TrustedQSL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/TrustedQSL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/TrustedQSL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/UCAR.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/UCAR.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/UCAR.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/UCAR.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/UCL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/UCL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/UCL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/UCL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/UMich-Merit.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/UMich-Merit.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/UMich-Merit.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/UMich-Merit.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/UPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/UPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/UPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/UPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/URT-RLE.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/URT-RLE.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/URT-RLE.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/URT-RLE.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Ubuntu-font-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Ubuntu-font-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Ubuntu-font-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Ubuntu-font-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Unicode-3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unicode-3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Unicode-3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unicode-3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Unicode-DFS-2015.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unicode-DFS-2015.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Unicode-DFS-2015.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unicode-DFS-2015.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Unicode-DFS-2016.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unicode-DFS-2016.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Unicode-DFS-2016.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unicode-DFS-2016.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Unicode-TOU.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unicode-TOU.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Unicode-TOU.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unicode-TOU.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/UnixCrypt.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/UnixCrypt.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/UnixCrypt.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/UnixCrypt.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Unlicense-libtelnet.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unlicense-libtelnet.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Unlicense-libtelnet.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unlicense-libtelnet.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Unlicense-libwhirlpool.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unlicense-libwhirlpool.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Unlicense-libwhirlpool.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unlicense-libwhirlpool.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Unlicense.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unlicense.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Unlicense.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Unlicense.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/VOSTROM.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/VOSTROM.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/VOSTROM.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/VOSTROM.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/VSL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/VSL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/VSL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/VSL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Vim.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Vim.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Vim.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Vim.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/W3C-19980720.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/W3C-19980720.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/W3C-19980720.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/W3C-19980720.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/W3C-20150513.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/W3C-20150513.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/W3C-20150513.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/W3C-20150513.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/W3C.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/W3C.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/W3C.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/W3C.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/WTFPL.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/WTFPL.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/WTFPL.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/WTFPL.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Watcom-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Watcom-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Watcom-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Watcom-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Widget-Workshop.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Widget-Workshop.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Widget-Workshop.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Widget-Workshop.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Wsuipa.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Wsuipa.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Wsuipa.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Wsuipa.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/X11-distribute-modifications-variant.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/X11-distribute-modifications-variant.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/X11-distribute-modifications-variant.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/X11-distribute-modifications-variant.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/X11-swapped.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/X11-swapped.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/X11-swapped.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/X11-swapped.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/X11.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/X11.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/X11.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/X11.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/XFree86-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/XFree86-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/XFree86-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/XFree86-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/XSkat.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/XSkat.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/XSkat.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/XSkat.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Xdebug-1.03.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Xdebug-1.03.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Xdebug-1.03.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Xdebug-1.03.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Xerox.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Xerox.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Xerox.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Xerox.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Xfig.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Xfig.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Xfig.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Xfig.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Xnet.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Xnet.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Xnet.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Xnet.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/YPL-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/YPL-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/YPL-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/YPL-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/YPL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/YPL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/YPL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/YPL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ZPL-1.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ZPL-1.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ZPL-1.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ZPL-1.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ZPL-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ZPL-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ZPL-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ZPL-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ZPL-2.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ZPL-2.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ZPL-2.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ZPL-2.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Zed.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zed.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Zed.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zed.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Zeeff.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zeeff.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Zeeff.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zeeff.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Zend-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zend-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Zend-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zend-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Zimbra-1.3.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zimbra-1.3.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Zimbra-1.3.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zimbra-1.3.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Zimbra-1.4.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zimbra-1.4.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Zimbra-1.4.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zimbra-1.4.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/Zlib.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zlib.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/Zlib.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/Zlib.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/any-OSI-perl-modules.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/any-OSI-perl-modules.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/any-OSI-perl-modules.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/any-OSI-perl-modules.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/any-OSI.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/any-OSI.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/any-OSI.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/any-OSI.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/bcrypt-Solar-Designer.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/bcrypt-Solar-Designer.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/bcrypt-Solar-Designer.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/bcrypt-Solar-Designer.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/blessing.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/blessing.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/blessing.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/blessing.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/bzip2-1.0.6.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/bzip2-1.0.6.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/bzip2-1.0.6.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/bzip2-1.0.6.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/check-cvs.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/check-cvs.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/check-cvs.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/check-cvs.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/checkmk.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/checkmk.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/checkmk.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/checkmk.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/copyleft-next-0.3.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/copyleft-next-0.3.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/copyleft-next-0.3.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/copyleft-next-0.3.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/copyleft-next-0.3.1.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/copyleft-next-0.3.1.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/copyleft-next-0.3.1.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/copyleft-next-0.3.1.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/curl.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/curl.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/curl.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/curl.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/cve-tou.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/cve-tou.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/cve-tou.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/cve-tou.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/diffmark.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/diffmark.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/diffmark.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/diffmark.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/dtoa.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/dtoa.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/dtoa.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/dtoa.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/dvipdfm.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/dvipdfm.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/dvipdfm.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/dvipdfm.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/eGenix.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/eGenix.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/eGenix.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/eGenix.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/etalab-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/etalab-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/etalab-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/etalab-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/fwlw.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/fwlw.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/fwlw.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/fwlw.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/gSOAP-1.3b.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/gSOAP-1.3b.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/gSOAP-1.3b.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/gSOAP-1.3b.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/generic-xts.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/generic-xts.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/generic-xts.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/generic-xts.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/gnuplot.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/gnuplot.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/gnuplot.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/gnuplot.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/gtkbook.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/gtkbook.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/gtkbook.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/gtkbook.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/hdparm.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/hdparm.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/hdparm.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/hdparm.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/iMatix.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/iMatix.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/iMatix.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/iMatix.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/jove.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/jove.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/jove.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/jove.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/libpng-1.6.35.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/libpng-1.6.35.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/libpng-1.6.35.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/libpng-1.6.35.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/libpng-2.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/libpng-2.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/libpng-2.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/libpng-2.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/libselinux-1.0.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/libselinux-1.0.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/libselinux-1.0.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/libselinux-1.0.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/libtiff.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/libtiff.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/libtiff.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/libtiff.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/libutil-David-Nugent.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/libutil-David-Nugent.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/libutil-David-Nugent.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/libutil-David-Nugent.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/lsof.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/lsof.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/lsof.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/lsof.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/magaz.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/magaz.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/magaz.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/magaz.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/mailprio.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/mailprio.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/mailprio.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/mailprio.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/man2html.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/man2html.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/man2html.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/man2html.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/metamail.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/metamail.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/metamail.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/metamail.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/mpi-permissive.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/mpi-permissive.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/mpi-permissive.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/mpi-permissive.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/mpich2.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/mpich2.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/mpich2.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/mpich2.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/mplus.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/mplus.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/mplus.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/mplus.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ngrep.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ngrep.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ngrep.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ngrep.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/pkgconf.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/pkgconf.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/pkgconf.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/pkgconf.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/pnmstitch.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/pnmstitch.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/pnmstitch.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/pnmstitch.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/psfrag.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/psfrag.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/psfrag.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/psfrag.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/psutils.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/psutils.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/psutils.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/psutils.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/python-ldap.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/python-ldap.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/python-ldap.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/python-ldap.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/radvd.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/radvd.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/radvd.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/radvd.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/snprintf.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/snprintf.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/snprintf.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/snprintf.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/softSurfer.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/softSurfer.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/softSurfer.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/softSurfer.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ssh-keyscan.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ssh-keyscan.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ssh-keyscan.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ssh-keyscan.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/swrule.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/swrule.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/swrule.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/swrule.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/threeparttable.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/threeparttable.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/threeparttable.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/threeparttable.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/ulem.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/ulem.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/ulem.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/ulem.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/w3m.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/w3m.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/w3m.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/w3m.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/wwl.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/wwl.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/wwl.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/wwl.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/xinetd.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/xinetd.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/xinetd.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/xinetd.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/xkeyboard-config-Zinoviev.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/xkeyboard-config-Zinoviev.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/xkeyboard-config-Zinoviev.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/xkeyboard-config-Zinoviev.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/xlock.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/xlock.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/xlock.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/xlock.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/xpp.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/xpp.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/xpp.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/xpp.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/xzoom.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/xzoom.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/xzoom.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/xzoom.txt
diff --git a/tests/SPDXLicenseMatcher.Test/TestLicenses/zlib-acknowledgement.txt b/tests/SPDXLicenseMatcher.Test/SPDXLicenses/zlib-acknowledgement.txt
similarity index 100%
rename from tests/SPDXLicenseMatcher.Test/TestLicenses/zlib-acknowledgement.txt
rename to tests/SPDXLicenseMatcher.Test/SPDXLicenses/zlib-acknowledgement.txt