* Redistributions of source code must retain the above copyright
diff --git a/src/licensedcode/data/rules/bsd-new_633.yml b/src/licensedcode/data/rules/bsd-new_633.yml
deleted file mode 100644
index ba2624cca1b..00000000000
--- a/src/licensedcode/data/rules/bsd-new_633.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
-minimum_coverage: 90
diff --git a/src/licensedcode/data/rules/bsd-new_634.RULE b/src/licensedcode/data/rules/bsd-new_634.RULE
index f4004d774be..26a07b3faf2 100644
--- a/src/licensedcode/data/rules/bsd-new_634.RULE
+++ b/src/licensedcode/data/rules/bsd-new_634.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
License (based on BSD license)
Redistribution and use in source and binary forms, with or without
diff --git a/src/licensedcode/data/rules/bsd-new_634.yml b/src/licensedcode/data/rules/bsd-new_634.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_634.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_635.RULE b/src/licensedcode/data/rules/bsd-new_635.RULE
index 22c9c05a561..0b9b6c2b36a 100644
--- a/src/licensedcode/data/rules/bsd-new_635.RULE
+++ b/src/licensedcode/data/rules/bsd-new_635.RULE
@@ -1,7 +1,12 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License for more information.
-
\ No newline at end of file
+ See the License for more information.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_635.yml b/src/licensedcode/data/rules/bsd-new_635.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_635.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_636.RULE b/src/licensedcode/data/rules/bsd-new_636.RULE
index 77288b765cf..93e8116e930 100644
--- a/src/licensedcode/data/rules/bsd-new_636.RULE
+++ b/src/licensedcode/data/rules/bsd-new_636.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Released under the terms of the following BSD License.
Redistribution and use in source and binary forms, with or without
diff --git a/src/licensedcode/data/rules/bsd-new_636.yml b/src/licensedcode/data/rules/bsd-new_636.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_636.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_637.RULE b/src/licensedcode/data/rules/bsd-new_637.RULE
index e13dd4c786d..14b40ed9a6c 100644
--- a/src/licensedcode/data/rules/bsd-new_637.RULE
+++ b/src/licensedcode/data/rules/bsd-new_637.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
BSD-3 licensed
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_637.yml b/src/licensedcode/data/rules/bsd-new_637.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_637.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_638.RULE b/src/licensedcode/data/rules/bsd-new_638.RULE
index e866413b05c..3e49c679573 100644
--- a/src/licensedcode/data/rules/bsd-new_638.RULE
+++ b/src/licensedcode/data/rules/bsd-new_638.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE.txt
+---
+
LICENSE.txt [BSD-3]
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_638.yml b/src/licensedcode/data/rules/bsd-new_638.yml
deleted file mode 100644
index 4db018eb4d0..00000000000
--- a/src/licensedcode/data/rules/bsd-new_638.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-referenced_filenames:
- - LICENSE.txt
diff --git a/src/licensedcode/data/rules/bsd-new_639.RULE b/src/licensedcode/data/rules/bsd-new_639.RULE
index 96429ac412f..514b1ef7b17 100644
--- a/src/licensedcode/data/rules/bsd-new_639.RULE
+++ b/src/licensedcode/data/rules/bsd-new_639.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_639.yml b/src/licensedcode/data/rules/bsd-new_639.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_639.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_64.RULE b/src/licensedcode/data/rules/bsd-new_64.RULE
index aa31fa801c5..80b4fa9d95e 100644
--- a/src/licensedcode/data/rules/bsd-new_64.RULE
+++ b/src/licensedcode/data/rules/bsd-new_64.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
@@ -11,4 +16,4 @@ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_64.yml b/src/licensedcode/data/rules/bsd-new_64.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_64.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_640.RULE b/src/licensedcode/data/rules/bsd-new_640.RULE
index 65948d0ca8a..33df533198e 100644
--- a/src/licensedcode/data/rules/bsd-new_640.RULE
+++ b/src/licensedcode/data/rules/bsd-new_640.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
diff --git a/src/licensedcode/data/rules/bsd-new_640.yml b/src/licensedcode/data/rules/bsd-new_640.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_640.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_641.RULE b/src/licensedcode/data/rules/bsd-new_641.RULE
index 1362c4ab629..401132b9fd6 100644
--- a/src/licensedcode/data/rules/bsd-new_641.RULE
+++ b/src/licensedcode/data/rules/bsd-new_641.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
Distributed under the terms of the Modified BSD License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_641.yml b/src/licensedcode/data/rules/bsd-new_641.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_641.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_642.RULE b/src/licensedcode/data/rules/bsd-new_642.RULE
index ae7210fb0ee..dcf50a1e89b 100644
--- a/src/licensedcode/data/rules/bsd-new_642.RULE
+++ b/src/licensedcode/data/rules/bsd-new_642.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
Framework is provided under the 3-clause BSD license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_642.yml b/src/licensedcode/data/rules/bsd-new_642.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_642.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_643.RULE b/src/licensedcode/data/rules/bsd-new_643.RULE
index 32997208865..69a545b6f12 100644
--- a/src/licensedcode/data/rules/bsd-new_643.RULE
+++ b/src/licensedcode/data/rules/bsd-new_643.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
provided under the 3-clause BSD license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_643.yml b/src/licensedcode/data/rules/bsd-new_643.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_643.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_644.RULE b/src/licensedcode/data/rules/bsd-new_644.RULE
index c32a91d1f14..e5a9848342a 100644
--- a/src/licensedcode/data/rules/bsd-new_644.RULE
+++ b/src/licensedcode/data/rules/bsd-new_644.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
Three clause BSD license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_644.yml b/src/licensedcode/data/rules/bsd-new_644.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_644.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_645.RULE b/src/licensedcode/data/rules/bsd-new_645.RULE
index b2a5e53ee3c..ccc0a5aefa1 100644
--- a/src/licensedcode/data/rules/bsd-new_645.RULE
+++ b/src/licensedcode/data/rules/bsd-new_645.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
PCRE is distributed under the terms of the "BSD" licence, as
specified below. The documentation for PCRE, supplied in the "doc"
directory, is distributed under the same terms as the software itself.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_645.yml b/src/licensedcode/data/rules/bsd-new_645.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_645.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_646.RULE b/src/licensedcode/data/rules/bsd-new_646.RULE
index ad73f446818..9c4acedb104 100644
--- a/src/licensedcode/data/rules/bsd-new_646.RULE
+++ b/src/licensedcode/data/rules/bsd-new_646.RULE
@@ -1 +1,8 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+minimum_coverage: 100
+---
+
The copyright notice and license are embedded in regexp-pcre.js.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_646.yml b/src/licensedcode/data/rules/bsd-new_646.yml
deleted file mode 100644
index e5227476bcf..00000000000
--- a/src/licensedcode/data/rules/bsd-new_646.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/bsd-new_647.RULE b/src/licensedcode/data/rules/bsd-new_647.RULE
index 5a586aa39fd..8871239f9da 100644
--- a/src/licensedcode/data/rules/bsd-new_647.RULE
+++ b/src/licensedcode/data/rules/bsd-new_647.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
released under a 3-clause BSD license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_647.yml b/src/licensedcode/data/rules/bsd-new_647.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_647.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_648.RULE b/src/licensedcode/data/rules/bsd-new_648.RULE
index 3edd54b8f9a..34a529c342c 100644
--- a/src/licensedcode/data/rules/bsd-new_648.RULE
+++ b/src/licensedcode/data/rules/bsd-new_648.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
This is released under the BSD license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_648.yml b/src/licensedcode/data/rules/bsd-new_648.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_648.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_649.RULE b/src/licensedcode/data/rules/bsd-new_649.RULE
index a74e03a8197..04c466ad033 100644
--- a/src/licensedcode/data/rules/bsd-new_649.RULE
+++ b/src/licensedcode/data/rules/bsd-new_649.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
released under the BSD license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_649.yml b/src/licensedcode/data/rules/bsd-new_649.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_649.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_65.RULE b/src/licensedcode/data/rules/bsd-new_65.RULE
index 86fc49bf8bd..4ad56dc2124 100644
--- a/src/licensedcode/data/rules/bsd-new_65.RULE
+++ b/src/licensedcode/data/rules/bsd-new_65.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 99
+---
+
It is BSD licensed.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_65.yml b/src/licensedcode/data/rules/bsd-new_65.yml
deleted file mode 100644
index bb1a896f7fd..00000000000
--- a/src/licensedcode/data/rules/bsd-new_65.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_650.RULE b/src/licensedcode/data/rules/bsd-new_650.RULE
index eb520f5bc84..fe1955baa25 100644
--- a/src/licensedcode/data/rules/bsd-new_650.RULE
+++ b/src/licensedcode/data/rules/bsd-new_650.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
Open Source Software Licensed under the BSD 3-Clause License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_650.yml b/src/licensedcode/data/rules/bsd-new_650.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_650.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_651.RULE b/src/licensedcode/data/rules/bsd-new_651.RULE
index ace323347e7..c2385b6cf22 100644
--- a/src/licensedcode/data/rules/bsd-new_651.RULE
+++ b/src/licensedcode/data/rules/bsd-new_651.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
Terms of the BSD 3-Clause License:
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_651.yml b/src/licensedcode/data/rules/bsd-new_651.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_651.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_652.RULE b/src/licensedcode/data/rules/bsd-new_652.RULE
index b55a228805b..b325c6c702b 100644
--- a/src/licensedcode/data/rules/bsd-new_652.RULE
+++ b/src/licensedcode/data/rules/bsd-new_652.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Terms of the BSD 3-Clause License:
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_652.yml b/src/licensedcode/data/rules/bsd-new_652.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_652.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_653.RULE b/src/licensedcode/data/rules/bsd-new_653.RULE
index 98572f19251..3e3f6949f22 100644
--- a/src/licensedcode/data/rules/bsd-new_653.RULE
+++ b/src/licensedcode/data/rules/bsd-new_653.RULE
@@ -1 +1,8 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+minimum_coverage: 100
+---
+
Go is used under the terms of the BSD like license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_653.yml b/src/licensedcode/data/rules/bsd-new_653.yml
deleted file mode 100644
index 01cbfcfa3a0..00000000000
--- a/src/licensedcode/data/rules/bsd-new_653.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/bsd-new_654.RULE b/src/licensedcode/data/rules/bsd-new_654.RULE
index 920559e3af6..691b49a536d 100644
--- a/src/licensedcode/data/rules/bsd-new_654.RULE
+++ b/src/licensedcode/data/rules/bsd-new_654.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/src/licensedcode/data/rules/bsd-new_654.yml b/src/licensedcode/data/rules/bsd-new_654.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_654.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_655.RULE b/src/licensedcode/data/rules/bsd-new_655.RULE
index b6812c21ce8..9f39dc78450 100644
--- a/src/licensedcode/data/rules/bsd-new_655.RULE
+++ b/src/licensedcode/data/rules/bsd-new_655.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/src/licensedcode/data/rules/bsd-new_655.yml b/src/licensedcode/data/rules/bsd-new_655.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_655.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_656.RULE b/src/licensedcode/data/rules/bsd-new_656.RULE
index 80487c0f383..55c0476be67 100644
--- a/src/licensedcode/data/rules/bsd-new_656.RULE
+++ b/src/licensedcode/data/rules/bsd-new_656.RULE
@@ -1 +1,10 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+minimum_coverage: 100
+referenced_filenames:
+ - license/third_party/asm_license.txt
+---
+
License: BSD ([license/third_party/asm_license.txt][asm])
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_656.yml b/src/licensedcode/data/rules/bsd-new_656.yml
deleted file mode 100644
index 85d35698c37..00000000000
--- a/src/licensedcode/data/rules/bsd-new_656.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-minimum_coverage: 100
-referenced_filenames:
- - license/third_party/asm_license.txt
diff --git a/src/licensedcode/data/rules/bsd-new_657.RULE b/src/licensedcode/data/rules/bsd-new_657.RULE
index 0582f0f9f4c..a8a6b1fca0d 100644
--- a/src/licensedcode/data/rules/bsd-new_657.RULE
+++ b/src/licensedcode/data/rules/bsd-new_657.RULE
@@ -1 +1,10 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+minimum_coverage: 100
+referenced_filenames:
+ - third_party/asm_license.txt
+---
+
[asm]: third_party/asm_license.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_657.yml b/src/licensedcode/data/rules/bsd-new_657.yml
deleted file mode 100644
index 36e8b017940..00000000000
--- a/src/licensedcode/data/rules/bsd-new_657.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-minimum_coverage: 100
-referenced_filenames:
- - third_party/asm_license.txt
diff --git a/src/licensedcode/data/rules/bsd-new_658.RULE b/src/licensedcode/data/rules/bsd-new_658.RULE
index ca32c9efc18..0dd5b5d9741 100644
--- a/src/licensedcode/data/rules/bsd-new_658.RULE
+++ b/src/licensedcode/data/rules/bsd-new_658.RULE
@@ -1 +1,10 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+minimum_coverage: 100
+referenced_filenames:
+ - third_party/dart_LICENSE.txt
+---
+
[dart]: third_party/dart_LICENSE.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_658.yml b/src/licensedcode/data/rules/bsd-new_658.yml
deleted file mode 100644
index 661531d5ba9..00000000000
--- a/src/licensedcode/data/rules/bsd-new_658.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-minimum_coverage: 100
-referenced_filenames:
- - third_party/dart_LICENSE.txt
diff --git a/src/licensedcode/data/rules/bsd-new_659.RULE b/src/licensedcode/data/rules/bsd-new_659.RULE
index c3f8d3cb050..83e2c127ccc 100644
--- a/src/licensedcode/data/rules/bsd-new_659.RULE
+++ b/src/licensedcode/data/rules/bsd-new_659.RULE
@@ -1 +1,10 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+minimum_coverage: 100
+referenced_filenames:
+ - license/third_party/dart_LICENSE.txt
+---
+
License: BSD ([license/third_party/dart_LICENSE.txt][dart])
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_659.yml b/src/licensedcode/data/rules/bsd-new_659.yml
deleted file mode 100644
index 853e1ce8904..00000000000
--- a/src/licensedcode/data/rules/bsd-new_659.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-minimum_coverage: 100
-referenced_filenames:
- - license/third_party/dart_LICENSE.txt
diff --git a/src/licensedcode/data/rules/bsd-new_66.RULE b/src/licensedcode/data/rules/bsd-new_66.RULE
index 46b46ec5fd9..b0ee57a3a54 100644
--- a/src/licensedcode/data/rules/bsd-new_66.RULE
+++ b/src/licensedcode/data/rules/bsd-new_66.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -20,4 +25,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_66.yml b/src/licensedcode/data/rules/bsd-new_66.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_66.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_660.RULE b/src/licensedcode/data/rules/bsd-new_660.RULE
index bcdf220d70e..40c8d8f761e 100644
--- a/src/licensedcode/data/rules/bsd-new_660.RULE
+++ b/src/licensedcode/data/rules/bsd-new_660.RULE
@@ -1 +1,10 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+minimum_coverage: 100
+referenced_filenames:
+ - third_party/testdata/eclipse_distribution_license.txt
+---
+
[eclipse-distribution]: third_party/testdata/eclipse_distribution_license.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_660.yml b/src/licensedcode/data/rules/bsd-new_660.yml
deleted file mode 100644
index bcec601f664..00000000000
--- a/src/licensedcode/data/rules/bsd-new_660.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-minimum_coverage: 100
-referenced_filenames:
- - third_party/testdata/eclipse_distribution_license.txt
diff --git a/src/licensedcode/data/rules/bsd-new_661.RULE b/src/licensedcode/data/rules/bsd-new_661.RULE
index b9ba614a8b7..3edc329ecd1 100644
--- a/src/licensedcode/data/rules/bsd-new_661.RULE
+++ b/src/licensedcode/data/rules/bsd-new_661.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
diff --git a/src/licensedcode/data/rules/bsd-new_661.yml b/src/licensedcode/data/rules/bsd-new_661.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_661.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_662.RULE b/src/licensedcode/data/rules/bsd-new_662.RULE
index 9b49a5eaaa4..0f0f08bb19c 100644
--- a/src/licensedcode/data/rules/bsd-new_662.RULE
+++ b/src/licensedcode/data/rules/bsd-new_662.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://opensource.org/licenses/BSD-3-Clause
+---
+
3-Clause BSD
https://opensource.org/licenses/BSD-3-Clause
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_662.yml b/src/licensedcode/data/rules/bsd-new_662.yml
deleted file mode 100644
index a881da83bcf..00000000000
--- a/src/licensedcode/data/rules/bsd-new_662.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://opensource.org/licenses/BSD-3-Clause
diff --git a/src/licensedcode/data/rules/bsd-new_663.RULE b/src/licensedcode/data/rules/bsd-new_663.RULE
index 93e352d6614..a02080482b6 100644
--- a/src/licensedcode/data/rules/bsd-new_663.RULE
+++ b/src/licensedcode/data/rules/bsd-new_663.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://opensource.org/licenses/BSD-3-Clause
+---
+
3-Clause BSD
http://opensource.org/licenses/BSD-3-Clause
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_663.yml b/src/licensedcode/data/rules/bsd-new_663.yml
deleted file mode 100644
index c73f22b6109..00000000000
--- a/src/licensedcode/data/rules/bsd-new_663.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://opensource.org/licenses/BSD-3-Clause
diff --git a/src/licensedcode/data/rules/bsd-new_664.RULE b/src/licensedcode/data/rules/bsd-new_664.RULE
index 1c75c56efce..1f0d200d225 100644
--- a/src/licensedcode/data/rules/bsd-new_664.RULE
+++ b/src/licensedcode/data/rules/bsd-new_664.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://www.eclipse.org/org/documents/edl-v10.php
+---
+
Eclipse Distribution License 1.0
https://www.eclipse.org/org/documents/edl-v10.php
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_664.yml b/src/licensedcode/data/rules/bsd-new_664.yml
deleted file mode 100644
index 439387b930f..00000000000
--- a/src/licensedcode/data/rules/bsd-new_664.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://www.eclipse.org/org/documents/edl-v10.php
diff --git a/src/licensedcode/data/rules/bsd-new_665.RULE b/src/licensedcode/data/rules/bsd-new_665.RULE
index c37f17d2ba5..50631317b17 100644
--- a/src/licensedcode/data/rules/bsd-new_665.RULE
+++ b/src/licensedcode/data/rules/bsd-new_665.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
Eclipse Distribution License 1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_665.yml b/src/licensedcode/data/rules/bsd-new_665.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_665.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_666.RULE b/src/licensedcode/data/rules/bsd-new_666.RULE
index 9e5e86fe62c..07e00dd090d 100644
--- a/src/licensedcode/data/rules/bsd-new_666.RULE
+++ b/src/licensedcode/data/rules/bsd-new_666.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://www.eclipse.org/org/documents/edl-v10.php
+---
+
https://www.eclipse.org/org/documents/edl-v10.php
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_666.yml b/src/licensedcode/data/rules/bsd-new_666.yml
deleted file mode 100644
index 439387b930f..00000000000
--- a/src/licensedcode/data/rules/bsd-new_666.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://www.eclipse.org/org/documents/edl-v10.php
diff --git a/src/licensedcode/data/rules/bsd-new_667.RULE b/src/licensedcode/data/rules/bsd-new_667.RULE
index 5e9679c2143..d273f5c0797 100644
--- a/src/licensedcode/data/rules/bsd-new_667.RULE
+++ b/src/licensedcode/data/rules/bsd-new_667.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
eclipse.org/org/documents/edl-v10.php
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_667.yml b/src/licensedcode/data/rules/bsd-new_667.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_667.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_668.RULE b/src/licensedcode/data/rules/bsd-new_668.RULE
index 378b6f41e05..c3ab9df95cd 100644
--- a/src/licensedcode/data/rules/bsd-new_668.RULE
+++ b/src/licensedcode/data/rules/bsd-new_668.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 99
+notes: this has this exatr term "for any purpose with or without fee "
+---
+
Permission to use, copy, modify, and distribute this software in source
or binary form for any purpose with or without fee is hereby granted,
provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_668.yml b/src/licensedcode/data/rules/bsd-new_668.yml
deleted file mode 100644
index ec916c4aeef..00000000000
--- a/src/licensedcode/data/rules/bsd-new_668.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 99
-notes: this has this exatr term "for any purpose with or without fee "
diff --git a/src/licensedcode/data/rules/bsd-new_669.RULE b/src/licensedcode/data/rules/bsd-new_669.RULE
index ca4d7eac405..8c36f45c21f 100644
--- a/src/licensedcode/data/rules/bsd-new_669.RULE
+++ b/src/licensedcode/data/rules/bsd-new_669.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 99
+notes: this has this exatr term "for any purpose with or without fee "
+---
+
LICENSE
Permission to use, copy, modify, and distribute this software in source
or binary form for any purpose with or without fee is hereby granted,
diff --git a/src/licensedcode/data/rules/bsd-new_669.yml b/src/licensedcode/data/rules/bsd-new_669.yml
deleted file mode 100644
index ec916c4aeef..00000000000
--- a/src/licensedcode/data/rules/bsd-new_669.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 99
-notes: this has this exatr term "for any purpose with or without fee "
diff --git a/src/licensedcode/data/rules/bsd-new_67.RULE b/src/licensedcode/data/rules/bsd-new_67.RULE
index 63f5927eddb..10376ef5f5a 100644
--- a/src/licensedcode/data/rules/bsd-new_67.RULE
+++ b/src/licensedcode/data/rules/bsd-new_67.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+minimum_coverage: 95
+---
+
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
diff --git a/src/licensedcode/data/rules/bsd-new_67.yml b/src/licensedcode/data/rules/bsd-new_67.yml
deleted file mode 100644
index c81f8dc5384..00000000000
--- a/src/licensedcode/data/rules/bsd-new_67.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-minimum_coverage: 95
diff --git a/src/licensedcode/data/rules/bsd-new_670.RULE b/src/licensedcode/data/rules/bsd-new_670.RULE
index 6a0bd921113..1fb4d381dc1 100644
--- a/src/licensedcode/data/rules/bsd-new_670.RULE
+++ b/src/licensedcode/data/rules/bsd-new_670.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 99
+notes: this has this exatr term "for any purpose with or without fee "
+---
+
Permission to use, copy, modify, and distribute this software in source
or binary form for any purpose with or without fee is hereby granted,
provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_670.yml b/src/licensedcode/data/rules/bsd-new_670.yml
deleted file mode 100644
index ec916c4aeef..00000000000
--- a/src/licensedcode/data/rules/bsd-new_670.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 99
-notes: this has this exatr term "for any purpose with or without fee "
diff --git a/src/licensedcode/data/rules/bsd-new_671.RULE b/src/licensedcode/data/rules/bsd-new_671.RULE
index 2510dcc8c2b..7ce66243948 100644
--- a/src/licensedcode/data/rules/bsd-new_671.RULE
+++ b/src/licensedcode/data/rules/bsd-new_671.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 99
+notes: this has this exatr term "for any purpose with or without fee "
+---
+
LICENSE
Permission to use, copy, modify, and distribute this software in source
or binary form for any purpose with or without fee is hereby granted,
diff --git a/src/licensedcode/data/rules/bsd-new_671.yml b/src/licensedcode/data/rules/bsd-new_671.yml
deleted file mode 100644
index ec916c4aeef..00000000000
--- a/src/licensedcode/data/rules/bsd-new_671.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 99
-notes: this has this exatr term "for any purpose with or without fee "
diff --git a/src/licensedcode/data/rules/bsd-new_672.RULE b/src/licensedcode/data/rules/bsd-new_672.RULE
index f472034f3e3..89f0443a233 100644
--- a/src/licensedcode/data/rules/bsd-new_672.RULE
+++ b/src/licensedcode/data/rules/bsd-new_672.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+ignorable_urls:
+ - http://opensource.org/licenses/BSD-3-Clause
+---
+
[BSD-3]: http://opensource.org/licenses/BSD-3-Clause
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_672.yml b/src/licensedcode/data/rules/bsd-new_672.yml
deleted file mode 100644
index 08679dbeaa6..00000000000
--- a/src/licensedcode/data/rules/bsd-new_672.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-ignorable_urls:
- - http://opensource.org/licenses/BSD-3-Clause
diff --git a/src/licensedcode/data/rules/bsd-new_673.RULE b/src/licensedcode/data/rules/bsd-new_673.RULE
index 08468da1c96..11af270ff4e 100644
--- a/src/licensedcode/data/rules/bsd-new_673.RULE
+++ b/src/licensedcode/data/rules/bsd-new_673.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://opensource.org/licenses/BSD-3-Clause
+---
+
`BSD-3-Clause` - [BSD 3-Clause "New" or "Revised"](https://opensource.org/licenses/BSD-3-Clause)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_673.yml b/src/licensedcode/data/rules/bsd-new_673.yml
deleted file mode 100644
index a881da83bcf..00000000000
--- a/src/licensedcode/data/rules/bsd-new_673.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://opensource.org/licenses/BSD-3-Clause
diff --git a/src/licensedcode/data/rules/bsd-new_674.RULE b/src/licensedcode/data/rules/bsd-new_674.RULE
index d98f6c62e07..43a446ddc32 100644
--- a/src/licensedcode/data/rules/bsd-new_674.RULE
+++ b/src/licensedcode/data/rules/bsd-new_674.RULE
@@ -1 +1,8 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+minimum_coverage: 100
+---
+
golang.org/x/net/LICENSE
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_674.yml b/src/licensedcode/data/rules/bsd-new_674.yml
deleted file mode 100644
index e5227476bcf..00000000000
--- a/src/licensedcode/data/rules/bsd-new_674.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/bsd-new_675.RULE b/src/licensedcode/data/rules/bsd-new_675.RULE
index e3a38509486..f1f695b28db 100644
--- a/src/licensedcode/data/rules/bsd-new_675.RULE
+++ b/src/licensedcode/data/rules/bsd-new_675.RULE
@@ -1 +1,8 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+minimum_coverage: 100
+---
+
golang.org/x/text/LICENSE
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_675.yml b/src/licensedcode/data/rules/bsd-new_675.yml
deleted file mode 100644
index e5227476bcf..00000000000
--- a/src/licensedcode/data/rules/bsd-new_675.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/bsd-new_676.RULE b/src/licensedcode/data/rules/bsd-new_676.RULE
index 90b4ac79b4e..e9095a3bd8a 100644
--- a/src/licensedcode/data/rules/bsd-new_676.RULE
+++ b/src/licensedcode/data/rules/bsd-new_676.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 90
+---
+
BSD-style licenses
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_676.yml b/src/licensedcode/data/rules/bsd-new_676.yml
deleted file mode 100644
index ac2f9af367d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_676.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 90
diff --git a/src/licensedcode/data/rules/bsd-new_677.RULE b/src/licensedcode/data/rules/bsd-new_677.RULE
index 107f873167e..fd27679152b 100644
--- a/src/licensedcode/data/rules/bsd-new_677.RULE
+++ b/src/licensedcode/data/rules/bsd-new_677.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+ignorable_urls:
+ - https://opensource.org/licenses/BSD-3-Clause
+---
+
|license
:alt: BSD License
:target: https://opensource.org/licenses/BSD-3-Clause
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_677.yml b/src/licensedcode/data/rules/bsd-new_677.yml
deleted file mode 100644
index 98e85336274..00000000000
--- a/src/licensedcode/data/rules/bsd-new_677.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-ignorable_urls:
- - https://opensource.org/licenses/BSD-3-Clause
diff --git a/src/licensedcode/data/rules/bsd-new_678.RULE b/src/licensedcode/data/rules/bsd-new_678.RULE
index 678a61658b8..2bb26e4cd05 100644
--- a/src/licensedcode/data/rules/bsd-new_678.RULE
+++ b/src/licensedcode/data/rules/bsd-new_678.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE
+---
+
License is available under the BSD license. See the LICENSE file
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_678.yml b/src/licensedcode/data/rules/bsd-new_678.yml
deleted file mode 100644
index 77fbef666ba..00000000000
--- a/src/licensedcode/data/rules/bsd-new_678.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE
diff --git a/src/licensedcode/data/rules/bsd-new_679.RULE b/src/licensedcode/data/rules/bsd-new_679.RULE
index 8d2b3d50166..341338c9bd3 100644
--- a/src/licensedcode/data/rules/bsd-new_679.RULE
+++ b/src/licensedcode/data/rules/bsd-new_679.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
New BSD License
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_679.yml b/src/licensedcode/data/rules/bsd-new_679.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_679.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_68.RULE b/src/licensedcode/data/rules/bsd-new_68.RULE
index 1c99fffcc21..b68a0f0dd4e 100644
--- a/src/licensedcode/data/rules/bsd-new_68.RULE
+++ b/src/licensedcode/data/rules/bsd-new_68.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -20,4 +25,4 @@ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_68.yml b/src/licensedcode/data/rules/bsd-new_68.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_68.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_680.RULE b/src/licensedcode/data/rules/bsd-new_680.RULE
index c462d42fa15..352d9edbab8 100644
--- a/src/licensedcode/data/rules/bsd-new_680.RULE
+++ b/src/licensedcode/data/rules/bsd-new_680.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
Contributions will be licensed under the [3-clause BSD license]
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_680.yml b/src/licensedcode/data/rules/bsd-new_680.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_680.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_681.RULE b/src/licensedcode/data/rules/bsd-new_681.RULE
index 0dd66252736..3aa063b9c9c 100644
--- a/src/licensedcode/data/rules/bsd-new_681.RULE
+++ b/src/licensedcode/data/rules/bsd-new_681.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
licensed under the [3-clause BSD license]
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_681.yml b/src/licensedcode/data/rules/bsd-new_681.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_681.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_682.RULE b/src/licensedcode/data/rules/bsd-new_682.RULE
index 4b49e7f3c2f..03873c5c912 100644
--- a/src/licensedcode/data/rules/bsd-new_682.RULE
+++ b/src/licensedcode/data/rules/bsd-new_682.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
under the [3-clause BSD license]
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_682.yml b/src/licensedcode/data/rules/bsd-new_682.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_682.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_683.RULE b/src/licensedcode/data/rules/bsd-new_683.RULE
index f6e41cf9d0d..af127c68dd8 100644
--- a/src/licensedcode/data/rules/bsd-new_683.RULE
+++ b/src/licensedcode/data/rules/bsd-new_683.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_683.yml b/src/licensedcode/data/rules/bsd-new_683.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_683.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_684.RULE b/src/licensedcode/data/rules/bsd-new_684.RULE
index 6d14faf4f3f..f324357faeb 100644
--- a/src/licensedcode/data/rules/bsd-new_684.RULE
+++ b/src/licensedcode/data/rules/bsd-new_684.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_684.yml b/src/licensedcode/data/rules/bsd-new_684.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_684.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_685.RULE b/src/licensedcode/data/rules/bsd-new_685.RULE
index 23fc31d519e..97ce353735a 100644
--- a/src/licensedcode/data/rules/bsd-new_685.RULE
+++ b/src/licensedcode/data/rules/bsd-new_685.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+minimum_coverage: 100
+---
+
license
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
diff --git a/src/licensedcode/data/rules/bsd-new_685.yml b/src/licensedcode/data/rules/bsd-new_685.yml
deleted file mode 100644
index 86ff9df55e2..00000000000
--- a/src/licensedcode/data/rules/bsd-new_685.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
-minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/bsd-new_686.RULE b/src/licensedcode/data/rules/bsd-new_686.RULE
index ea99c56d1fe..1930a4058b6 100644
--- a/src/licensedcode/data/rules/bsd-new_686.RULE
+++ b/src/licensedcode/data/rules/bsd-new_686.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the
following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_686.yml b/src/licensedcode/data/rules/bsd-new_686.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_686.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_687.RULE b/src/licensedcode/data/rules/bsd-new_687.RULE
index 523d445d7d2..014029a9bad 100644
--- a/src/licensedcode/data/rules/bsd-new_687.RULE
+++ b/src/licensedcode/data/rules/bsd-new_687.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+minimum_coverage: 80
+---
+
{{license
Redistribution and use in source and binary forms}}, with or
without modification, are permitted provided that the
@@ -29,4 +36,4 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_687.yml b/src/licensedcode/data/rules/bsd-new_687.yml
deleted file mode 100644
index 4e9289a55c5..00000000000
--- a/src/licensedcode/data/rules/bsd-new_687.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
-minimum_coverage: 80
diff --git a/src/licensedcode/data/rules/bsd-new_688.RULE b/src/licensedcode/data/rules/bsd-new_688.RULE
index cef1b34ae4d..9e536bbd573 100644
--- a/src/licensedcode/data/rules/bsd-new_688.RULE
+++ b/src/licensedcode/data/rules/bsd-new_688.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
BSD License
diff --git a/src/licensedcode/data/rules/bsd-new_688.yml b/src/licensedcode/data/rules/bsd-new_688.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_688.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_689.RULE b/src/licensedcode/data/rules/bsd-new_689.RULE
index 0ac205da463..52454a5197c 100644
--- a/src/licensedcode/data/rules/bsd-new_689.RULE
+++ b/src/licensedcode/data/rules/bsd-new_689.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 90
+---
+
This is release under the BSD license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_689.yml b/src/licensedcode/data/rules/bsd-new_689.yml
deleted file mode 100644
index 60b23857636..00000000000
--- a/src/licensedcode/data/rules/bsd-new_689.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 90
diff --git a/src/licensedcode/data/rules/bsd-new_69.RULE b/src/licensedcode/data/rules/bsd-new_69.RULE
index 120dcbabe39..d617abe3fc3 100644
--- a/src/licensedcode/data/rules/bsd-new_69.RULE
+++ b/src/licensedcode/data/rules/bsd-new_69.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+minimum_coverage: 85
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
diff --git a/src/licensedcode/data/rules/bsd-new_69.yml b/src/licensedcode/data/rules/bsd-new_69.yml
deleted file mode 100644
index ef50c898bae..00000000000
--- a/src/licensedcode/data/rules/bsd-new_69.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-minimum_coverage: 85
diff --git a/src/licensedcode/data/rules/bsd-new_690.RULE b/src/licensedcode/data/rules/bsd-new_690.RULE
index ee9e95a1677..bc9f3147e87 100644
--- a/src/licensedcode/data/rules/bsd-new_690.RULE
+++ b/src/licensedcode/data/rules/bsd-new_690.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
diff --git a/src/licensedcode/data/rules/bsd-new_690.yml b/src/licensedcode/data/rules/bsd-new_690.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_690.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_691.RULE b/src/licensedcode/data/rules/bsd-new_691.RULE
index 87241658b83..999044a9f45 100644
--- a/src/licensedcode/data/rules/bsd-new_691.RULE
+++ b/src/licensedcode/data/rules/bsd-new_691.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
diff --git a/src/licensedcode/data/rules/bsd-new_691.yml b/src/licensedcode/data/rules/bsd-new_691.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_691.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_692.RULE b/src/licensedcode/data/rules/bsd-new_692.RULE
index 03612b22844..8f6c47fca1f 100644
--- a/src/licensedcode/data/rules/bsd-new_692.RULE
+++ b/src/licensedcode/data/rules/bsd-new_692.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
diff --git a/src/licensedcode/data/rules/bsd-new_692.yml b/src/licensedcode/data/rules/bsd-new_692.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_692.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_693.RULE b/src/licensedcode/data/rules/bsd-new_693.RULE
index 833544c3f16..68ff36b2139 100644
--- a/src/licensedcode/data/rules/bsd-new_693.RULE
+++ b/src/licensedcode/data/rules/bsd-new_693.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
diff --git a/src/licensedcode/data/rules/bsd-new_693.yml b/src/licensedcode/data/rules/bsd-new_693.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_693.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_694.RULE b/src/licensedcode/data/rules/bsd-new_694.RULE
index cadd0077a2d..8e0b6fa7206 100644
--- a/src/licensedcode/data/rules/bsd-new_694.RULE
+++ b/src/licensedcode/data/rules/bsd-new_694.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
diff --git a/src/licensedcode/data/rules/bsd-new_694.yml b/src/licensedcode/data/rules/bsd-new_694.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_694.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_695.RULE b/src/licensedcode/data/rules/bsd-new_695.RULE
index 6aeaf78a82a..45d1462a4f9 100644
--- a/src/licensedcode/data/rules/bsd-new_695.RULE
+++ b/src/licensedcode/data/rules/bsd-new_695.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+minimum_coverage: 90
+notes: an odd formatting of a bsd from Adobe
+---
+
%Copyright: Redistribution and use in source and binary forms, with or
%Copyright: without modification, are permitted provided that the
%Copyright: following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_695.yml b/src/licensedcode/data/rules/bsd-new_695.yml
deleted file mode 100644
index a46eb96e98d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_695.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-minimum_coverage: 90
-notes: an odd formatting of a bsd from Adobe
diff --git a/src/licensedcode/data/rules/bsd-new_696.RULE b/src/licensedcode/data/rules/bsd-new_696.RULE
index 2cbdb228f98..1b4b532a7a8 100644
--- a/src/licensedcode/data/rules/bsd-new_696.RULE
+++ b/src/licensedcode/data/rules/bsd-new_696.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE
+---
+
Released under the BSD-style license that can
be found in Go's LICENSE file.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_696.yml b/src/licensedcode/data/rules/bsd-new_696.yml
deleted file mode 100644
index 77fbef666ba..00000000000
--- a/src/licensedcode/data/rules/bsd-new_696.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE
diff --git a/src/licensedcode/data/rules/bsd-new_697.RULE b/src/licensedcode/data/rules/bsd-new_697.RULE
index 9e75d6a0469..9a65e98b512 100644
--- a/src/licensedcode/data/rules/bsd-new_697.RULE
+++ b/src/licensedcode/data/rules/bsd-new_697.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/src/licensedcode/data/rules/bsd-new_697.yml b/src/licensedcode/data/rules/bsd-new_697.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_697.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_698.RULE b/src/licensedcode/data/rules/bsd-new_698.RULE
index 0434eb29db5..786d3be40a8 100644
--- a/src/licensedcode/data/rules/bsd-new_698.RULE
+++ b/src/licensedcode/data/rules/bsd-new_698.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+minimum_coverage: 95
+---
+
Distribution of this font is governed by the following license. If you do not
agree to this license, including the disclaimer, do not distribute or modify
this font.
diff --git a/src/licensedcode/data/rules/bsd-new_698.yml b/src/licensedcode/data/rules/bsd-new_698.yml
deleted file mode 100644
index d29be7f06ee..00000000000
--- a/src/licensedcode/data/rules/bsd-new_698.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
-minimum_coverage: 95
diff --git a/src/licensedcode/data/rules/bsd-new_699.RULE b/src/licensedcode/data/rules/bsd-new_699.RULE
index 73b5c6d84e1..86cafb781de 100644
--- a/src/licensedcode/data/rules/bsd-new_699.RULE
+++ b/src/licensedcode/data/rules/bsd-new_699.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_699.yml b/src/licensedcode/data/rules/bsd-new_699.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_699.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_7.RULE b/src/licensedcode/data/rules/bsd-new_7.RULE
index 32ccc0edce1..a8b2b2f54ac 100644
--- a/src/licensedcode/data/rules/bsd-new_7.RULE
+++ b/src/licensedcode/data/rules/bsd-new_7.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_7.yml b/src/licensedcode/data/rules/bsd-new_7.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_7.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_70.RULE b/src/licensedcode/data/rules/bsd-new_70.RULE
index 31a616a286f..01bc8b7eb97 100644
--- a/src/licensedcode/data/rules/bsd-new_70.RULE
+++ b/src/licensedcode/data/rules/bsd-new_70.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+notes: NASA variant
+---
+
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_70.yml b/src/licensedcode/data/rules/bsd-new_70.yml
deleted file mode 100644
index 712f6ae1547..00000000000
--- a/src/licensedcode/data/rules/bsd-new_70.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-notes: NASA variant
diff --git a/src/licensedcode/data/rules/bsd-new_700.RULE b/src/licensedcode/data/rules/bsd-new_700.RULE
index 4bc1ae5578e..89ed4f61ae9 100644
--- a/src/licensedcode/data/rules/bsd-new_700.RULE
+++ b/src/licensedcode/data/rules/bsd-new_700.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
The framework is free software. It is released under the terms of
the following BSD License.
diff --git a/src/licensedcode/data/rules/bsd-new_700.yml b/src/licensedcode/data/rules/bsd-new_700.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_700.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_701.RULE b/src/licensedcode/data/rules/bsd-new_701.RULE
index 10569befe90..c3bfab64818 100644
--- a/src/licensedcode/data/rules/bsd-new_701.RULE
+++ b/src/licensedcode/data/rules/bsd-new_701.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
// Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met:
//
diff --git a/src/licensedcode/data/rules/bsd-new_701.yml b/src/licensedcode/data/rules/bsd-new_701.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_701.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_702.RULE b/src/licensedcode/data/rules/bsd-new_702.RULE
index 97ee7437185..37afea8cdda 100644
--- a/src/licensedcode/data/rules/bsd-new_702.RULE
+++ b/src/licensedcode/data/rules/bsd-new_702.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
// Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met:
//
diff --git a/src/licensedcode/data/rules/bsd-new_702.yml b/src/licensedcode/data/rules/bsd-new_702.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_702.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_703.RULE b/src/licensedcode/data/rules/bsd-new_703.RULE
index eb57c5ebfcf..3cdef61e707 100644
--- a/src/licensedcode/data/rules/bsd-new_703.RULE
+++ b/src/licensedcode/data/rules/bsd-new_703.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+---
+
licensed under the BSD License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_703.yml b/src/licensedcode/data/rules/bsd-new_703.yml
deleted file mode 100644
index e55e499970e..00000000000
--- a/src/licensedcode/data/rules/bsd-new_703.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_704.RULE b/src/licensedcode/data/rules/bsd-new_704.RULE
index f6a73f5fe0c..03406647141 100644
--- a/src/licensedcode/data/rules/bsd-new_704.RULE
+++ b/src/licensedcode/data/rules/bsd-new_704.RULE
@@ -1 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE
+notes: reported by Luis Villa
+---
+
BSD 3-Clause license; see LICENSE file.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_704.yml b/src/licensedcode/data/rules/bsd-new_704.yml
deleted file mode 100644
index 791ad276fac..00000000000
--- a/src/licensedcode/data/rules/bsd-new_704.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE
-notes: reported by Luis Villa
diff --git a/src/licensedcode/data/rules/bsd-new_705.RULE b/src/licensedcode/data/rules/bsd-new_705.RULE
index e4ef4155e88..3ef54ddf3fd 100644
--- a/src/licensedcode/data/rules/bsd-new_705.RULE
+++ b/src/licensedcode/data/rules/bsd-new_705.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 90
+---
+
Berkeley-style Licenses
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_705.yml b/src/licensedcode/data/rules/bsd-new_705.yml
deleted file mode 100644
index ac2f9af367d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_705.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 90
diff --git a/src/licensedcode/data/rules/bsd-new_706.RULE b/src/licensedcode/data/rules/bsd-new_706.RULE
index c2ceed8de28..4991d66af4d 100644
--- a/src/licensedcode/data/rules/bsd-new_706.RULE
+++ b/src/licensedcode/data/rules/bsd-new_706.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
3-Clause BSD License (the revised BSD license)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_706.yml b/src/licensedcode/data/rules/bsd-new_706.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_706.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_707.RULE b/src/licensedcode/data/rules/bsd-new_707.RULE
index b1a9014e81f..6da78cdda29 100644
--- a/src/licensedcode/data/rules/bsd-new_707.RULE
+++ b/src/licensedcode/data/rules/bsd-new_707.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 90
+---
+
(the revised BSD license)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_707.yml b/src/licensedcode/data/rules/bsd-new_707.yml
deleted file mode 100644
index ac2f9af367d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_707.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 90
diff --git a/src/licensedcode/data/rules/bsd-new_708.RULE b/src/licensedcode/data/rules/bsd-new_708.RULE
index d4a2f06d414..af83c027b15 100644
--- a/src/licensedcode/data/rules/bsd-new_708.RULE
+++ b/src/licensedcode/data/rules/bsd-new_708.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 90
+---
+
revised BSD license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_708.yml b/src/licensedcode/data/rules/bsd-new_708.yml
deleted file mode 100644
index ac2f9af367d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_708.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 90
diff --git a/src/licensedcode/data/rules/bsd-new_709.RULE b/src/licensedcode/data/rules/bsd-new_709.RULE
index b4c39a52399..143060ded85 100644
--- a/src/licensedcode/data/rules/bsd-new_709.RULE
+++ b/src/licensedcode/data/rules/bsd-new_709.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+referenced_filenames:
+ - LICENSED.BSD
+---
+
* This program is licensed under the BSD license, read LICENSE.BSD
* for further information
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_709.yml b/src/licensedcode/data/rules/bsd-new_709.yml
deleted file mode 100644
index 6eeb424a7de..00000000000
--- a/src/licensedcode/data/rules/bsd-new_709.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-referenced_filenames:
- - LICENSED.BSD
diff --git a/src/licensedcode/data/rules/bsd-new_71.RULE b/src/licensedcode/data/rules/bsd-new_71.RULE
index f3361c3b3f9..a2ef280255b 100644
--- a/src/licensedcode/data/rules/bsd-new_71.RULE
+++ b/src/licensedcode/data/rules/bsd-new_71.RULE
@@ -1 +1,10 @@
-License: BSD (see docs/LICENSE for details)
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 99
+referenced_filenames:
+ - docs/LICENSE
+notes: very short mention
+---
+
+License: BSD (see docs/LICENSE for details)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_71.yml b/src/licensedcode/data/rules/bsd-new_71.yml
deleted file mode 100644
index 8b1db5bfbab..00000000000
--- a/src/licensedcode/data/rules/bsd-new_71.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 99
-referenced_filenames:
- - docs/LICENSE
-notes: very short mention
diff --git a/src/licensedcode/data/rules/bsd-new_710.RULE b/src/licensedcode/data/rules/bsd-new_710.RULE
index c00c477834f..a8275ec5308 100644
--- a/src/licensedcode/data/rules/bsd-new_710.RULE
+++ b/src/licensedcode/data/rules/bsd-new_710.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+ignorable_urls:
+ - http://www.opensource.org/licenses/bsd-license.php
+---
+
BSD license without advertising clause. (see
http://www.opensource.org/licenses/bsd-license.php for further details)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_710.yml b/src/licensedcode/data/rules/bsd-new_710.yml
deleted file mode 100644
index 9179a28ecea..00000000000
--- a/src/licensedcode/data/rules/bsd-new_710.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-ignorable_urls:
- - http://www.opensource.org/licenses/bsd-license.php
diff --git a/src/licensedcode/data/rules/bsd-new_711.RULE b/src/licensedcode/data/rules/bsd-new_711.RULE
index 7447b4e0ff4..c3f277e0917 100644
--- a/src/licensedcode/data/rules/bsd-new_711.RULE
+++ b/src/licensedcode/data/rules/bsd-new_711.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE
+---
+
which is released under the Revised BSD License
# See file LICENSE for full license details.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_711.yml b/src/licensedcode/data/rules/bsd-new_711.yml
deleted file mode 100644
index 77fbef666ba..00000000000
--- a/src/licensedcode/data/rules/bsd-new_711.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE
diff --git a/src/licensedcode/data/rules/bsd-new_712.RULE b/src/licensedcode/data/rules/bsd-new_712.RULE
index 6a6891912b5..48afc13b236 100644
--- a/src/licensedcode/data/rules/bsd-new_712.RULE
+++ b/src/licensedcode/data/rules/bsd-new_712.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/src/licensedcode/data/rules/bsd-new_712.yml b/src/licensedcode/data/rules/bsd-new_712.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_712.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_713.RULE b/src/licensedcode/data/rules/bsd-new_713.RULE
index fcac9f3ed40..b6cba81061b 100644
--- a/src/licensedcode/data/rules/bsd-new_713.RULE
+++ b/src/licensedcode/data/rules/bsd-new_713.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE
+---
+
is licensed under the BSD 3-clause “New” or “Revised”. License See LICENSE for the full license text.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_713.yml b/src/licensedcode/data/rules/bsd-new_713.yml
deleted file mode 100644
index 77fbef666ba..00000000000
--- a/src/licensedcode/data/rules/bsd-new_713.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE
diff --git a/src/licensedcode/data/rules/bsd-new_714.RULE b/src/licensedcode/data/rules/bsd-new_714.RULE
index 7ceef777f76..786d19a7c3d 100644
--- a/src/licensedcode/data/rules/bsd-new_714.RULE
+++ b/src/licensedcode/data/rules/bsd-new_714.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
(This is the OSI approved 3-clause "New BSD License".)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_714.yml b/src/licensedcode/data/rules/bsd-new_714.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_714.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_715.RULE b/src/licensedcode/data/rules/bsd-new_715.RULE
index 5988d43e737..294231552fd 100644
--- a/src/licensedcode/data/rules/bsd-new_715.RULE
+++ b/src/licensedcode/data/rules/bsd-new_715.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
OSI approved 3-clause "New BSD License"
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_715.yml b/src/licensedcode/data/rules/bsd-new_715.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_715.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_716.RULE b/src/licensedcode/data/rules/bsd-new_716.RULE
index 8ec62bb2e0b..924cadd65db 100644
--- a/src/licensedcode/data/rules/bsd-new_716.RULE
+++ b/src/licensedcode/data/rules/bsd-new_716.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
3-clause "New BSD License"
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_716.yml b/src/licensedcode/data/rules/bsd-new_716.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_716.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_717.RULE b/src/licensedcode/data/rules/bsd-new_717.RULE
index 50d0a5373a0..e51828a257b 100644
--- a/src/licensedcode/data/rules/bsd-new_717.RULE
+++ b/src/licensedcode/data/rules/bsd-new_717.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
licensed under BSD-like 3-clause license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_717.yml b/src/licensedcode/data/rules/bsd-new_717.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_717.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_718.RULE b/src/licensedcode/data/rules/bsd-new_718.RULE
index d44411a2362..d874ae09c42 100644
--- a/src/licensedcode/data/rules/bsd-new_718.RULE
+++ b/src/licensedcode/data/rules/bsd-new_718.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
diff --git a/src/licensedcode/data/rules/bsd-new_718.yml b/src/licensedcode/data/rules/bsd-new_718.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_718.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_719.RULE b/src/licensedcode/data/rules/bsd-new_719.RULE
index e890d7f5826..6d48cfa9f86 100644
--- a/src/licensedcode/data/rules/bsd-new_719.RULE
+++ b/src/licensedcode/data/rules/bsd-new_719.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+---
+
licensed BSD-style license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_719.yml b/src/licensedcode/data/rules/bsd-new_719.yml
deleted file mode 100644
index e55e499970e..00000000000
--- a/src/licensedcode/data/rules/bsd-new_719.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_72.RULE b/src/licensedcode/data/rules/bsd-new_72.RULE
index 93a396a393d..4b77f1b3127 100644
--- a/src/licensedcode/data/rules/bsd-new_72.RULE
+++ b/src/licensedcode/data/rules/bsd-new_72.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+---
+
Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer.
@@ -18,4 +23,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_72.yml b/src/licensedcode/data/rules/bsd-new_72.yml
deleted file mode 100644
index 95b560346de..00000000000
--- a/src/licensedcode/data/rules/bsd-new_72.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
diff --git a/src/licensedcode/data/rules/bsd-new_720.RULE b/src/licensedcode/data/rules/bsd-new_720.RULE
index daa416fb5b7..99c248f25d8 100644
--- a/src/licensedcode/data/rules/bsd-new_720.RULE
+++ b/src/licensedcode/data/rules/bsd-new_720.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 95
+---
+
/* This code is originally from Tor. Used with permission. */
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_720.yml b/src/licensedcode/data/rules/bsd-new_720.yml
deleted file mode 100644
index 6c859fb2e84..00000000000
--- a/src/licensedcode/data/rules/bsd-new_720.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 95
diff --git a/src/licensedcode/data/rules/bsd-new_721.RULE b/src/licensedcode/data/rules/bsd-new_721.RULE
index 67882463b00..bf67171175d 100644
--- a/src/licensedcode/data/rules/bsd-new_721.RULE
+++ b/src/licensedcode/data/rules/bsd-new_721.RULE
@@ -1,2 +1,8 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
Tor is distributed under the "3-clause BSD" license, a commonly used
software license that means Tor is both free software and open source:
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_721.yml b/src/licensedcode/data/rules/bsd-new_721.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_721.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_722.RULE b/src/licensedcode/data/rules/bsd-new_722.RULE
index 4a65abbd93e..522dca2a11f 100644
--- a/src/licensedcode/data/rules/bsd-new_722.RULE
+++ b/src/licensedcode/data/rules/bsd-new_722.RULE
@@ -1,2 +1,12 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+minimum_coverage: 80
+referenced_filenames:
+ - LICENSE
+notes: See https://github.com/nexB/scancode-toolkit/issues/2171
+---
+
# This software may be modified and distributed under the terms
# of the BSD license. See the LICENSE file for details.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_722.yml b/src/licensedcode/data/rules/bsd-new_722.yml
deleted file mode 100644
index 9136d165ec0..00000000000
--- a/src/licensedcode/data/rules/bsd-new_722.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-minimum_coverage: 80
-referenced_filenames:
- - LICENSE
-notes: See https://github.com/nexB/scancode-toolkit/issues/2171
diff --git a/src/licensedcode/data/rules/bsd-new_723.RULE b/src/licensedcode/data/rules/bsd-new_723.RULE
index 93bc879bcb9..27542385617 100644
--- a/src/licensedcode/data/rules/bsd-new_723.RULE
+++ b/src/licensedcode/data/rules/bsd-new_723.RULE
@@ -1,2 +1,9 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+notes: See https://github.com/nexB/scancode-toolkit/issues/2171
+---
+
# This software may be modified and distributed under the terms
# of the BSD license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_723.yml b/src/licensedcode/data/rules/bsd-new_723.yml
deleted file mode 100644
index 3fcb14a0041..00000000000
--- a/src/licensedcode/data/rules/bsd-new_723.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-notes: See https://github.com/nexB/scancode-toolkit/issues/2171
diff --git a/src/licensedcode/data/rules/bsd-new_724.RULE b/src/licensedcode/data/rules/bsd-new_724.RULE
index ce60e2a8d6a..6691a283df1 100644
--- a/src/licensedcode/data/rules/bsd-new_724.RULE
+++ b/src/licensedcode/data/rules/bsd-new_724.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+referenced_filenames:
+ - COPYING
+---
+
* This software may be modified and distributed under the terms of
* a BSD-style license. See the COPYING file in the package base
* directory for details.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_724.yml b/src/licensedcode/data/rules/bsd-new_724.yml
deleted file mode 100644
index fc53b599889..00000000000
--- a/src/licensedcode/data/rules/bsd-new_724.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-referenced_filenames:
- - COPYING
diff --git a/src/licensedcode/data/rules/bsd-new_725.RULE b/src/licensedcode/data/rules/bsd-new_725.RULE
index 1f2b20388b8..7d24e3d4888 100644
--- a/src/licensedcode/data/rules/bsd-new_725.RULE
+++ b/src/licensedcode/data/rules/bsd-new_725.RULE
@@ -1,2 +1,8 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+---
+
* This software may be modified and distributed under the terms of
* a BSD-style license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_725.yml b/src/licensedcode/data/rules/bsd-new_725.yml
deleted file mode 100644
index e55e499970e..00000000000
--- a/src/licensedcode/data/rules/bsd-new_725.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_726.RULE b/src/licensedcode/data/rules/bsd-new_726.RULE
index fc124e6b188..2df62d5ad0f 100644
--- a/src/licensedcode/data/rules/bsd-new_726.RULE
+++ b/src/licensedcode/data/rules/bsd-new_726.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+referenced_filenames:
+ - LICENSE.txt
+---
+
* This software may be modified and distributed under the terms
* of the BSD license. See the LICENSE.txt file for details.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_726.yml b/src/licensedcode/data/rules/bsd-new_726.yml
deleted file mode 100644
index f8fd8d4728c..00000000000
--- a/src/licensedcode/data/rules/bsd-new_726.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-referenced_filenames:
- - LICENSE.txt
diff --git a/src/licensedcode/data/rules/bsd-new_727.RULE b/src/licensedcode/data/rules/bsd-new_727.RULE
index 598b6d7356a..a7afd1157a6 100644
--- a/src/licensedcode/data/rules/bsd-new_727.RULE
+++ b/src/licensedcode/data/rules/bsd-new_727.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE
+---
+
* This software may be modified and distributed under the terms
* of the BSD 3-clause license. See the LICENSE file for details.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_727.yml b/src/licensedcode/data/rules/bsd-new_727.yml
deleted file mode 100644
index 77fbef666ba..00000000000
--- a/src/licensedcode/data/rules/bsd-new_727.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE
diff --git a/src/licensedcode/data/rules/bsd-new_728.RULE b/src/licensedcode/data/rules/bsd-new_728.RULE
index 978f2e54acc..9c3713c7419 100644
--- a/src/licensedcode/data/rules/bsd-new_728.RULE
+++ b/src/licensedcode/data/rules/bsd-new_728.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE
+---
+
* This software may be modified and distributed under the terms
* of the 3-clause BSD license. See the LICENSE file for details.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_728.yml b/src/licensedcode/data/rules/bsd-new_728.yml
deleted file mode 100644
index 77fbef666ba..00000000000
--- a/src/licensedcode/data/rules/bsd-new_728.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE
diff --git a/src/licensedcode/data/rules/bsd-new_729.RULE b/src/licensedcode/data/rules/bsd-new_729.RULE
index 7cd6cdd5951..d30791a145f 100644
--- a/src/licensedcode/data/rules/bsd-new_729.RULE
+++ b/src/licensedcode/data/rules/bsd-new_729.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE.txt
+---
+
* This software may be modified and distributed under the terms
* of the BSD 3-Clause license. See the LICENSE.txt file for details.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_729.yml b/src/licensedcode/data/rules/bsd-new_729.yml
deleted file mode 100644
index 9eae0edd739..00000000000
--- a/src/licensedcode/data/rules/bsd-new_729.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE.txt
diff --git a/src/licensedcode/data/rules/bsd-new_73.RULE b/src/licensedcode/data/rules/bsd-new_73.RULE
index 44690261c9e..66605ff3388 100644
--- a/src/licensedcode/data/rules/bsd-new_73.RULE
+++ b/src/licensedcode/data/rules/bsd-new_73.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_73.yml b/src/licensedcode/data/rules/bsd-new_73.yml
deleted file mode 100644
index 95b560346de..00000000000
--- a/src/licensedcode/data/rules/bsd-new_73.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
diff --git a/src/licensedcode/data/rules/bsd-new_730.RULE b/src/licensedcode/data/rules/bsd-new_730.RULE
index 4b28a79aa3e..c037a28f12c 100644
--- a/src/licensedcode/data/rules/bsd-new_730.RULE
+++ b/src/licensedcode/data/rules/bsd-new_730.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE
+---
+
# This software may be modified and distributed under the terms of the
# BSD-3-Clause license. See the accompanying LICENSE file for details.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_730.yml b/src/licensedcode/data/rules/bsd-new_730.yml
deleted file mode 100644
index 77fbef666ba..00000000000
--- a/src/licensedcode/data/rules/bsd-new_730.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE
diff --git a/src/licensedcode/data/rules/bsd-new_731.RULE b/src/licensedcode/data/rules/bsd-new_731.RULE
index 3eb50e35072..b52a0d11c53 100644
--- a/src/licensedcode/data/rules/bsd-new_731.RULE
+++ b/src/licensedcode/data/rules/bsd-new_731.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
BSD License
This section pertains to the “three-clause” or “new” BSD license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_731.yml b/src/licensedcode/data/rules/bsd-new_731.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_731.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_732.RULE b/src/licensedcode/data/rules/bsd-new_732.RULE
index c8d18ddf408..465ec92c86a 100644
--- a/src/licensedcode/data/rules/bsd-new_732.RULE
+++ b/src/licensedcode/data/rules/bsd-new_732.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
diff --git a/src/licensedcode/data/rules/bsd-new_732.yml b/src/licensedcode/data/rules/bsd-new_732.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_732.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_733.RULE b/src/licensedcode/data/rules/bsd-new_733.RULE
index fed943fc5af..db84d3f6482 100644
--- a/src/licensedcode/data/rules/bsd-new_733.RULE
+++ b/src/licensedcode/data/rules/bsd-new_733.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
diff --git a/src/licensedcode/data/rules/bsd-new_733.yml b/src/licensedcode/data/rules/bsd-new_733.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_733.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_734.RULE b/src/licensedcode/data/rules/bsd-new_734.RULE
index 2314d1c7df8..244ca5cbe4f 100644
--- a/src/licensedcode/data/rules/bsd-new_734.RULE
+++ b/src/licensedcode/data/rules/bsd-new_734.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+minimum_coverage: 96
+---
+
BSD License
Redistribution and use in source and binary forms, with or without
diff --git a/src/licensedcode/data/rules/bsd-new_734.yml b/src/licensedcode/data/rules/bsd-new_734.yml
deleted file mode 100644
index 4ad43a31b61..00000000000
--- a/src/licensedcode/data/rules/bsd-new_734.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
-minimum_coverage: 96
diff --git a/src/licensedcode/data/rules/bsd-new_735.RULE b/src/licensedcode/data/rules/bsd-new_735.RULE
index 54fa2d4b31d..a073c08e62d 100644
--- a/src/licensedcode/data/rules/bsd-new_735.RULE
+++ b/src/licensedcode/data/rules/bsd-new_735.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE.md
+---
+
Licensed under a 3-clause BSD style license - see LICENSE.md
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_735.yml b/src/licensedcode/data/rules/bsd-new_735.yml
deleted file mode 100644
index da51bf4d915..00000000000
--- a/src/licensedcode/data/rules/bsd-new_735.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE.md
diff --git a/src/licensedcode/data/rules/bsd-new_736.RULE b/src/licensedcode/data/rules/bsd-new_736.RULE
index 6cbd726411d..46e0257c855 100644
--- a/src/licensedcode/data/rules/bsd-new_736.RULE
+++ b/src/licensedcode/data/rules/bsd-new_736.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 80
+---
+
License: BSD derived
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_736.yml b/src/licensedcode/data/rules/bsd-new_736.yml
deleted file mode 100644
index 40d734736e2..00000000000
--- a/src/licensedcode/data/rules/bsd-new_736.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 80
diff --git a/src/licensedcode/data/rules/bsd-new_737.RULE b/src/licensedcode/data/rules/bsd-new_737.RULE
index be31c5de8a1..e159ae1e33f 100644
--- a/src/licensedcode/data/rules/bsd-new_737.RULE
+++ b/src/licensedcode/data/rules/bsd-new_737.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
Licensed under a 3-clause BSD style license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_737.yml b/src/licensedcode/data/rules/bsd-new_737.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_737.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_738.RULE b/src/licensedcode/data/rules/bsd-new_738.RULE
index b0ea10bbd01..c12a8206e62 100644
--- a/src/licensedcode/data/rules/bsd-new_738.RULE
+++ b/src/licensedcode/data/rules/bsd-new_738.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
Release is covered under the terms of the Eclipse Distribution License v. 1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_738.yml b/src/licensedcode/data/rules/bsd-new_738.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_738.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_739.RULE b/src/licensedcode/data/rules/bsd-new_739.RULE
index 1e24112029e..00d3ede490f 100644
--- a/src/licensedcode/data/rules/bsd-new_739.RULE
+++ b/src/licensedcode/data/rules/bsd-new_739.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://www.eclipse.org/org/documents/edl-v10.php
+---
+
This program and the accompanying materials are made available
under the terms of the Eclipse Distribution License v1.0 which
accompanies this distribution, is reproduced below, and is
diff --git a/src/licensedcode/data/rules/bsd-new_739.yml b/src/licensedcode/data/rules/bsd-new_739.yml
deleted file mode 100644
index a0fc1ccbfbb..00000000000
--- a/src/licensedcode/data/rules/bsd-new_739.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://www.eclipse.org/org/documents/edl-v10.php
diff --git a/src/licensedcode/data/rules/bsd-new_74.RULE b/src/licensedcode/data/rules/bsd-new_74.RULE
index a4d3ab2b04c..8e78791816b 100644
--- a/src/licensedcode/data/rules/bsd-new_74.RULE
+++ b/src/licensedcode/data/rules/bsd-new_74.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
Redistribution and use in source and binary forms of the software as well
as documentation, with or without modification, are permitted provided
that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_74.yml b/src/licensedcode/data/rules/bsd-new_74.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_74.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_740.RULE b/src/licensedcode/data/rules/bsd-new_740.RULE
index 8bcd17914b4..9f3dd088ae4 100644
--- a/src/licensedcode/data/rules/bsd-new_740.RULE
+++ b/src/licensedcode/data/rules/bsd-new_740.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://www.eclipse.org/org/documents/edl-v10.php
+---
+
This program and the accompanying materials are made available
under the terms of the Eclipse Distribution License v1.0 which
accompanies this distribution, is reproduced below, and is
diff --git a/src/licensedcode/data/rules/bsd-new_740.yml b/src/licensedcode/data/rules/bsd-new_740.yml
deleted file mode 100644
index 75fe5f313e4..00000000000
--- a/src/licensedcode/data/rules/bsd-new_740.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://www.eclipse.org/org/documents/edl-v10.php
diff --git a/src/licensedcode/data/rules/bsd-new_741.RULE b/src/licensedcode/data/rules/bsd-new_741.RULE
index 57250b5b08d..4855e5189ad 100644
--- a/src/licensedcode/data/rules/bsd-new_741.RULE
+++ b/src/licensedcode/data/rules/bsd-new_741.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://www.eclipse.org/org/documents/edl-v10.html
+---
+
This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
diff --git a/src/licensedcode/data/rules/bsd-new_741.yml b/src/licensedcode/data/rules/bsd-new_741.yml
deleted file mode 100644
index 31469bcbf49..00000000000
--- a/src/licensedcode/data/rules/bsd-new_741.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://www.eclipse.org/org/documents/edl-v10.html
diff --git a/src/licensedcode/data/rules/bsd-new_742.RULE b/src/licensedcode/data/rules/bsd-new_742.RULE
index 90c21276857..713c3585f4c 100644
--- a/src/licensedcode/data/rules/bsd-new_742.RULE
+++ b/src/licensedcode/data/rules/bsd-new_742.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://www.eclipse.org/org/documents/edl-v10.html
+---
+
This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
diff --git a/src/licensedcode/data/rules/bsd-new_742.yml b/src/licensedcode/data/rules/bsd-new_742.yml
deleted file mode 100644
index 72dd6c8d162..00000000000
--- a/src/licensedcode/data/rules/bsd-new_742.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://www.eclipse.org/org/documents/edl-v10.html
diff --git a/src/licensedcode/data/rules/bsd-new_743.RULE b/src/licensedcode/data/rules/bsd-new_743.RULE
index bd83c53155d..a036a0a8b4b 100644
--- a/src/licensedcode/data/rules/bsd-new_743.RULE
+++ b/src/licensedcode/data/rules/bsd-new_743.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://www.eclipse.org/org/documents/edl-v10.php
+---
+
License: EDL-1
This program and the accompanying materials are made available
under the terms of the Eclipse Distribution License v1.0 which
diff --git a/src/licensedcode/data/rules/bsd-new_743.yml b/src/licensedcode/data/rules/bsd-new_743.yml
deleted file mode 100644
index a0fc1ccbfbb..00000000000
--- a/src/licensedcode/data/rules/bsd-new_743.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://www.eclipse.org/org/documents/edl-v10.php
diff --git a/src/licensedcode/data/rules/bsd-new_744.RULE b/src/licensedcode/data/rules/bsd-new_744.RULE
index bbe81b8360e..aafec760925 100644
--- a/src/licensedcode/data/rules/bsd-new_744.RULE
+++ b/src/licensedcode/data/rules/bsd-new_744.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://www.eclipse.org/org/documents/edl-v10.php
+---
+
License: EDL-1
This program and the accompanying materials are made available
under the terms of the Eclipse Distribution License v1.0 which
diff --git a/src/licensedcode/data/rules/bsd-new_744.yml b/src/licensedcode/data/rules/bsd-new_744.yml
deleted file mode 100644
index 75fe5f313e4..00000000000
--- a/src/licensedcode/data/rules/bsd-new_744.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://www.eclipse.org/org/documents/edl-v10.php
diff --git a/src/licensedcode/data/rules/bsd-new_745.RULE b/src/licensedcode/data/rules/bsd-new_745.RULE
index d8ec60e9d83..bf619974c62 100644
--- a/src/licensedcode/data/rules/bsd-new_745.RULE
+++ b/src/licensedcode/data/rules/bsd-new_745.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://www.eclipse.org/org/documents/edl-v10.html
+---
+
https://www.eclipse.org/org/documents/edl-v10.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_745.yml b/src/licensedcode/data/rules/bsd-new_745.yml
deleted file mode 100644
index 5a380c0b380..00000000000
--- a/src/licensedcode/data/rules/bsd-new_745.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://www.eclipse.org/org/documents/edl-v10.html
diff --git a/src/licensedcode/data/rules/bsd-new_746.RULE b/src/licensedcode/data/rules/bsd-new_746.RULE
index 2f40ce65ad4..fdb6efdb3ba 100644
--- a/src/licensedcode/data/rules/bsd-new_746.RULE
+++ b/src/licensedcode/data/rules/bsd-new_746.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
https://.eclipse.org/org/documents/edl-v10.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_746.yml b/src/licensedcode/data/rules/bsd-new_746.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_746.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_747.RULE b/src/licensedcode/data/rules/bsd-new_747.RULE
index 0c12f919636..d821b62d924 100644
--- a/src/licensedcode/data/rules/bsd-new_747.RULE
+++ b/src/licensedcode/data/rules/bsd-new_747.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
https://.eclipse.org/org/documents/edl-v10.php
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_747.yml b/src/licensedcode/data/rules/bsd-new_747.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_747.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_748.RULE b/src/licensedcode/data/rules/bsd-new_748.RULE
index a8150ba3856..ffa9fef5ccb 100644
--- a/src/licensedcode/data/rules/bsd-new_748.RULE
+++ b/src/licensedcode/data/rules/bsd-new_748.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
http://.eclipse.org/org/documents/edl-v10.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_748.yml b/src/licensedcode/data/rules/bsd-new_748.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_748.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_749.RULE b/src/licensedcode/data/rules/bsd-new_749.RULE
index af92bd47b7e..580da273734 100644
--- a/src/licensedcode/data/rules/bsd-new_749.RULE
+++ b/src/licensedcode/data/rules/bsd-new_749.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
http://.eclipse.org/org/documents/edl-v10.php
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_749.yml b/src/licensedcode/data/rules/bsd-new_749.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_749.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_75.RULE b/src/licensedcode/data/rules/bsd-new_75.RULE
index aea347049ea..a09f757b90a 100644
--- a/src/licensedcode/data/rules/bsd-new_75.RULE
+++ b/src/licensedcode/data/rules/bsd-new_75.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/src/licensedcode/data/rules/bsd-new_75.yml b/src/licensedcode/data/rules/bsd-new_75.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_75.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_750.RULE b/src/licensedcode/data/rules/bsd-new_750.RULE
index 002fe3b0bbe..f1b9e7acf33 100644
--- a/src/licensedcode/data/rules/bsd-new_750.RULE
+++ b/src/licensedcode/data/rules/bsd-new_750.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+---
+
eclipse.org/org/documents/edl-v10
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_750.yml b/src/licensedcode/data/rules/bsd-new_750.yml
deleted file mode 100644
index 1ea4dba5170..00000000000
--- a/src/licensedcode/data/rules/bsd-new_750.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_751.RULE b/src/licensedcode/data/rules/bsd-new_751.RULE
index 61d47d903cc..0704c5dc6b3 100644
--- a/src/licensedcode/data/rules/bsd-new_751.RULE
+++ b/src/licensedcode/data/rules/bsd-new_751.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+---
+
License: EDL-1
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_751.yml b/src/licensedcode/data/rules/bsd-new_751.yml
deleted file mode 100644
index c22575d962c..00000000000
--- a/src/licensedcode/data/rules/bsd-new_751.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_752.RULE b/src/licensedcode/data/rules/bsd-new_752.RULE
index 742b6d930f0..5d9b0087dce 100644
--- a/src/licensedcode/data/rules/bsd-new_752.RULE
+++ b/src/licensedcode/data/rules/bsd-new_752.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
diff --git a/src/licensedcode/data/rules/bsd-new_752.yml b/src/licensedcode/data/rules/bsd-new_752.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_752.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_753.RULE b/src/licensedcode/data/rules/bsd-new_753.RULE
index cd9987f0327..0ef31195dd5 100644
--- a/src/licensedcode/data/rules/bsd-new_753.RULE
+++ b/src/licensedcode/data/rules/bsd-new_753.RULE
@@ -1,3 +1,13 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+minimum_coverage: 95
+referenced_filenames:
+ - LICENSE.txt
+notes: seen in cpuinfo.py
+---
+
Permission to use, modify, and distribute this software is given under the
terms of the NumPy (BSD style) license. See LICENSE.txt that came with
this distribution for specifics.
diff --git a/src/licensedcode/data/rules/bsd-new_753.yml b/src/licensedcode/data/rules/bsd-new_753.yml
deleted file mode 100644
index 875cfefd8cd..00000000000
--- a/src/licensedcode/data/rules/bsd-new_753.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-minimum_coverage: 95
-referenced_filenames:
- - LICENSE.txt
-notes: seen in cpuinfo.py
diff --git a/src/licensedcode/data/rules/bsd-new_754.RULE b/src/licensedcode/data/rules/bsd-new_754.RULE
index 979e2a21581..36af703ae24 100644
--- a/src/licensedcode/data/rules/bsd-new_754.RULE
+++ b/src/licensedcode/data/rules/bsd-new_754.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+minimum_coverage: 95
+notes: seen in cpuinfo.py
+---
+
Permission to use, modify, and distribute this software is given under the
terms of the NumPy License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_754.yml b/src/licensedcode/data/rules/bsd-new_754.yml
deleted file mode 100644
index 982b5a5eceb..00000000000
--- a/src/licensedcode/data/rules/bsd-new_754.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-minimum_coverage: 95
-notes: seen in cpuinfo.py
diff --git a/src/licensedcode/data/rules/bsd-new_755.RULE b/src/licensedcode/data/rules/bsd-new_755.RULE
index d3717e8b7e9..846273edd59 100644
--- a/src/licensedcode/data/rules/bsd-new_755.RULE
+++ b/src/licensedcode/data/rules/bsd-new_755.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+minimum_coverage: 95
+notes: seen in cpuinfo.py
+---
+
Permission to use, modify, and distribute this software is given under the
terms of the NumPy License.
diff --git a/src/licensedcode/data/rules/bsd-new_755.yml b/src/licensedcode/data/rules/bsd-new_755.yml
deleted file mode 100644
index 982b5a5eceb..00000000000
--- a/src/licensedcode/data/rules/bsd-new_755.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-minimum_coverage: 95
-notes: seen in cpuinfo.py
diff --git a/src/licensedcode/data/rules/bsd-new_756.RULE b/src/licensedcode/data/rules/bsd-new_756.RULE
index 43ecf72b263..8bd5332211e 100644
--- a/src/licensedcode/data/rules/bsd-new_756.RULE
+++ b/src/licensedcode/data/rules/bsd-new_756.RULE
@@ -1,3 +1,13 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+minimum_coverage: 95
+referenced_filenames:
+ - LICENSE.txt
+notes: seen in cpuinfo.py
+---
+
Permission to use, modify, and distribute this software is given under the
terms of the NumPy (BSD style) license. See LICENSE.txt that came with
this distribution for specifics.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_756.yml b/src/licensedcode/data/rules/bsd-new_756.yml
deleted file mode 100644
index 875cfefd8cd..00000000000
--- a/src/licensedcode/data/rules/bsd-new_756.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-minimum_coverage: 95
-referenced_filenames:
- - LICENSE.txt
-notes: seen in cpuinfo.py
diff --git a/src/licensedcode/data/rules/bsd-new_757.RULE b/src/licensedcode/data/rules/bsd-new_757.RULE
index c5862a6e437..636074ed21e 100644
--- a/src/licensedcode/data/rules/bsd-new_757.RULE
+++ b/src/licensedcode/data/rules/bsd-new_757.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/src/licensedcode/data/rules/bsd-new_757.yml b/src/licensedcode/data/rules/bsd-new_757.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_757.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_758.RULE b/src/licensedcode/data/rules/bsd-new_758.RULE
index 90b9afc02d3..d8b380310e1 100644
--- a/src/licensedcode/data/rules/bsd-new_758.RULE
+++ b/src/licensedcode/data/rules/bsd-new_758.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/src/licensedcode/data/rules/bsd-new_758.yml b/src/licensedcode/data/rules/bsd-new_758.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_758.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_759.RULE b/src/licensedcode/data/rules/bsd-new_759.RULE
index c26839fe861..1b06747f65b 100644
--- a/src/licensedcode/data/rules/bsd-new_759.RULE
+++ b/src/licensedcode/data/rules/bsd-new_759.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://www.eclipse.org/org/documents/edl-v10.php
+---
+
This program and the accompanying materials are made available under the terms
of the Eclipse Distribution License v. 1.0,
which is available at https://www.eclipse.org/org/documents/edl-v10.php.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_759.yml b/src/licensedcode/data/rules/bsd-new_759.yml
deleted file mode 100644
index 75fe5f313e4..00000000000
--- a/src/licensedcode/data/rules/bsd-new_759.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://www.eclipse.org/org/documents/edl-v10.php
diff --git a/src/licensedcode/data/rules/bsd-new_76.RULE b/src/licensedcode/data/rules/bsd-new_76.RULE
index c3fc7b966aa..f3c94d99166 100644
--- a/src/licensedcode/data/rules/bsd-new_76.RULE
+++ b/src/licensedcode/data/rules/bsd-new_76.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -18,4 +23,4 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_76.yml b/src/licensedcode/data/rules/bsd-new_76.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_76.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_760.RULE b/src/licensedcode/data/rules/bsd-new_760.RULE
index 5d9a2d53e23..0437f5fb6b9 100644
--- a/src/licensedcode/data/rules/bsd-new_760.RULE
+++ b/src/licensedcode/data/rules/bsd-new_760.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://www.eclipse.org/org/documents/edl-v10.html
+---
+
This program and the accompanying materials are made available under the terms
of the Eclipse Distribution License v. 1.0,
which is available at http://www.eclipse.org/org/documents/edl-v10.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_760.yml b/src/licensedcode/data/rules/bsd-new_760.yml
deleted file mode 100644
index 31469bcbf49..00000000000
--- a/src/licensedcode/data/rules/bsd-new_760.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://www.eclipse.org/org/documents/edl-v10.html
diff --git a/src/licensedcode/data/rules/bsd-new_761.RULE b/src/licensedcode/data/rules/bsd-new_761.RULE
index fd0dc10deb1..86d7a050601 100644
--- a/src/licensedcode/data/rules/bsd-new_761.RULE
+++ b/src/licensedcode/data/rules/bsd-new_761.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://www.eclipse.org/org/documents/edl-v10.html
+---
+
This program and the accompanying materials are made available under the terms
of the Eclipse Distribution License v. 1.0,
which is available at https://www.eclipse.org/org/documents/edl-v10.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_761.yml b/src/licensedcode/data/rules/bsd-new_761.yml
deleted file mode 100644
index 72dd6c8d162..00000000000
--- a/src/licensedcode/data/rules/bsd-new_761.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://www.eclipse.org/org/documents/edl-v10.html
diff --git a/src/licensedcode/data/rules/bsd-new_762.RULE b/src/licensedcode/data/rules/bsd-new_762.RULE
index f88d44a20bd..69f70d4702b 100644
--- a/src/licensedcode/data/rules/bsd-new_762.RULE
+++ b/src/licensedcode/data/rules/bsd-new_762.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
component licensed under the BSL-3CL
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_762.yml b/src/licensedcode/data/rules/bsd-new_762.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_762.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_763.RULE b/src/licensedcode/data/rules/bsd-new_763.RULE
index 1100ab8d2ef..196b1873204 100644
--- a/src/licensedcode/data/rules/bsd-new_763.RULE
+++ b/src/licensedcode/data/rules/bsd-new_763.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
licensed under the terms of the BSD-3-Clause license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_763.yml b/src/licensedcode/data/rules/bsd-new_763.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_763.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_764.RULE b/src/licensedcode/data/rules/bsd-new_764.RULE
index a55485b8c43..7490d978ab3 100644
--- a/src/licensedcode/data/rules/bsd-new_764.RULE
+++ b/src/licensedcode/data/rules/bsd-new_764.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
BSD-3CL licensed file
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_764.yml b/src/licensedcode/data/rules/bsd-new_764.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_764.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_765.RULE b/src/licensedcode/data/rules/bsd-new_765.RULE
index fda5ccfcd77..e2a64356ae3 100644
--- a/src/licensedcode/data/rules/bsd-new_765.RULE
+++ b/src/licensedcode/data/rules/bsd-new_765.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
under the BSD-3CL
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_765.yml b/src/licensedcode/data/rules/bsd-new_765.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_765.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_766.RULE b/src/licensedcode/data/rules/bsd-new_766.RULE
index 492abd11329..f575b6ff6cd 100644
--- a/src/licensedcode/data/rules/bsd-new_766.RULE
+++ b/src/licensedcode/data/rules/bsd-new_766.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+---
+
Licence: BSD-3cl
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_766.yml b/src/licensedcode/data/rules/bsd-new_766.yml
deleted file mode 100644
index c22575d962c..00000000000
--- a/src/licensedcode/data/rules/bsd-new_766.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_767.RULE b/src/licensedcode/data/rules/bsd-new_767.RULE
index ba31e5c5a71..b5e313e2305 100644
--- a/src/licensedcode/data/rules/bsd-new_767.RULE
+++ b/src/licensedcode/data/rules/bsd-new_767.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+---
+
License: BSD-3cl
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_767.yml b/src/licensedcode/data/rules/bsd-new_767.yml
deleted file mode 100644
index c22575d962c..00000000000
--- a/src/licensedcode/data/rules/bsd-new_767.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_768.RULE b/src/licensedcode/data/rules/bsd-new_768.RULE
index 9e8d8580f89..d68198e272d 100644
--- a/src/licensedcode/data/rules/bsd-new_768.RULE
+++ b/src/licensedcode/data/rules/bsd-new_768.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+ignorable_urls:
+ - http://directory.fsf.org/wiki/License:BSD_3Clause
+---
+
Licence: [BSD-3cl](http://directory.fsf.org/wiki/License:BSD_3Clause)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_768.yml b/src/licensedcode/data/rules/bsd-new_768.yml
deleted file mode 100644
index 69b410e1c30..00000000000
--- a/src/licensedcode/data/rules/bsd-new_768.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-ignorable_urls:
- - http://directory.fsf.org/wiki/License:BSD_3Clause
diff --git a/src/licensedcode/data/rules/bsd-new_769.RULE b/src/licensedcode/data/rules/bsd-new_769.RULE
index 66c66c8fe4f..1e983d7358a 100644
--- a/src/licensedcode/data/rules/bsd-new_769.RULE
+++ b/src/licensedcode/data/rules/bsd-new_769.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+ignorable_urls:
+ - http://directory.fsf.org/wiki/License:BSD_3Clause
+---
+
License: [BSD-3cl](http://directory.fsf.org/wiki/License:BSD_3Clause)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_769.yml b/src/licensedcode/data/rules/bsd-new_769.yml
deleted file mode 100644
index 69b410e1c30..00000000000
--- a/src/licensedcode/data/rules/bsd-new_769.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-ignorable_urls:
- - http://directory.fsf.org/wiki/License:BSD_3Clause
diff --git a/src/licensedcode/data/rules/bsd-new_77.RULE b/src/licensedcode/data/rules/bsd-new_77.RULE
index 5ce48bdd6c8..577341d67a6 100644
--- a/src/licensedcode/data/rules/bsd-new_77.RULE
+++ b/src/licensedcode/data/rules/bsd-new_77.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
Redistribution and use in source and binary forms, with or without
modification, is permitted provided that the following conditions
are met:
diff --git a/src/licensedcode/data/rules/bsd-new_77.yml b/src/licensedcode/data/rules/bsd-new_77.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_77.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_770.RULE b/src/licensedcode/data/rules/bsd-new_770.RULE
index 19b82899dca..6dfba100694 100644
--- a/src/licensedcode/data/rules/bsd-new_770.RULE
+++ b/src/licensedcode/data/rules/bsd-new_770.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://directory.fsf.org/wiki/License:BSD_3Clause
+---
+
[BSD-3cl](http://directory.fsf.org/wiki/License:BSD_3Clause)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_770.yml b/src/licensedcode/data/rules/bsd-new_770.yml
deleted file mode 100644
index e90859236b2..00000000000
--- a/src/licensedcode/data/rules/bsd-new_770.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://directory.fsf.org/wiki/License:BSD_3Clause
diff --git a/src/licensedcode/data/rules/bsd-new_771.RULE b/src/licensedcode/data/rules/bsd-new_771.RULE
index 95f51ad2c52..0603fef1ac0 100644
--- a/src/licensedcode/data/rules/bsd-new_771.RULE
+++ b/src/licensedcode/data/rules/bsd-new_771.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://directory.fsf.org/wiki/License:BSD_3Clause
+---
+
http://directory.fsf.org/wiki/License:BSD_3Clause
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_771.yml b/src/licensedcode/data/rules/bsd-new_771.yml
deleted file mode 100644
index e90859236b2..00000000000
--- a/src/licensedcode/data/rules/bsd-new_771.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://directory.fsf.org/wiki/License:BSD_3Clause
diff --git a/src/licensedcode/data/rules/bsd-new_772.RULE b/src/licensedcode/data/rules/bsd-new_772.RULE
index 616b4a09a55..705e84846bb 100644
--- a/src/licensedcode/data/rules/bsd-new_772.RULE
+++ b/src/licensedcode/data/rules/bsd-new_772.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
under the BSD 3cl licence.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_772.yml b/src/licensedcode/data/rules/bsd-new_772.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_772.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_773.RULE b/src/licensedcode/data/rules/bsd-new_773.RULE
index a999d2b36bd..96f2fdadbc6 100644
--- a/src/licensedcode/data/rules/bsd-new_773.RULE
+++ b/src/licensedcode/data/rules/bsd-new_773.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
BSD (3cl.) licensed
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_773.yml b/src/licensedcode/data/rules/bsd-new_773.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_773.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_774.RULE b/src/licensedcode/data/rules/bsd-new_774.RULE
index 41076d82e55..05371fb7e5e 100644
--- a/src/licensedcode/data/rules/bsd-new_774.RULE
+++ b/src/licensedcode/data/rules/bsd-new_774.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 99
+referenced_filenames:
+ - COPYING
+---
+
License BSD (See COPYING)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_774.yml b/src/licensedcode/data/rules/bsd-new_774.yml
deleted file mode 100644
index d17846e0e73..00000000000
--- a/src/licensedcode/data/rules/bsd-new_774.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 99
-referenced_filenames:
- - COPYING
diff --git a/src/licensedcode/data/rules/bsd-new_775.RULE b/src/licensedcode/data/rules/bsd-new_775.RULE
index bd63958f14e..223f3660605 100644
--- a/src/licensedcode/data/rules/bsd-new_775.RULE
+++ b/src/licensedcode/data/rules/bsd-new_775.RULE
@@ -1,2 +1,12 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - Copyright.txt
+ignorable_urls:
+ - https://cmake.org/licensing
+---
+
Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_775.yml b/src/licensedcode/data/rules/bsd-new_775.yml
deleted file mode 100644
index 0e2ff88fb2a..00000000000
--- a/src/licensedcode/data/rules/bsd-new_775.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - Copyright.txt
-ignorable_urls:
- - https://cmake.org/licensing
diff --git a/src/licensedcode/data/rules/bsd-new_776.RULE b/src/licensedcode/data/rules/bsd-new_776.RULE
index 5061430404b..a9ff71159aa 100644
--- a/src/licensedcode/data/rules/bsd-new_776.RULE
+++ b/src/licensedcode/data/rules/bsd-new_776.RULE
@@ -1,3 +1,13 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - Copyright.txt
+ignorable_urls:
+ - https://cmake.org/licensing
+---
+
Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details.
diff --git a/src/licensedcode/data/rules/bsd-new_776.yml b/src/licensedcode/data/rules/bsd-new_776.yml
deleted file mode 100644
index 0e2ff88fb2a..00000000000
--- a/src/licensedcode/data/rules/bsd-new_776.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - Copyright.txt
-ignorable_urls:
- - https://cmake.org/licensing
diff --git a/src/licensedcode/data/rules/bsd-new_777.RULE b/src/licensedcode/data/rules/bsd-new_777.RULE
index 7821fd46aa7..5c3651c128c 100644
--- a/src/licensedcode/data/rules/bsd-new_777.RULE
+++ b/src/licensedcode/data/rules/bsd-new_777.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - Copyright.txt
+---
+
Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_777.yml b/src/licensedcode/data/rules/bsd-new_777.yml
deleted file mode 100644
index cdf9cc909f8..00000000000
--- a/src/licensedcode/data/rules/bsd-new_777.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - Copyright.txt
diff --git a/src/licensedcode/data/rules/bsd-new_778.RULE b/src/licensedcode/data/rules/bsd-new_778.RULE
index ba0d7d4e347..aef91f5d67a 100644
--- a/src/licensedcode/data/rules/bsd-new_778.RULE
+++ b/src/licensedcode/data/rules/bsd-new_778.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
diff --git a/src/licensedcode/data/rules/bsd-new_778.yml b/src/licensedcode/data/rules/bsd-new_778.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_778.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_779.RULE b/src/licensedcode/data/rules/bsd-new_779.RULE
index b8dba20ca3d..705f2b7df2b 100644
--- a/src/licensedcode/data/rules/bsd-new_779.RULE
+++ b/src/licensedcode/data/rules/bsd-new_779.RULE
@@ -1 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+notes: Go uses a bsd-new license
+ignorable_urls:
+ - http://golang.org/
+---
+
Subject to the BSD-style license found at http://golang.org
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_779.yml b/src/licensedcode/data/rules/bsd-new_779.yml
deleted file mode 100644
index c42943f3bab..00000000000
--- a/src/licensedcode/data/rules/bsd-new_779.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-notes: Go uses a bsd-new license
-ignorable_urls:
- - http://golang.org/
diff --git a/src/licensedcode/data/rules/bsd-new_78.RULE b/src/licensedcode/data/rules/bsd-new_78.RULE
index 29400c874ab..bd11c92d1fb 100644
--- a/src/licensedcode/data/rules/bsd-new_78.RULE
+++ b/src/licensedcode/data/rules/bsd-new_78.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://developer.yahoo.net/yui/license.txt
+---
+
Code licensed under the BSD License:
* http://developer.yahoo.net/yui/license.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_78.yml b/src/licensedcode/data/rules/bsd-new_78.yml
deleted file mode 100644
index e615b583bee..00000000000
--- a/src/licensedcode/data/rules/bsd-new_78.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://developer.yahoo.net/yui/license.txt
diff --git a/src/licensedcode/data/rules/bsd-new_780.RULE b/src/licensedcode/data/rules/bsd-new_780.RULE
index dc265f19395..84a471c07be 100644
--- a/src/licensedcode/data/rules/bsd-new_780.RULE
+++ b/src/licensedcode/data/rules/bsd-new_780.RULE
@@ -1 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+notes: Go uses a bsd-new license
+ignorable_urls:
+ - http://golang.org/
+---
+
(license at http://golang.org) where indicated
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_780.yml b/src/licensedcode/data/rules/bsd-new_780.yml
deleted file mode 100644
index c42943f3bab..00000000000
--- a/src/licensedcode/data/rules/bsd-new_780.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-notes: Go uses a bsd-new license
-ignorable_urls:
- - http://golang.org/
diff --git a/src/licensedcode/data/rules/bsd-new_781.RULE b/src/licensedcode/data/rules/bsd-new_781.RULE
index e4ea865a872..d9b5161b779 100644
--- a/src/licensedcode/data/rules/bsd-new_781.RULE
+++ b/src/licensedcode/data/rules/bsd-new_781.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/src/licensedcode/data/rules/bsd-new_781.yml b/src/licensedcode/data/rules/bsd-new_781.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_781.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_782.RULE b/src/licensedcode/data/rules/bsd-new_782.RULE
index 5a959b80d61..5088f20aa75 100644
--- a/src/licensedcode/data/rules/bsd-new_782.RULE
+++ b/src/licensedcode/data/rules/bsd-new_782.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_782.yml b/src/licensedcode/data/rules/bsd-new_782.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_782.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_783.RULE b/src/licensedcode/data/rules/bsd-new_783.RULE
index 7f40167a776..8636f36acf4 100644
--- a/src/licensedcode/data/rules/bsd-new_783.RULE
+++ b/src/licensedcode/data/rules/bsd-new_783.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
diff --git a/src/licensedcode/data/rules/bsd-new_783.yml b/src/licensedcode/data/rules/bsd-new_783.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_783.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_784.RULE b/src/licensedcode/data/rules/bsd-new_784.RULE
index 6e7b4f54d73..a3c75aede5b 100644
--- a/src/licensedcode/data/rules/bsd-new_784.RULE
+++ b/src/licensedcode/data/rules/bsd-new_784.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
diff --git a/src/licensedcode/data/rules/bsd-new_784.yml b/src/licensedcode/data/rules/bsd-new_784.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_784.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_785.RULE b/src/licensedcode/data/rules/bsd-new_785.RULE
index 9e6fca1b61c..fe771b5ee98 100644
--- a/src/licensedcode/data/rules/bsd-new_785.RULE
+++ b/src/licensedcode/data/rules/bsd-new_785.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
diff --git a/src/licensedcode/data/rules/bsd-new_785.yml b/src/licensedcode/data/rules/bsd-new_785.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_785.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_786.RULE b/src/licensedcode/data/rules/bsd-new_786.RULE
index ec5163f5179..531414683d5 100644
--- a/src/licensedcode/data/rules/bsd-new_786.RULE
+++ b/src/licensedcode/data/rules/bsd-new_786.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
diff --git a/src/licensedcode/data/rules/bsd-new_786.yml b/src/licensedcode/data/rules/bsd-new_786.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_786.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_787.RULE b/src/licensedcode/data/rules/bsd-new_787.RULE
index ee2ef0b75c5..79d5318e17e 100644
--- a/src/licensedcode/data/rules/bsd-new_787.RULE
+++ b/src/licensedcode/data/rules/bsd-new_787.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+minimum_coverage: 95
+ignorable_urls:
+ - http://www.opensource.org/licenses/bsd-license.php
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_787.yml b/src/licensedcode/data/rules/bsd-new_787.yml
deleted file mode 100644
index 6bf279e8860..00000000000
--- a/src/licensedcode/data/rules/bsd-new_787.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
-minimum_coverage: 95
-ignorable_urls:
- - http://www.opensource.org/licenses/bsd-license.php
diff --git a/src/licensedcode/data/rules/bsd-new_788.RULE b/src/licensedcode/data/rules/bsd-new_788.RULE
index ec59a2b15a2..d8156dc5a31 100644
--- a/src/licensedcode/data/rules/bsd-new_788.RULE
+++ b/src/licensedcode/data/rules/bsd-new_788.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 100
+---
+
under the terms of the BSD 3-clause "New" or "Revised" License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_788.yml b/src/licensedcode/data/rules/bsd-new_788.yml
deleted file mode 100644
index 67d99f838ff..00000000000
--- a/src/licensedcode/data/rules/bsd-new_788.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_789.RULE b/src/licensedcode/data/rules/bsd-new_789.RULE
index 9f49046225e..dbce6267d45 100644
--- a/src/licensedcode/data/rules/bsd-new_789.RULE
+++ b/src/licensedcode/data/rules/bsd-new_789.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_789.yml b/src/licensedcode/data/rules/bsd-new_789.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_789.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_79.RULE b/src/licensedcode/data/rules/bsd-new_79.RULE
index 3148b5eb80e..b84b88d5314 100644
--- a/src/licensedcode/data/rules/bsd-new_79.RULE
+++ b/src/licensedcode/data/rules/bsd-new_79.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 99
+---
+
Code licensed under the BSD License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_79.yml b/src/licensedcode/data/rules/bsd-new_79.yml
deleted file mode 100644
index bb1a896f7fd..00000000000
--- a/src/licensedcode/data/rules/bsd-new_79.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_790.RULE b/src/licensedcode/data/rules/bsd-new_790.RULE
index ec85ec41a41..2d6bfc46a60 100644
--- a/src/licensedcode/data/rules/bsd-new_790.RULE
+++ b/src/licensedcode/data/rules/bsd-new_790.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+ignorable_urls:
+ - http://www.opensource.org/licenses/bsd-license.php
+---
+
Distributable under the BSD license. See the terms of the
BSD license in the documentation provided with this software.
http://www.opensource.org/licenses/bsd-license.php
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_790.yml b/src/licensedcode/data/rules/bsd-new_790.yml
deleted file mode 100644
index 9179a28ecea..00000000000
--- a/src/licensedcode/data/rules/bsd-new_790.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-ignorable_urls:
- - http://www.opensource.org/licenses/bsd-license.php
diff --git a/src/licensedcode/data/rules/bsd-new_791.RULE b/src/licensedcode/data/rules/bsd-new_791.RULE
index 7a4ce8de9e2..7b5062908e3 100644
--- a/src/licensedcode/data/rules/bsd-new_791.RULE
+++ b/src/licensedcode/data/rules/bsd-new_791.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+ignorable_urls:
+ - https://www.opensource.org/licenses/bsd-license.php
+---
+
Distributable under the BSD license. See the terms of the
BSD license in the documentation provided with this software.
https://www.opensource.org/licenses/bsd-license.php
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_791.yml b/src/licensedcode/data/rules/bsd-new_791.yml
deleted file mode 100644
index 0df54950ac7..00000000000
--- a/src/licensedcode/data/rules/bsd-new_791.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-ignorable_urls:
- - https://www.opensource.org/licenses/bsd-license.php
diff --git a/src/licensedcode/data/rules/bsd-new_792.RULE b/src/licensedcode/data/rules/bsd-new_792.RULE
index 4b4be2fe9d0..1d8cf3c2030 100644
--- a/src/licensedcode/data/rules/bsd-new_792.RULE
+++ b/src/licensedcode/data/rules/bsd-new_792.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+referenced_filenames:
+ - LICENSE
+---
+
// Use of this source code is governed by a BSD-style
// license that can be found src the LICENSE file.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_792.yml b/src/licensedcode/data/rules/bsd-new_792.yml
deleted file mode 100644
index b6c8dec56ad..00000000000
--- a/src/licensedcode/data/rules/bsd-new_792.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
-referenced_filenames:
- - LICENSE
diff --git a/src/licensedcode/data/rules/bsd-new_793.RULE b/src/licensedcode/data/rules/bsd-new_793.RULE
index 2d97207fd5a..d8cf46c6ed9 100644
--- a/src/licensedcode/data/rules/bsd-new_793.RULE
+++ b/src/licensedcode/data/rules/bsd-new_793.RULE
@@ -1,2 +1,8 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+---
+
Distributable under the BSD license. See the terms of the
BSD license in the documentation provided with this software.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_793.yml b/src/licensedcode/data/rules/bsd-new_793.yml
deleted file mode 100644
index e55e499970e..00000000000
--- a/src/licensedcode/data/rules/bsd-new_793.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_794.RULE b/src/licensedcode/data/rules/bsd-new_794.RULE
index 994b5c569d9..f6a4cc26251 100644
--- a/src/licensedcode/data/rules/bsd-new_794.RULE
+++ b/src/licensedcode/data/rules/bsd-new_794.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+---
+
freely distributable under the BSD license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_794.yml b/src/licensedcode/data/rules/bsd-new_794.yml
deleted file mode 100644
index e55e499970e..00000000000
--- a/src/licensedcode/data/rules/bsd-new_794.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_795.RULE b/src/licensedcode/data/rules/bsd-new_795.RULE
index 822d4ec239e..24c9ed89c76 100644
--- a/src/licensedcode/data/rules/bsd-new_795.RULE
+++ b/src/licensedcode/data/rules/bsd-new_795.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+---
+
Distributable under the BSD license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_795.yml b/src/licensedcode/data/rules/bsd-new_795.yml
deleted file mode 100644
index e55e499970e..00000000000
--- a/src/licensedcode/data/rules/bsd-new_795.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_796.RULE b/src/licensedcode/data/rules/bsd-new_796.RULE
index 26b2fdf0ce2..730727f367f 100644
--- a/src/licensedcode/data/rules/bsd-new_796.RULE
+++ b/src/licensedcode/data/rules/bsd-new_796.RULE
@@ -1,2 +1,8 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+---
+
This software is distributable under the BSD license.
See the terms of the BSD license in the documentation provided with this software.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_796.yml b/src/licensedcode/data/rules/bsd-new_796.yml
deleted file mode 100644
index e55e499970e..00000000000
--- a/src/licensedcode/data/rules/bsd-new_796.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_797.RULE b/src/licensedcode/data/rules/bsd-new_797.RULE
index c6aa1dcb548..1df69812366 100644
--- a/src/licensedcode/data/rules/bsd-new_797.RULE
+++ b/src/licensedcode/data/rules/bsd-new_797.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+relevance: 99
+---
+
This software is distributable under the BSD license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_797.yml b/src/licensedcode/data/rules/bsd-new_797.yml
deleted file mode 100644
index e55e499970e..00000000000
--- a/src/licensedcode/data/rules/bsd-new_797.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_798.RULE b/src/licensedcode/data/rules/bsd-new_798.RULE
index ffc3d0b2330..fc02fdae28e 100644
--- a/src/licensedcode/data/rules/bsd-new_798.RULE
+++ b/src/licensedcode/data/rules/bsd-new_798.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+relevance: 100
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_798.yml b/src/licensedcode/data/rules/bsd-new_798.yml
deleted file mode 100644
index 646f0f05a97..00000000000
--- a/src/licensedcode/data/rules/bsd-new_798.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_799.RULE b/src/licensedcode/data/rules/bsd-new_799.RULE
index ab5dedf5973..0eaa5e13bd8 100644
--- a/src/licensedcode/data/rules/bsd-new_799.RULE
+++ b/src/licensedcode/data/rules/bsd-new_799.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+notes: in https://repo1.maven.org/maven2/net/zetetic/android-database-sqlcipher/
+ignorable_urls:
+ - https://www.zetetic.net/sqlcipher/license/
+---
+
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_ijg_and_libpng_1.yml b/src/licensedcode/data/rules/bsd-new_and_ijg_and_libpng_1.yml
deleted file mode 100644
index 9992553a635..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_ijg_and_libpng_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new AND ijg AND libpng
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://www.opensource.org/licenses/bsd-license.php
diff --git a/src/licensedcode/data/rules/bsd-new_and_ijg_and_x11-tiff_and_bsd-new_1.RULE b/src/licensedcode/data/rules/bsd-new_and_ijg_and_x11-tiff_and_bsd-new_1.RULE
index 6a72499e44a..47fb1ef5d15 100644
--- a/src/licensedcode/data/rules/bsd-new_and_ijg_and_x11-tiff_and_bsd-new_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_ijg_and_x11-tiff_and_bsd-new_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new AND ijg AND x11-tiff AND bsd-new
+is_license_reference: yes
+relevance: 90
+ignorable_urls:
+ - https://bitmiracle.github.io/libtiff.net
+---
+
https://bitmiracle.github.io/libtiff.net/#
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_ijg_and_x11-tiff_and_bsd-new_1.yml b/src/licensedcode/data/rules/bsd-new_and_ijg_and_x11-tiff_and_bsd-new_1.yml
deleted file mode 100644
index 3abf20469d1..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_ijg_and_x11-tiff_and_bsd-new_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new AND ijg AND x11-tiff AND bsd-new
-is_license_reference: yes
-relevance: 90
-ignorable_urls:
- - https://bitmiracle.github.io/libtiff.net
diff --git a/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_1.RULE b/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_1.RULE
index 626b1aba156..3f3ce78df53 100644
--- a/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_1.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: bsd-new AND ijg AND zlib
+is_license_reference: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE.md
+---
+
libjpeg-turbo
For a summary of these license terms, see LICENSE.md.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_1.yml b/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_1.yml
deleted file mode 100644
index d4f8db26466..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new AND ijg AND zlib
-is_license_reference: yes
-relevance: 100
-referenced_filenames:
- - LICENSE.md
diff --git a/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_2.RULE b/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_2.RULE
index 5575e8f7ff4..be16c1000b6 100644
--- a/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_2.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_2.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new AND ijg AND zlib
+is_license_reference: yes
+relevance: 100
+---
+
libjpeg-turbo license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_2.yml b/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_2.yml
deleted file mode 100644
index 6abb85300b4..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_ijg_and_zlib_2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND ijg AND zlib
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0-plus_1.RULE b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0-plus_1.RULE
index 7e9f7da2f1c..aa5d3344b2f 100644
--- a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0-plus_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0-plus_1.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new AND lgpl-2.0-plus
+is_license_notice: yes
+relevance: 100
+minimum_coverage: 80
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
diff --git a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0-plus_1.yml b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0-plus_1.yml
deleted file mode 100644
index d994cdf4082..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0-plus_1.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new AND lgpl-2.0-plus
-is_license_notice: yes
-relevance: 100
-minimum_coverage: 80
diff --git a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0_1.RULE b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0_1.RULE
index 61f1750360a..765f40d5db4 100644
--- a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0_1.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new AND lgpl-2.0
+is_license_notice: yes
+relevance: 100
+---
+
software is open source software with portions licensed under a BSD license and portions licensed under the GNU Library General Public License Version 2. Please refer to the individual files to determine the license terms that apply to that file. You may obtain a complete machine-readable copy of the source code for the LGPL-licensed portions under the terms of LGPL, without charge except for the cost of media, shipping, and handling, upon written request. The software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the LGPL for more details; a copy of the LGPL is included with this product.
The software is released under the GNU Library General Public License Version 2.
diff --git a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0_1.yml b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0_1.yml
deleted file mode 100644
index 84ee3f4ebc1..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.0_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND lgpl-2.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_1.RULE b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_1.RULE
index 3ab50a2da7a..30396a50571 100644
--- a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_1.RULE
@@ -1,3 +1,14 @@
+---
+license_expression: bsd-new AND lgpl-2.1 AND gpl-2.0 AND gfdl-1.2
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - COPYING.Xiph
+ - COPYING.GPL
+ - COPYING.FDL
+notes: in flak makefile.in
+---
+
This file is part the FLAC project. FLAC is comprised of several
components distributed under different licenses. The codec libraries
are distributed under Xiph.Org's BSD-like license (see the file
diff --git a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_1.yml b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_1.yml
deleted file mode 100644
index b479123be99..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_1.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-license_expression: bsd-new AND lgpl-2.1 AND gpl-2.0 AND gfdl-1.2
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - COPYING.Xiph
- - COPYING.GPL
- - COPYING.FDL
-notes: in flak makefile.in
diff --git a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_2.RULE b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_2.RULE
index 29bd09da9ac..b2db5ab79d7 100644
--- a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_2.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_2.RULE
@@ -1,3 +1,14 @@
+---
+license_expression: bsd-new AND lgpl-2.1 AND gpl-2.0 AND gfdl-1.2
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - COPYING.Xiph
+ - COPYING.LGPL
+ - COPYING.GPL
+ - COPYING.FDL
+---
+
This file is part the FLAC project. FLAC is comprised of several
components distributed under different licenses. The codec libraries
are distributed under Xiph.Org's BSD-like license (see the file
diff --git a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_2.yml b/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_2.yml
deleted file mode 100644
index d9b8bd012de..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_lgpl-2.1_and_gpl-2.0_and_gfdl-1.2_2.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-license_expression: bsd-new AND lgpl-2.1 AND gpl-2.0 AND gfdl-1.2
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - COPYING.Xiph
- - COPYING.LGPL
- - COPYING.GPL
- - COPYING.FDL
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit-synopsys.RULE b/src/licensedcode/data/rules/bsd-new_and_mit-synopsys.RULE
index cb5acd54854..e22a7ae4864 100644
--- a/src/licensedcode/data/rules/bsd-new_and_mit-synopsys.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_mit-synopsys.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new AND mit-synopsys
+is_license_notice: yes
+minimum_coverage: 80
+---
+
License 2: Modified BSD
@@ -54,4 +60,4 @@ permission notice:
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
+ THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit-synopsys.yml b/src/licensedcode/data/rules/bsd-new_and_mit-synopsys.yml
deleted file mode 100644
index 0730fa29a8b..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_mit-synopsys.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND mit-synopsys
-is_license_notice: yes
-minimum_coverage: 80
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_1.RULE b/src/licensedcode/data/rules/bsd-new_and_mit_1.RULE
index 4aba117155d..9a16c8361da 100644
--- a/src/licensedcode/data/rules/bsd-new_and_mit_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_mit_1.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new AND mit
+is_license_tag: yes
+relevance: 100
+---
+
License: BSD-3-clause and Expat
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_1.yml b/src/licensedcode/data/rules/bsd-new_and_mit_1.yml
deleted file mode 100644
index 72ea64ed7da..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_mit_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND mit
-is_license_tag: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_2.RULE b/src/licensedcode/data/rules/bsd-new_and_mit_2.RULE
index 5a8eab112d9..8c5ba40e2bd 100644
--- a/src/licensedcode/data/rules/bsd-new_and_mit_2.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_mit_2.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: bsd-new AND mit
+is_license_notice: yes
+relevance: 100
+minimum_coverage: 98
+ignorable_urls:
+ - http://golang.org/
+---
+
(license at http://golang.org) where indicated
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_2.yml b/src/licensedcode/data/rules/bsd-new_and_mit_2.yml
deleted file mode 100644
index bd69722e7d0..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_mit_2.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new AND mit
-is_license_notice: yes
-relevance: 100
-minimum_coverage: 98
-ignorable_urls:
- - http://golang.org/
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_3.RULE b/src/licensedcode/data/rules/bsd-new_and_mit_3.RULE
index a42b51b8528..142ee672e6a 100644
--- a/src/licensedcode/data/rules/bsd-new_and_mit_3.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_mit_3.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new AND mit
+is_license_notice: yes
+relevance: 100
+---
+
* The script is dual licensed under the BSD and MIT licenses
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_3.yml b/src/licensedcode/data/rules/bsd-new_and_mit_3.yml
deleted file mode 100644
index 345e38a9c4a..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_mit_3.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND mit
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_4.RULE b/src/licensedcode/data/rules/bsd-new_and_mit_4.RULE
index 46e9418f3d7..e7dcbc98259 100644
--- a/src/licensedcode/data/rules/bsd-new_and_mit_4.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_mit_4.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new AND mit
+is_license_notice: yes
+relevance: 100
+---
+
* The script is dual licenced under the BSD and MIT licenses
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_4.yml b/src/licensedcode/data/rules/bsd-new_and_mit_4.yml
deleted file mode 100644
index 345e38a9c4a..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_mit_4.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND mit
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_and_lgpl-2.0-plus_1.RULE b/src/licensedcode/data/rules/bsd-new_and_mit_and_lgpl-2.0-plus_1.RULE
index 0307be6e81d..f79a060b9c2 100644
--- a/src/licensedcode/data/rules/bsd-new_and_mit_and_lgpl-2.0-plus_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_mit_and_lgpl-2.0-plus_1.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new AND mit AND lgpl-2.0-plus
+is_license_notice: yes
+relevance: 100
+---
+
All files in this distribution (other than in the ext directory) have
licenses based on the BSD or MIT licenses. Some files in the ext
directory are GNU LGPL. No other licenses are found in this
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_and_lgpl-2.0-plus_1.yml b/src/licensedcode/data/rules/bsd-new_and_mit_and_lgpl-2.0-plus_1.yml
deleted file mode 100644
index bfac1117107..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_mit_and_lgpl-2.0-plus_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND mit AND lgpl-2.0-plus
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_and_public-domain_1.RULE b/src/licensedcode/data/rules/bsd-new_and_mit_and_public-domain_1.RULE
index 79597fd010f..5c01f40e0aa 100644
--- a/src/licensedcode/data/rules/bsd-new_and_mit_and_public-domain_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_mit_and_public-domain_1.RULE
@@ -1 +1,8 @@
+---
+license_expression: bsd-new AND mit AND public-domain
+is_license_reference: yes
+relevance: 99
+notes: Seen in MySQL notices
+---
+
Various subpackages under licenses such as BSD, MIT, Public Domain
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_mit_and_public-domain_1.yml b/src/licensedcode/data/rules/bsd-new_and_mit_and_public-domain_1.yml
deleted file mode 100644
index 594c136902d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_mit_and_public-domain_1.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new AND mit AND public-domain
-is_license_reference: yes
-relevance: 99
-notes: Seen in MySQL notices
diff --git a/src/licensedcode/data/rules/bsd-new_and_nvidia-2002_1.RULE b/src/licensedcode/data/rules/bsd-new_and_nvidia-2002_1.RULE
index e5a34e48bcc..1e664462677 100644
--- a/src/licensedcode/data/rules/bsd-new_and_nvidia-2002_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_nvidia-2002_1.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new AND nvidia-2002
+is_license_tag: yes
+relevance: 100
+---
+
License: glslang
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_nvidia-2002_1.yml b/src/licensedcode/data/rules/bsd-new_and_nvidia-2002_1.yml
deleted file mode 100644
index 42a15a98001..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_nvidia-2002_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND nvidia-2002
-is_license_tag: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_1.RULE b/src/licensedcode/data/rules/bsd-new_and_other-permissive_1.RULE
index 45878a7e632..b80a34c599b 100644
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_other-permissive_1.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: bsd-new AND other-permissive
+is_license_text: yes
+relevance: 99
+minimum_coverage: 80
+notes: rare bsd-new-like terms.
+---
+
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_1.yml b/src/licensedcode/data/rules/bsd-new_and_other-permissive_1.yml
deleted file mode 100644
index 240b1a8a984..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new AND other-permissive
-is_license_text: yes
-relevance: 99
-minimum_coverage: 80
-notes: rare bsd-new-like terms.
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_10.RULE b/src/licensedcode/data/rules/bsd-new_and_other-permissive_10.RULE
index 177e58728b5..4a4c5f7813d 100644
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_10.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_other-permissive_10.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new AND other-permissive
+is_license_text: yes
+notes: https://github.com/johnsusek/elastalert-server/blob/master/LICENSE.md
+---
+
The 3-clause BSD license (Modified)
===================================
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_10.yml b/src/licensedcode/data/rules/bsd-new_and_other-permissive_10.yml
deleted file mode 100644
index b7e992212c5..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_10.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND other-permissive
-is_license_text: yes
-notes: https://github.com/johnsusek/elastalert-server/blob/master/LICENSE.md
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_2.RULE b/src/licensedcode/data/rules/bsd-new_and_other-permissive_2.RULE
index f51cc718012..c443236bf23 100644
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_2.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_other-permissive_2.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new AND ijg AND libpng
+is_license_notice: yes
+ignorable_urls:
+ - http://www.opensource.org/licenses/bsd-license.php
+---
+
is licensed under the http://www.opensource.org/licenses/bsd-license.php BSD license,
with portions controlled by the IJG-README.TXT IJG license and
-libpng-LICENSE.txt PNG Reference Library license
+libpng-LICENSE.txt PNG Reference Library license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_2.yml b/src/licensedcode/data/rules/bsd-new_and_other-permissive_2.yml
deleted file mode 100644
index 1fe47ef5015..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new AND ijg AND libpng
-is_license_notice: yes
-ignorable_urls:
- - http://www.opensource.org/licenses/bsd-license.php
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_3.RULE b/src/licensedcode/data/rules/bsd-new_and_other-permissive_3.RULE
index cb34e3c749a..902dceaa78b 100644
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_3.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_other-permissive_3.RULE
@@ -1,4 +1,11 @@
+---
+license_expression: bsd-new AND ijg AND libpng
+is_license_notice: yes
+ignorable_urls:
+ - http://www.opensource.org/licenses/bsd-license.php
+---
+
licensed under the http://www.opensource.org/licenses/bsd-license.php BSD license,
with portions controlled by the IJG-README.TXT IJG license and
libpng-LICENSE.txt PNG Reference Library license
-http://opensource.org/trademarks/osi-certified/web/osi-certified-120x100.gif
+http://opensource.org/trademarks/osi-certified/web/osi-certified-120x100.gif
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_3.yml b/src/licensedcode/data/rules/bsd-new_and_other-permissive_3.yml
deleted file mode 100644
index 1fe47ef5015..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_3.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new AND ijg AND libpng
-is_license_notice: yes
-ignorable_urls:
- - http://www.opensource.org/licenses/bsd-license.php
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_4.RULE b/src/licensedcode/data/rules/bsd-new_and_other-permissive_4.RULE
index 7792c6fa213..0bf9a88a81a 100644
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_4.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_other-permissive_4.RULE
@@ -1,5 +1,11 @@
+---
+license_expression: bsd-new AND other-permissive
+is_license_notice: yes
+relevance: 99
+---
+
The licences which components of this software fall under are as
follows. First, we will summarize and say that all components
are under a BSD licence, or a licence more free than that.
-OpenSSH contains no GPL code.
+OpenSSH contains no GPL code.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_4.yml b/src/licensedcode/data/rules/bsd-new_and_other-permissive_4.yml
deleted file mode 100644
index 2f7c31ea0cf..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_4.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND other-permissive
-is_license_notice: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_5.RULE b/src/licensedcode/data/rules/bsd-new_and_other-permissive_5.RULE
index 4ad6c656dd7..249ccb9e34a 100644
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_5.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_other-permissive_5.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new AND other-permissive
+is_license_notice: yes
+relevance: 100
+---
+
This software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
This code is free software; you can redistribute it and/or modify it under the terms of the BSD License.
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_5.yml b/src/licensedcode/data/rules/bsd-new_and_other-permissive_5.yml
deleted file mode 100644
index 7e3ae35c147..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_5.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND other-permissive
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_6.RULE b/src/licensedcode/data/rules/bsd-new_and_other-permissive_6.RULE
index 74519e401c1..83f6398e27b 100644
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_6.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_other-permissive_6.RULE
@@ -1,3 +1,14 @@
+---
+license_expression: bsd-new AND other-permissive
+is_license_text: yes
+relevance: 99
+minimum_coverage: 95
+notes: the 3rd clause has this extra term "derived from this source code" the 4th clause is
+ treated as an "other-permissive" license See https://onl.wustl.edu/restricted/npr-plugins/
+ignorable_authors:
+ - Washington University
+---
+
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_6.yml b/src/licensedcode/data/rules/bsd-new_and_other-permissive_6.yml
deleted file mode 100644
index a00e1c380ac..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_6.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-license_expression: bsd-new AND other-permissive
-is_license_text: yes
-relevance: 99
-minimum_coverage: 95
-notes: the 3rd clause has this extra term "derived from this source code" the 4th clause is
- treated as an "other-permissive" license See https://onl.wustl.edu/restricted/npr-plugins/
-ignorable_authors:
- - Washington University
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_7.RULE b/src/licensedcode/data/rules/bsd-new_and_other-permissive_7.RULE
index a0d77a5a8ff..e4f59f82f85 100644
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_7.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_other-permissive_7.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: bsd-new AND other-permissive
+is_license_text: yes
+relevance: 99
+minimum_coverage: 95
+notes: the 3rd clause has this extra term "derived from this source code" the 4th clause is
+ treated as an "other-permissive" license See https://onl.wustl.edu/restricted/npr-plugins/
+---
+
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_7.yml b/src/licensedcode/data/rules/bsd-new_and_other-permissive_7.yml
deleted file mode 100644
index 204c434aa8c..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_7.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new AND other-permissive
-is_license_text: yes
-relevance: 99
-minimum_coverage: 95
-notes: the 3rd clause has this extra term "derived from this source code" the 4th clause is
- treated as an "other-permissive" license See https://onl.wustl.edu/restricted/npr-plugins/
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_8.RULE b/src/licensedcode/data/rules/bsd-new_and_other-permissive_8.RULE
index 84b9d45da44..2bc9d4e25a4 100644
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_8.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_other-permissive_8.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new AND other-permissive
+is_license_notice: yes
+---
+
If you have downloaded a copy of the binary from , please note that the binary
is licensed under the BSD 3-Clause License.
If you have downloaded a copy of the source code from , please note that source
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_8.yml b/src/licensedcode/data/rules/bsd-new_and_other-permissive_8.yml
deleted file mode 100644
index e2d264b6283..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_8.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new AND other-permissive
-is_license_notice: yes
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_9.RULE b/src/licensedcode/data/rules/bsd-new_and_other-permissive_9.RULE
index 56423a6c477..a7b376e0d29 100644
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_9.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_other-permissive_9.RULE
@@ -1 +1,8 @@
+---
+license_expression: bsd-new AND other-permissive
+is_license_notice: yes
+relevance: 95
+notes: https://github.com/johnsusek/elastalert-server/blob/master/LICENSE.md
+---
+
License This project is BSD Licensed with some modifications.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_other-permissive_9.yml b/src/licensedcode/data/rules/bsd-new_and_other-permissive_9.yml
deleted file mode 100644
index 13918211f0d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_other-permissive_9.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new AND other-permissive
-is_license_notice: yes
-relevance: 95
-notes: https://github.com/johnsusek/elastalert-server/blob/master/LICENSE.md
diff --git a/src/licensedcode/data/rules/bsd-new_and_proprietary-license_1.RULE b/src/licensedcode/data/rules/bsd-new_and_proprietary-license_1.RULE
index 9a06d3a31ef..2e047e4f747 100644
--- a/src/licensedcode/data/rules/bsd-new_and_proprietary-license_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_proprietary-license_1.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: bsd-new AND proprietary-license
+is_license_text: yes
+relevance: 100
+notes: IKANOS terms seen in the kernel
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following
conditions are met:
diff --git a/src/licensedcode/data/rules/bsd-new_and_proprietary-license_1.yml b/src/licensedcode/data/rules/bsd-new_and_proprietary-license_1.yml
deleted file mode 100644
index 432e4d8f3ad..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_proprietary-license_1.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new AND proprietary-license
-is_license_text: yes
-relevance: 100
-notes: IKANOS terms seen in the kernel
diff --git a/src/licensedcode/data/rules/bsd-new_and_proprietary-license_2.RULE b/src/licensedcode/data/rules/bsd-new_and_proprietary-license_2.RULE
index c0b77f0c5af..6167aed5b0f 100644
--- a/src/licensedcode/data/rules/bsd-new_and_proprietary-license_2.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_proprietary-license_2.RULE
@@ -1 +1,8 @@
+---
+license_expression: bsd-new AND proprietary-license
+is_license_reference: yes
+relevance: 100
+notes: IKANOS terms seen in the kernel
+---
+
BSD (Ikanos)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_proprietary-license_2.yml b/src/licensedcode/data/rules/bsd-new_and_proprietary-license_2.yml
deleted file mode 100644
index 082ecc53cb9..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_proprietary-license_2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: bsd-new AND proprietary-license
-is_license_reference: yes
-relevance: 100
-notes: IKANOS terms seen in the kernel
diff --git a/src/licensedcode/data/rules/bsd-new_and_proprietary_1.RULE b/src/licensedcode/data/rules/bsd-new_and_proprietary_1.RULE
index 2f078a64b2f..ce0d3575825 100644
--- a/src/licensedcode/data/rules/bsd-new_and_proprietary_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_proprietary_1.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new AND proprietary-license
+is_license_notice: yes
+---
+
Permission is
granted to distribute this document without any alteration under the
terms of the HSQLDB license. You are not allowed to distribute or
diff --git a/src/licensedcode/data/rules/bsd-new_and_proprietary_1.yml b/src/licensedcode/data/rules/bsd-new_and_proprietary_1.yml
deleted file mode 100644
index 8445544a2af..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_proprietary_1.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new AND proprietary-license
-is_license_notice: yes
diff --git a/src/licensedcode/data/rules/bsd-new_and_public-domain.RULE b/src/licensedcode/data/rules/bsd-new_and_public-domain.RULE
index d73def56294..c3d3b9279be 100644
--- a/src/licensedcode/data/rules/bsd-new_and_public-domain.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_public-domain.RULE
@@ -1,4 +1,9 @@
+---
+license_expression: bsd-new AND public-domain
+is_license_notice: yes
+---
+
Release is distributed under the terms of the "BSD" licence, as
specified below. The documentation for, supplied in the "doc"
directory, is distributed under the same terms as the software itself. The data
-in the testdata directory is not copyrighted and is in the public domain.
+in the testdata directory is not copyrighted and is in the public domain.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_public-domain.yml b/src/licensedcode/data/rules/bsd-new_and_public-domain.yml
deleted file mode 100644
index 63be182b43b..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_public-domain.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new AND public-domain
-is_license_notice: yes
diff --git a/src/licensedcode/data/rules/bsd-new_and_python_and_apache-2.0_1.RULE b/src/licensedcode/data/rules/bsd-new_and_python_and_apache-2.0_1.RULE
index d22627815e4..6b91859bf25 100644
--- a/src/licensedcode/data/rules/bsd-new_and_python_and_apache-2.0_1.RULE
+++ b/src/licensedcode/data/rules/bsd-new_and_python_and_apache-2.0_1.RULE
@@ -1 +1,7 @@
+---
+license_expression: bsd-new AND python AND apache-2.0
+is_license_tag: yes
+relevance: 100
+---
+
License: 3-clause BSD, PSF and Apache 2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_and_python_and_apache-2.0_1.yml b/src/licensedcode/data/rules/bsd-new_and_python_and_apache-2.0_1.yml
deleted file mode 100644
index 0b3728a9ace..00000000000
--- a/src/licensedcode/data/rules/bsd-new_and_python_and_apache-2.0_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new AND python AND apache-2.0
-is_license_tag: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/bsd-new_arm.RULE b/src/licensedcode/data/rules/bsd-new_arm.RULE
index ea6129939a4..42784e9fde0 100644
--- a/src/licensedcode/data/rules/bsd-new_arm.RULE
+++ b/src/licensedcode/data/rules/bsd-new_arm.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -19,5 +24,4 @@
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
\ No newline at end of file
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_arm.yml b/src/licensedcode/data/rules/bsd-new_arm.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_arm.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_dispatch.RULE b/src/licensedcode/data/rules/bsd-new_dispatch.RULE
index c38bce055f5..3f54c0dac92 100644
--- a/src/licensedcode/data/rules/bsd-new_dispatch.RULE
+++ b/src/licensedcode/data/rules/bsd-new_dispatch.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -25,5 +30,4 @@
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
+ OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_dispatch.yml b/src/licensedcode/data/rules/bsd-new_dispatch.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_dispatch.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_ecos.RULE b/src/licensedcode/data/rules/bsd-new_ecos.RULE
index 40b587646aa..517a0b67199 100644
--- a/src/licensedcode/data/rules/bsd-new_ecos.RULE
+++ b/src/licensedcode/data/rules/bsd-new_ecos.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_notice: yes
+---
+
//####BSDCOPYRIGHTBEGIN####
//
// -------------------------------------------
diff --git a/src/licensedcode/data/rules/bsd-new_ecos.yml b/src/licensedcode/data/rules/bsd-new_ecos.yml
deleted file mode 100644
index 95b560346de..00000000000
--- a/src/licensedcode/data/rules/bsd-new_ecos.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_notice: yes
diff --git a/src/licensedcode/data/rules/bsd-new_g3d.RULE b/src/licensedcode/data/rules/bsd-new_g3d.RULE
index 2937d3f4f32..3149ecdb2b3 100644
--- a/src/licensedcode/data/rules/bsd-new_g3d.RULE
+++ b/src/licensedcode/data/rules/bsd-new_g3d.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+minimum_coverage: 98
+---
+
code Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
code
code Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
@@ -6,4 +12,4 @@ code Redistributions in binary form must reproduce the above copyright notice, t
code
code Neither the name of University, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
code
-code THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+code THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_g3d.yml b/src/licensedcode/data/rules/bsd-new_g3d.yml
deleted file mode 100644
index 6d85ccc491d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_g3d.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
-minimum_coverage: 98
diff --git a/src/licensedcode/data/rules/bsd-new_jcraft.RULE b/src/licensedcode/data/rules/bsd-new_jcraft.RULE
index 1cc5a8ce931..104cef77960 100644
--- a/src/licensedcode/data/rules/bsd-new_jcraft.RULE
+++ b/src/licensedcode/data/rules/bsd-new_jcraft.RULE
@@ -1 +1,10 @@
+---
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 100
+notes: Found in Jcraft POMs
+ignorable_urls:
+ - http://www.jcraft.com/jsch/LICENSE.txt
+---
+
License: BSD (http://www.jcraft.com/jsch/LICENSE.txt)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_jcraft.yml b/src/licensedcode/data/rules/bsd-new_jcraft.yml
deleted file mode 100644
index 3048d4f7ce9..00000000000
--- a/src/licensedcode/data/rules/bsd-new_jcraft.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: bsd-new
-is_license_reference: yes
-relevance: 100
-notes: Found in Jcraft POMs
-ignorable_urls:
- - http://www.jcraft.com/jsch/LICENSE.txt
diff --git a/src/licensedcode/data/rules/bsd-new_jcraft_2.RULE b/src/licensedcode/data/rules/bsd-new_jcraft_2.RULE
index 99efbcccc9d..51533254d46 100644
--- a/src/licensedcode/data/rules/bsd-new_jcraft_2.RULE
+++ b/src/licensedcode/data/rules/bsd-new_jcraft_2.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: bsd-new
+is_license_text: yes
+---
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -20,4 +25,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_jcraft_2.yml b/src/licensedcode/data/rules/bsd-new_jcraft_2.yml
deleted file mode 100644
index 1940635e96d..00000000000
--- a/src/licensedcode/data/rules/bsd-new_jcraft_2.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: bsd-new
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/bsd-new_jcraft_3.RULE b/src/licensedcode/data/rules/bsd-new_jcraft_3.RULE
index 2a7dd6c4143..ee5441b44b1 100644
--- a/src/licensedcode/data/rules/bsd-new_jcraft_3.RULE
+++ b/src/licensedcode/data/rules/bsd-new_jcraft_3.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+ignorable_urls:
+ - http://www.jcraft.com/jsch
+---
+
License information from http://www.jcraft.com/jsch
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_jcraft_3.yml b/src/licensedcode/data/rules/bsd-new_jcraft_3.yml
deleted file mode 100644
index a5429501664..00000000000
--- a/src/licensedcode/data/rules/bsd-new_jcraft_3.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-ignorable_urls:
- - http://www.jcraft.com/jsch
diff --git a/src/licensedcode/data/rules/bsd-new_jcraft_4.RULE b/src/licensedcode/data/rules/bsd-new_jcraft_4.RULE
index 13017ff3fc1..33f9244b8ee 100644
--- a/src/licensedcode/data/rules/bsd-new_jcraft_4.RULE
+++ b/src/licensedcode/data/rules/bsd-new_jcraft_4.RULE
@@ -1 +1,9 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+ignorable_urls:
+ - http://www.jcraft.com/jsch/LICENSE.txt
+---
+
http://www.jcraft.com/jsch/LICENSE.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/bsd-new_jcraft_4.yml b/src/licensedcode/data/rules/bsd-new_jcraft_4.yml
deleted file mode 100644
index d89bdc35229..00000000000
--- a/src/licensedcode/data/rules/bsd-new_jcraft_4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: bsd-new
-is_license_tag: yes
-relevance: 100
-ignorable_urls:
- - http://www.jcraft.com/jsch/LICENSE.txt
diff --git a/src/licensedcode/data/rules/bsd-new_jcraft_5.RULE b/src/licensedcode/data/rules/bsd-new_jcraft_5.RULE
index cd11bef949b..40eb4947ed2 100644
--- a/src/licensedcode/data/rules/bsd-new_jcraft_5.RULE
+++ b/src/licensedcode/data/rules/bsd-new_jcraft_5.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: bsd-new
+is_license_tag: yes
+relevance: 100
+ignorable_urls:
+ - http://www.jcraft.com/jsch
+ - http://www.jcraft.com/jsch/LICENSE.txt
+---
+
, which is available under the following Creative
Commons Attribution 3.0 License. This applies only to the go-github source
diff --git a/src/licensedcode/data/rules/cc-by-3.0_77.yml b/src/licensedcode/data/rules/cc-by-3.0_77.yml
deleted file mode 100644
index e65d499e67d..00000000000
--- a/src/licensedcode/data/rules/cc-by-3.0_77.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-3.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://developer.github.com/
diff --git a/src/licensedcode/data/rules/cc-by-3.0_78.RULE b/src/licensedcode/data/rules/cc-by-3.0_78.RULE
index c1be8d0e916..ae4c930a345 100644
--- a/src/licensedcode/data/rules/cc-by-3.0_78.RULE
+++ b/src/licensedcode/data/rules/cc-by-3.0_78.RULE
@@ -1,2 +1,8 @@
+---
+license_expression: cc-by-3.0
+is_license_notice: yes
+relevance: 100
+---
+
available under the following Creative
Commons Attribution 3.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-3.0_78.yml b/src/licensedcode/data/rules/cc-by-3.0_78.yml
deleted file mode 100644
index 1efc1c1f174..00000000000
--- a/src/licensedcode/data/rules/cc-by-3.0_78.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-3.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-3.0_79.RULE b/src/licensedcode/data/rules/cc-by-3.0_79.RULE
index 61a7362b8cc..6d1f6865abe 100644
--- a/src/licensedcode/data/rules/cc-by-3.0_79.RULE
+++ b/src/licensedcode/data/rules/cc-by-3.0_79.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: cc-by-3.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by/3.0/
+---
+
Shared under the Creative Commons Attribution 3.0 Unported License
http://creativecommons.org/licenses/by/3.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-3.0_79.yml b/src/licensedcode/data/rules/cc-by-3.0_79.yml
deleted file mode 100644
index 16329623205..00000000000
--- a/src/licensedcode/data/rules/cc-by-3.0_79.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-3.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by/3.0/
diff --git a/src/licensedcode/data/rules/cc-by-3.0_8.RULE b/src/licensedcode/data/rules/cc-by-3.0_8.RULE
index f51101a2df1..aca55a8ac20 100644
--- a/src/licensedcode/data/rules/cc-by-3.0_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-3.0_8.RULE
@@ -1,2 +1,9 @@
+---
+license_expression: cc-by-3.0
+is_license_notice: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by/3.0/legalcode
+---
+
Distributed under the terms of the Creative Commons Attribution License
-version 3.0 (CC-BY 3.0)
This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 4.0 Unported License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_18.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_18.yml
deleted file mode 100644
index 152674048ad..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_18.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_19.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_19.RULE
index f412830b2ec..a6a24872c22 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_19.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_19.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0
+---
+
https://creativecommons.org/licenses/by-nc-nd/4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_19.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_19.yml
deleted file mode 100644
index 9189a82f8ef..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_19.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_2.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_2.RULE
index 1adc4ed3917..4d168a22d42 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_2.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_notice: yes
+relevance: 100
+---
+
licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_2.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_2.yml
deleted file mode 100644
index f9af455c0ff..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_20.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_20.RULE
index 8d3d0fbfcee..1ae5750dc3c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_20.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_20.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0/
+---
+
This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 4.0 Unported License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_20.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_20.yml
deleted file mode 100644
index adfae49248c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_20.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_21.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_21.RULE
index 8076ef9ffc3..996e2660ab3 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_21.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_21.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0/
+---
+
https://creativecommons.org/licenses/by-nc-nd/4.0/ Creative Commons Attribution-NonCommercial-NoDerivs 4.0 Unported License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_21.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_21.yml
deleted file mode 100644
index adfae49248c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_21.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_22.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_22.RULE
index 1c13dd63b18..213345385ad 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_22.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_22.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
CCBYNCNDv4 – Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_22.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_22.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_22.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_23.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_23.RULE
index 7abfb37cd1c..96c92472e58 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_23.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_23.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
CCBYNCNDv4
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_23.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_23.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_23.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_24.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_24.RULE
index 62feae996b4..aab24bf12fd 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_24.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_24.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_24.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_24.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_24.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_25.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_25.RULE
index 2517555ba0d..6a36443c37e 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_25.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_25.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en
+---
+
> You can use and share the unmodified images freely for non-commercial use.
> [](https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_25.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_25.yml
deleted file mode 100644
index 089ea129178..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_25.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_26.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_26.RULE
index c379c83a154..3e24f9e741d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_26.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_26.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en
+---
+
> [](https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_26.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_26.yml
deleted file mode 100644
index 030306f7932..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_26.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_27.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_27.RULE
index 23899bfcc6a..68ee74e229d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_27.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_27.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
> [![CC BY-NC-ND]
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_27.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_27.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_27.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_28.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_28.RULE
index 6ebde16d7b5..972687288f0 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_28.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_28.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en
+---
+
https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_28.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_28.yml
deleted file mode 100644
index 030306f7932..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_28.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_29.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_29.RULE
index 789dbb3a246..ce945901ab4 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_29.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_29.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Creative Commons Attribution-NonCommercial-NoDerivs License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_29.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_29.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_29.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_3.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_3.RULE
index e03d63414d3..f0408367602 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_3.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-NoDerivatives 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_3.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_3.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_3.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_30.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_30.RULE
index 5d9f8329e49..37bd8719e2a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_30.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_30.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Creative Commons Attribution-NonCommercial-NoDerivs
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_30.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_30.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_30.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_31.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_31.RULE
index bcfdd1711c1..96961b448dd 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_31.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_31.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Attribution-NonCommercial-NoDerivs License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_31.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_31.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_31.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_32.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_32.RULE
index 9f4ccd38d21..7a7f89a2a1d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_32.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_32.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Attribution-NonCommercial-NoDerivs
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_32.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_32.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_32.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_33.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_33.RULE
index 7b0e04db914..9c7aec23491 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_33.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_33.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Creative Commons Attribution Non Commercial No Derivatives License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_33.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_33.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_33.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_34.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_34.RULE
index ad4d510aefc..afc3ebb6844 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_34.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_34.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Creative Commons Attribution Non Commercial No Derivatives
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_34.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_34.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_34.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_35.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_35.RULE
index 5d4df71731a..9c90d353671 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_35.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_35.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Attribution Non Commercial No Derivatives License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_35.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_35.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_35.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_36.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_36.RULE
index 01317637d7d..fac362e567e 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_36.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_36.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 99
+minimum_coverage: 100
+---
+
Attribution Non Commercial No Derivatives
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_36.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_36.yml
deleted file mode 100644
index c62c6314f82..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_36.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 99
-minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_37.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_37.RULE
index 3aec2d48927..510e3b22d32 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_37.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_37.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-NoDerivatives 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_37.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_37.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_37.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_38.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_38.RULE
index 2d44b7eca67..e6163148aeb 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_38.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_38.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-NoDerivatives International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_38.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_38.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_38.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_39.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_39.RULE
index 14b853a9faa..46a2ad42685 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_39.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_39.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Creative Commons Attribution-NonCommercial-No Derivatives License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_39.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_39.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_39.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_4.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_4.RULE
index 82935890824..a2ee424d7ec 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_4.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_notice: yes
+relevance: 90
+---
+
The benchmark is distributed under the Creative Commons, Attribution-NonCommercial-NoDerivatives.
This license includes the benchmark database and its derivatives. For attribution, please cite this page,
and our publications below. This data is provided free of charge for non-commercial and academic
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_4.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_4.yml
deleted file mode 100644
index 1adbcf54e60..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_4.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_notice: yes
-relevance: 90
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_40.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_40.RULE
index 9d599185373..372ee6e574f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_40.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_40.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Creative Commons Attribution-NonCommercial-No Derivatives
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_40.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_40.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_40.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_41.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_41.RULE
index 6cfda343d9e..c9ddc3f00e5 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_41.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_41.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Attribution-NonCommercial-No Derivatives License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_41.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_41.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_41.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_42.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_42.RULE
index 1d55ca182a1..78bcc1dc0d4 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_42.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_42.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Attribution-NonCommercial-No Derivatives
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_42.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_42.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_42.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_43.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_43.RULE
index 68c811717b6..732ccdafb24 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_43.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_43.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Creative Commons Attribution Non Commercial NoDerivs License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_43.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_43.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_43.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_44.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_44.RULE
index 906fed6813b..7ff79c7ec59 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_44.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_44.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Creative Commons Attribution Non Commercial NoDerivs
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_44.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_44.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_44.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_45.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_45.RULE
index ba06223d90f..51c249a2b90 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_45.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_45.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Attribution Non Commercial NoDerivs License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_45.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_45.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_45.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_46.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_46.RULE
index d7844d59ab5..af13dc11a58 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_46.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_46.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 99
+---
+
Attribution Non Commercial NoDerivs
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_46.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_46.yml
deleted file mode 100644
index ae2d805fdc4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_46.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 99
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_47.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_47.RULE
index d4057b54699..748ef95fe23 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_47.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_47.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-NoDerivatives 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_47.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_47.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_47.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_48.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_48.RULE
index 59aecc74e73..efdc9b66960 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_48.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_48.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-NoDerivatives International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_48.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_48.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_48.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_49.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_49.RULE
index 5c8a85b4e24..e12a89ecfc3 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_49.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_49.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-nd/4.0/legalcode
+---
+
http://creativecommons.org/licenses/by-nc-nd/4.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_49.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_49.yml
deleted file mode 100644
index 8b5755552c7..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_49.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-nd/4.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_5.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_5.RULE
index 3c9064aad85..efc8f1db923 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_5.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_notice: yes
+relevance: 90
+---
+
distributed under the Creative Commons, Attribution-NonCommercial-NoDerivatives.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_5.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_5.yml
deleted file mode 100644
index 1adbcf54e60..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_5.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_notice: yes
-relevance: 90
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_50.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_50.RULE
index d4063a13f58..b59667bfcf2 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_50.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_50.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-nd/4.0/legalcode.txt
+---
+
http://creativecommons.org/licenses/by-nc-nd/4.0/legalcode.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_50.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_50.yml
deleted file mode 100644
index 0643aaac328..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_50.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-nd/4.0/legalcode.txt
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_51.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_51.RULE
index 33d6a67e1c5..06c6d69f69c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_51.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_51.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode
+---
+
https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_51.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_51.yml
deleted file mode 100644
index 51ea8e11dc8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_51.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_52.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_52.RULE
index 08709c0eaac..69e0578cefa 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_52.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_52.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode.txt
+---
+
https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_52.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_52.yml
deleted file mode 100644
index 00c66c08bc5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_52.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode.txt
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_53.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_53.RULE
index 66cd25bc8d1..9fce211b309 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_53.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_53.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_text: yes
+---
+
Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International
Creative Commons Corporation ("Creative Commons") is not a law firm and does
not provide legal services or legal advice. Distribution of Creative Commons
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_53.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_53.yml
deleted file mode 100644
index 58382e4fa61..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_53.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_54.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_54.RULE
index 6f8ec259edc..f273c9b9074 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_54.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_54.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution Non Commercial No Derivatives 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_54.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_54.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_54.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_55.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_55.RULE
index b595ffe006e..6e7b17ad622 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_55.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_55.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-ND-4.0 Creative Commons Attribution Non Commercial No Derivatives 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_55.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_55.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_55.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_56.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_56.RULE
index 89b1be97a27..5000418dc21 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_56.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_56.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial No Derivatives 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_56.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_56.yml
deleted file mode 100644
index d85b403e13a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_56.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_57.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_57.RULE
index ff2107ee6e7..db1517ab396 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_57.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_57.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
name: Creative Commons Attribution Non Commercial No Derivatives 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_57.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_57.yml
deleted file mode 100644
index d85b403e13a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_57.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_58.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_58.RULE
index d4d8708e251..b081fa6a0f4 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_58.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_58.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial No Derivatives 4.0 International CC-BY-NC-ND-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_58.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_58.yml
deleted file mode 100644
index d85b403e13a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_58.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_59.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_59.RULE
index 4d4d40f2c38..03220918ab2 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_59.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_59.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: CC-BY-NC-ND-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_59.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_59.yml
deleted file mode 100644
index da1dfb49487..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_59.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_6.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_6.RULE
index 7cf9287b98b..cd95fd29599 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_6.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_notice: yes
+relevance: 100
+---
+
distributed under Creative Commons license Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0).
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_6.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_6.yml
deleted file mode 100644
index f9af455c0ff..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_6.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_60.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_60.RULE
index d29599a9d49..a66b4aba4f7 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_60.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_60.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: Creative Commons Attribution Non Commercial No Derivatives 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_60.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_60.yml
deleted file mode 100644
index da1dfb49487..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_60.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_61.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_61.RULE
index f65db4f3f24..5c431f1c89b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_61.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_61.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
licenseId: CC-BY-NC-ND-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_61.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_61.yml
deleted file mode 100644
index da1dfb49487..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_61.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_62.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_62.RULE
index a58dc85f98c..3fc6770b451 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_62.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_62.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-ND-4.0 Creative Commons Attribution Non Commercial No Derivatives 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_62.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_62.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_62.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_63.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_63.RULE
index c746ae07728..434ae96b3c8 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_63.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_63.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_notice: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0/
+---
+
all content is licensed under https://creativecommons.org/licenses/by-nc-nd/4.0/ Creative Commons CC BY-NC-ND 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_63.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_63.yml
deleted file mode 100644
index e5641e76de7..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_63.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_notice: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_64.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_64.RULE
index 88db7d043e1..c9413c81a8e 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_64.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_64.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-NC-ND-4.0
+---
+
https://licenses.nuget.org/CC-BY-NC-ND-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_64.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_64.yml
deleted file mode 100644
index 7e97f429354..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_64.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-NC-ND-4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_65.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_65.RULE
index 49fa84a84fe..baeb22832fe 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_65.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_65.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-NC-ND-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_65.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_65.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_65.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_66.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_66.RULE
index e9f1c4c4e4f..30242a25806 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_66.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_66.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-ND-4.0
+---
+
{{CC-BY-NC-ND-4.0}} https://spdx.org/licenses/CC-BY-NC-ND-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_66.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_66.yml
deleted file mode 100644
index 2bbbe3eef26..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_66.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-ND-4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_67.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_67.RULE
index 62a00f10df4..5ea272f0ec9 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_67.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_67.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-ND-4.0
+---
+
LICENSE {{CC-BY-NC-ND-4.0}} https://spdx.org/licenses/CC-BY-NC-ND-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_67.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_67.yml
deleted file mode 100644
index 2bbbe3eef26..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_67.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-ND-4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_7.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_7.RULE
index 12550e75f96..948ab508c4a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_7.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_7.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons license Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0).
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_7.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_7.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_7.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_8.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_8.RULE
index 2e1f2e93357..e17fc25df7c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_8.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons license Attribution-NonCommercial-NoDerivatives 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_8.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_8.yml
deleted file mode 100644
index 07d97b07118..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_9.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_9.RULE
index 76ea485612f..2fa9a43d6ef 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_9.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_9.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-nd/4.0/
+---
+
This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 4.0 Unported License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_9.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_9.yml
deleted file mode 100644
index 6737cd7194c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_9.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-nd/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_licensebutton.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_licensebutton.RULE
index f42f9147e6d..99470343b70 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_licensebutton.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_licensebutton.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licensebuttons.net/l/by-nc-nd/4.0
+---
+
https://licensebuttons.net/l/by-nc-nd/4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_licensebutton.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_licensebutton.yml
deleted file mode 100644
index c892b5c063d..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_licensebutton.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licensebuttons.net/l/by-nc-nd/4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_1.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_1.RULE
index 1459cc1be47..a7e11492a15 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-nd-4.0
+---
+
https://spdx.org/licenses/cc-by-nc-nd-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_1.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_1.yml
deleted file mode 100644
index 1be23a66af4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-nd-4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_2.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_2.RULE
index 9eb35395fca..753ac0c45c3 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_2.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-nd-4.0.html
+---
+
https://spdx.org/licenses/cc-by-nc-nd-4.0.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_2.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_2.yml
deleted file mode 100644
index 361bae3dd76..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-nd-4.0.html
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge.RULE
index 49ac758e3ec..0964e1da02a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0
+---
+
[](https://creativecommons.org/licenses/by-nc-nd/4.0/)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge.yml
deleted file mode 100644
index 18bf034ae9a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge_1.RULE b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge_1.RULE
index 9b80463ec99..3c2d9267013 100644
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-nd-4.0
+is_license_reference: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-nd/4.0
+ - https://img.shields.io/badge/License-CC%20BY--NC--ND%204.0-lightgrey.svg
+---
+
[](https://creativecommons.org/licenses/by-nc-nd/4.0/)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge_1.yml b/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge_1.yml
deleted file mode 100644
index caef7f177f2..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-nd-4.0_url_badge_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-nd-4.0
-is_license_reference: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-nd/4.0
- - https://img.shields.io/badge/License-CC%20BY--NC--ND%204.0-lightgrey.svg
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0.RULE
index fc75779f3d3..9ee12a81ebb 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/1.0/legalcode
+---
+
http://creativecommons.org/licenses/by-nc-sa/1.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0.SPDX.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0.SPDX.RULE
index 2a21801ffb5..4cced0907b6 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0.SPDX.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0.SPDX.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_text: yes
+minimum_coverage: 10
+notes: license text as published by SPDX
+ignorable_urls:
+ - http://creativecommons.org/
+---
+
Creative Commons
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0.SPDX.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0.SPDX.yml
deleted file mode 100644
index de3f34756a4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0.SPDX.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_text: yes
-minimum_coverage: 10
-notes: license text as published by SPDX
-ignorable_urls:
- - http://creativecommons.org/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0.yml
deleted file mode 100644
index ab96dfbec60..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/1.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_1.RULE
index 45da59d6b7d..aa99cbcc132 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/1.0/
+---
+
http://creativecommons.org/licenses/by-nc-sa/1.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_1.yml
deleted file mode 100644
index b8ad189bfdc..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/1.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_10.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_10.RULE
index 9ae2658b441..e327b48a48a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_10.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_10.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_text: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 1.0 License
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_10.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_10.yml
deleted file mode 100644
index 9572b04b65c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_10.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_11.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_11.RULE
index 9321d42a534..72ad4ad4bd6 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_11.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_11.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 90
+ignorable_urls:
+ - http://creativecommons.org/licenses/nc-sa/1.0/legalcode
+---
+
http://creativecommons.org/licenses/nc-sa/1.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_11.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_11.yml
deleted file mode 100644
index 3c12db90d56..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_11.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 90
-ignorable_urls:
- - http://creativecommons.org/licenses/nc-sa/1.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_12.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_12.RULE
index 1988caa7e2c..e44e8d514cf 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_12.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_12.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/1.0/legalcode
+---
+
https://creativecommons.org/licenses/by-nc-sa/1.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_12.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_12.yml
deleted file mode 100644
index bec5c4b75a8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_12.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/1.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_13.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_13.RULE
index 0bbd45cb276..c454b764b10 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_13.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_13.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 90
+ignorable_urls:
+ - https://creativecommons.org/licenses/nc-sa/1.0
+---
+
https://creativecommons.org/licenses/nc-sa/1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_13.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_13.yml
deleted file mode 100644
index b60f5aa1c32..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_13.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 90
-ignorable_urls:
- - https://creativecommons.org/licenses/nc-sa/1.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_14.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_14.RULE
index 0e79f28ba99..ff21b9570fb 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_14.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_14.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 90
+ignorable_urls:
+ - https://creativecommons.org/licenses/nc-sa/1.0/legalcode
+---
+
https://creativecommons.org/licenses/nc-sa/1.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_14.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_14.yml
deleted file mode 100644
index c8e9c731738..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_14.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 90
-ignorable_urls:
- - https://creativecommons.org/licenses/nc-sa/1.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_15.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_15.RULE
index 6125495d2fe..58935d6d549 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_15.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_15.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_text: yes
+ignorable_urls:
+ - http://creativecommons.org/
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 1.0 CREATIVE COMMONS
CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION
OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_15.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_15.yml
deleted file mode 100644
index 3e6a1085b60..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_15.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_text: yes
-ignorable_urls:
- - http://creativecommons.org/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_16.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_16.RULE
index 4c71066fe9a..32ceeae87a0 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_16.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_16.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-1.0 Creative Commons Attribution Non Commercial Share Alike 1.0 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_16.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_16.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_16.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_17.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_17.RULE
index 8ee65074169..e80e3c97d48 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_17.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_17.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 1.0 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_17.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_17.yml
deleted file mode 100644
index 30ca05ad1d1..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_17.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_18.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_18.RULE
index f343c63eb72..b035faba90d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_18.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_18.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
name: Creative Commons Attribution Non Commercial Share Alike 1.0 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_18.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_18.yml
deleted file mode 100644
index 30ca05ad1d1..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_18.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_19.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_19.RULE
index b9bdc986e29..d99fb71b448 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_19.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_19.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 1.0 Generic CC-BY-NC-SA-1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_19.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_19.yml
deleted file mode 100644
index 30ca05ad1d1..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_19.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_2.RULE
index 3e7105376c3..fefd5fe5d46 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_2.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_2.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_20.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_20.RULE
index c55844a3598..252d15410b6 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_20.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_20.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: CC-BY-NC-SA-1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_20.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_20.yml
deleted file mode 100644
index da7fe5200e4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_20.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_21.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_21.RULE
index d4e67b6a4ef..f152edc52c4 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_21.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_21.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: Creative Commons Attribution Non Commercial Share Alike 1.0 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_21.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_21.yml
deleted file mode 100644
index da7fe5200e4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_21.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_22.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_22.RULE
index 38854ca22ee..6b8a3660575 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_22.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_22.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
licenseId: CC-BY-NC-SA-1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_22.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_22.yml
deleted file mode 100644
index da7fe5200e4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_22.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_23.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_23.RULE
index 972810f2f9c..84ac61bb1d8 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_23.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_23.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-1.0 Creative Commons Attribution Non Commercial Share Alike 1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_23.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_23.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_23.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_24.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_24.RULE
index 4291502e3c7..ca1c87c4409 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_24.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_24.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-NC-SA-1.0
+---
+
https://licenses.nuget.org/CC-BY-NC-SA-1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_24.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_24.yml
deleted file mode 100644
index 6178031e709..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_24.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-NC-SA-1.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_25.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_25.RULE
index 3b936fc56b0..24779804c62 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_25.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_25.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-NC-SA-1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_25.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_25.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_25.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_26.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_26.RULE
index a39e0de25aa..561fd202828 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_26.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_26.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-1.0
+---
+
{{CC-BY-NC-SA-1.0}} https://spdx.org/licenses/CC-BY-NC-SA-1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_26.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_26.yml
deleted file mode 100644
index 7e87bdb2204..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_26.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-1.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_27.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_27.RULE
index 8d40978bd73..e80a407fb6b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_27.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_27.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-1.0
+---
+
LICENSE {{CC-BY-NC-SA-1.0}} https://spdx.org/licenses/CC-BY-NC-SA-1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_27.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_27.yml
deleted file mode 100644
index 7e87bdb2204..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_27.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-1.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_3.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_3.RULE
index 8cd1c684f27..84a6f351f42 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_3.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 1.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_3.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_3.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_3.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_4.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_4.RULE
index 73cc396fb95..848570255ae 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_4.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 1.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_4.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_4.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_4.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_5.RULE
index 93f25bcefbe..42f520dd091 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_5.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 1.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_5.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_5.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_6.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_6.RULE
index c0435732cdb..2c2bed7faca 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_6.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 1.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_6.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_6.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_6.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_7.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_7.RULE
index 3aa6a5b9bef..db6e86a7e3d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_7.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_7.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_7.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_7.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_7.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_8.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_8.RULE
index a7bf03bfd6d..c8142ecf8a0 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_8.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_8.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_8.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_9.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_9.RULE
index bd0fefa11cb..e9450e0948e 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_9.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_9.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_9.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_9.yml
deleted file mode 100644
index 1243756ec35..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_9.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_license_button.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_license_button.RULE
index 55577582baf..849e7d8ffbb 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_license_button.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_license_button.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licensebuttons.net/l/nc-sa/1.0/
+---
+
https://licensebuttons.net/l/nc-sa/1.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_license_button.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_license_button.yml
deleted file mode 100644
index 8c387fb3a0c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_license_button.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licensebuttons.net/l/nc-sa/1.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_licensebutton.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_licensebutton.RULE
index 36fbe42453c..b70121c6f35 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_licensebutton.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_licensebutton.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licensebuttons.net/l/by-nc-sa/1.0
+---
+
https://licensebuttons.net/l/by-nc-sa/1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_licensebutton.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_licensebutton.yml
deleted file mode 100644
index 9fef00be63c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_licensebutton.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licensebuttons.net/l/by-nc-sa/1.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_1.RULE
index b6a061fbfec..12b4ef53dfd 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-sa-1.0
+---
+
https://spdx.org/licenses/cc-by-nc-sa-1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_1.yml
deleted file mode 100644
index 0a2404d70f8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-sa-1.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_2.RULE
index e83e4d577f1..dcc8c2f66c0 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_2.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-sa-1.0.html
+---
+
https://spdx.org/licenses/cc-by-nc-sa-1.0.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_2.yml
deleted file mode 100644
index 632164166da..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-sa-1.0.html
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_glc_11.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_glc_11.RULE
index 1711d4e6efd..6c219db2245 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_glc_11.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_glc_11.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-1.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/1.0
+---
+
https://creativecommons.org/licenses/by-nc-sa/1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_glc_11.yml b/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_glc_11.yml
deleted file mode 100644
index 4c4af1b62b3..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-1.0_url_glc_11.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-1.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/1.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_1.RULE
index ad6c5bc3857..de8b6d55ede 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_1.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0-fr
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-2.0-FR Creative Commons Attribution-NonCommercial-ShareAlike 2.0 France
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_1.yml
deleted file mode 100644
index 112c21ec1b5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-fr
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_2.RULE
index 16933806071..16d4561d04c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_2.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0-fr
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 2.0 France
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_2.yml
deleted file mode 100644
index 112c21ec1b5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-fr
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_3.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_3.RULE
index 9f50b6140c3..943afdb19db 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_3.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0-fr
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-NC-SA-2.0-FR
+---
+
https://licenses.nuget.org/CC-BY-NC-SA-2.0-FR
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_3.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_3.yml
deleted file mode 100644
index 1daed6af20d..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_3.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-fr
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-NC-SA-2.0-FR
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_4.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_4.RULE
index a8cab2d35eb..7df394461be 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_4.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0-fr
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-NC-SA-2.0-FR
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_4.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_4.yml
deleted file mode 100644
index 112c21ec1b5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_4.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-fr
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_5.RULE
index d6c1f3a56a8..09f2a51f457 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_5.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-2.0-fr
+is_license_reference: yes
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-2.0-FR
+---
+
LICENSE {{CC-BY-NC-SA-2.0-FR}} https://spdx.org/licenses/CC-BY-NC-SA-2.0-FR
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_5.yml
deleted file mode 100644
index aa5c55312b0..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_5.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-fr
-is_license_reference: yes
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-2.0-FR
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_6.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_6.RULE
index 36c1e28105a..fbf41c370b8 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_6.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-2.0-fr
+is_license_reference: yes
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-2.0-FR
+---
+
{{CC-BY-NC-SA-2.0-FR}} https://spdx.org/licenses/CC-BY-NC-SA-2.0-FR
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_6.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_6.yml
deleted file mode 100644
index aa5c55312b0..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-fr_6.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-fr
-is_license_reference: yes
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-2.0-FR
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_1.RULE
index ccf1117749d..36aee6300e0 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_1.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution Non Commercial Share Alike 2.0 England and Wales
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_1.yml
deleted file mode 100644
index 4934d3ec48a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_10.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_10.RULE
index 6cdd3158c8c..0682c88d8cf 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_10.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_10.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_reference: yes
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-2.0-UK
+---
+
{{CC-BY-NC-SA-2.0-UK}} https://spdx.org/licenses/CC-BY-NC-SA-2.0-UK
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_10.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_10.yml
deleted file mode 100644
index 81efb007a93..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_10.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_reference: yes
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-2.0-UK
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_11.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_11.RULE
index 0dd84ae201a..957c2af6f16 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_11.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_11.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_reference: yes
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-2.0-UK
+---
+
LICENSE {{CC-BY-NC-SA-2.0-UK}} https://spdx.org/licenses/CC-BY-NC-SA-2.0-UK
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_11.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_11.yml
deleted file mode 100644
index 81efb007a93..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_11.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_reference: yes
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-2.0-UK
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_2.RULE
index 05e1652f000..d322919457f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_2.RULE
@@ -1 +1,6 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_reference: yes
+---
+
CC-BY-NC-SA-2.0-UK Creative Commons Attribution Non Commercial Share Alike 2.0 England and Wales
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_2.yml
deleted file mode 100644
index e3db88cf44b..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_2.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_reference: yes
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_3.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_3.RULE
index a107de031b4..7fddbcb490f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_3.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
name: Creative Commons Attribution Non Commercial Share Alike 2.0 England and Wales
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_3.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_3.yml
deleted file mode 100644
index 01d70977177..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_3.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_4.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_4.RULE
index 2fe990828e5..dd0c45d7a0a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_4.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_reference: yes
+is_continuous: yes
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 2.0 England and Wales CC-BY-NC-SA-2.0-UK
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_4.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_4.yml
deleted file mode 100644
index 02cae9e2feb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_reference: yes
-is_continuous: yes
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_5.RULE
index bbd27ff72da..9c897b6cae9 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_5.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: CC-BY-NC-SA-2.0-UK
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_5.yml
deleted file mode 100644
index 97077672a23..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_5.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_6.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_6.RULE
index 4a420eddc46..6049c36164b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_6.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: Creative Commons Attribution Non Commercial Share Alike 2.0 England and Wales
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_6.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_6.yml
deleted file mode 100644
index 97077672a23..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_6.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_7.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_7.RULE
index 2715861fe73..c17f671c8cb 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_7.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_7.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
licenseId: CC-BY-NC-SA-2.0-UK
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_7.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_7.yml
deleted file mode 100644
index 97077672a23..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_7.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_8.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_8.RULE
index 02a1f7a3acf..fd6c651dc76 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_8.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-NC-SA-2.0-UK
+---
+
https://licenses.nuget.org/CC-BY-NC-SA-2.0-UK
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_8.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_8.yml
deleted file mode 100644
index 6cd5e5c401d..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_8.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-NC-SA-2.0-UK
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_9.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_9.RULE
index 5a5f738c268..1a0df98bc13 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_9.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_9.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0-uk
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-NC-SA-2.0-UK
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_9.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_9.yml
deleted file mode 100644
index 4934d3ec48a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0-uk_9.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0-uk
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0.RULE
index ec0a5375684..eee0a796f7e 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/2.0/
+---
+
http://creativecommons.org/licenses/by-nc-sa/2.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0.SPDX.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0.SPDX.RULE
index 28801577d62..176b56392d4 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0.SPDX.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0.SPDX.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_text: yes
+minimum_coverage: 10
+notes: license text as published by SPDX
+ignorable_urls:
+ - http://creativecommons.org/
+---
+
Creative Commons
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0.SPDX.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0.SPDX.yml
deleted file mode 100644
index 81cfff3154d..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0.SPDX.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_text: yes
-minimum_coverage: 10
-notes: license text as published by SPDX
-ignorable_urls:
- - http://creativecommons.org/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0.yml
deleted file mode 100644
index 99bcbac0d50..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/2.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_1.RULE
index 410bba433a5..3da6900ed22 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/2.0/legalcode
+---
+
http://creativecommons.org/licenses/by-nc-sa/2.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_1.yml
deleted file mode 100644
index 1c6fcaefa71..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/2.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_10.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_10.RULE
index d6a12a2c08b..e7d03295807 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_10.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_10.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 2.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_10.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_10.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_10.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_11.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_11.RULE
index 72bf334a56c..ed70b7d0963 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_11.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_11.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 2.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_11.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_11.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_11.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_12.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_12.RULE
index 38ee9be6978..cf01f213aac 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_12.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_12.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 2.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_12.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_12.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_13.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_13.RULE
index 03ff47a0ec8..d0677b43904 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_13.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_13.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_13.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_13.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_13.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_14.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_14.RULE
index 1b775daa7d1..138598953df 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_14.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_14.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_14.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_14.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_14.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_15.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_15.RULE
index 502d7aad5c2..44ccf8ec6f2 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_15.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_15.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_15.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_15.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_15.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_16.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_16.RULE
index 4d8a5a91cee..dc1a60c400d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_16.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_16.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_text: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 2.0 License
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_16.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_16.yml
deleted file mode 100644
index bac96727f3a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_16.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_17.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_17.RULE
index c1faf237be2..eab8869a52c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_17.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_17.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_notice: yes
+relevance: 100
+notes: https://raw.githubusercontent.com/Carthage/Carthage/master/LICENSE.md
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/2.0
+---
+
Header backdrop photo is released under the [Attribution-NonCommercial-ShareAlike 2.0 Generic (CC BY-NC-SA 2.0)](https://creativecommons.org/licenses/by-nc-sa/2.0/) license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_17.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_17.yml
deleted file mode 100644
index adb21d07f2e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_17.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_notice: yes
-relevance: 100
-notes: https://raw.githubusercontent.com/Carthage/Carthage/master/LICENSE.md
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/2.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_18.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_18.RULE
index 9b63a8af151..a64ec581714 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_18.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_18.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_notice: yes
+relevance: 100
+notes: https://raw.githubusercontent.com/Carthage/Carthage/master/LICENSE.md
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/2.0
+---
+
released under the [Attribution-NonCommercial-ShareAlike 2.0 Generic (CC BY-NC-SA 2.0)](https://creativecommons.org/licenses/by-nc-sa/2.0/) license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_18.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_18.yml
deleted file mode 100644
index adb21d07f2e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_18.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_notice: yes
-relevance: 100
-notes: https://raw.githubusercontent.com/Carthage/Carthage/master/LICENSE.md
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/2.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_19.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_19.RULE
index ec952025a77..6755bb9a876 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_19.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_19.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_notice: yes
+relevance: 100
+notes: https://raw.githubusercontent.com/Carthage/Carthage/master/LICENSE.md
+---
+
released under the [Attribution-NonCommercial-ShareAlike 2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_19.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_19.yml
deleted file mode 100644
index 0056e288a2c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_19.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_notice: yes
-relevance: 100
-notes: https://raw.githubusercontent.com/Carthage/Carthage/master/LICENSE.md
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_2.RULE
index 00d4136a587..6b091bbf5c5 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_2.RULE
@@ -1 +1,8 @@
-is released under the [Attribution-NonCommercial-ShareAlike 2.0 Generic (CC BY-NC-SA 2.0)](https://creativecommons.org/licenses/by-nc-sa/2.0/) license.
\ No newline at end of file
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_notice: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/2.0
+---
+
+is released under the [Attribution-NonCommercial-ShareAlike 2.0 Generic (CC BY-NC-SA 2.0)](https://creativecommons.org/licenses/by-nc-sa/2.0/) license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_2.yml
deleted file mode 100644
index 356c78faeed..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_notice: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/2.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_20.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_20.RULE
index 411179028fb..03eb54fbb8d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_20.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_20.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 90
+ignorable_urls:
+ - http://creativecommons.org/licenses/nc-sa/2.0/legalcode
+---
+
http://creativecommons.org/licenses/nc-sa/2.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_20.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_20.yml
deleted file mode 100644
index a672ce93991..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_20.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 90
-ignorable_urls:
- - http://creativecommons.org/licenses/nc-sa/2.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_21.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_21.RULE
index d3938696ca0..3598e230a0f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_21.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_21.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/2.0/legalcode
+---
+
https://creativecommons.org/licenses/by-nc-sa/2.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_21.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_21.yml
deleted file mode 100644
index d35a62e58ac..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_21.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/2.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_22.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_22.RULE
index ec3fb6dca59..58a6f2852a1 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_22.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_22.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 90
+ignorable_urls:
+ - https://creativecommons.org/licenses/nc-sa/2.0/legalcode
+---
+
https://creativecommons.org/licenses/nc-sa/2.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_22.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_22.yml
deleted file mode 100644
index bd3623a7318..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_22.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 90
-ignorable_urls:
- - https://creativecommons.org/licenses/nc-sa/2.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_23.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_23.RULE
index f825aed332b..dfc2a9930e4 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_23.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_23.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_text: yes
+ignorable_urls:
+ - http://creativecommons.org/
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 2.0 CREATIVE COMMONS
CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION
OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_23.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_23.yml
deleted file mode 100644
index 479bb6c290a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_23.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_text: yes
-ignorable_urls:
- - http://creativecommons.org/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_24.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_24.RULE
index 5599a8a6461..540b67f6ec7 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_24.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_24.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-2.0 Creative Commons Attribution Non Commercial Share Alike 2.0 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_24.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_24.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_24.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_25.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_25.RULE
index 86d0f8e931f..57ce55a9688 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_25.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_25.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 2.0 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_25.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_25.yml
deleted file mode 100644
index b0f8cf2587b..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_25.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_26.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_26.RULE
index 16209972708..13038791706 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_26.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_26.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
name: Creative Commons Attribution Non Commercial Share Alike 2.0 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_26.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_26.yml
deleted file mode 100644
index b0f8cf2587b..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_26.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_27.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_27.RULE
index 1330397b9ee..97794c0226e 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_27.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_27.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 2.0 Generic CC-BY-NC-SA-2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_27.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_27.yml
deleted file mode 100644
index b0f8cf2587b..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_27.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_28.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_28.RULE
index 352ce274ff9..8252ccad8b4 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_28.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_28.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: CC-BY-NC-SA-2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_28.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_28.yml
deleted file mode 100644
index 1143712547e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_28.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_29.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_29.RULE
index 2ebc2dc89a7..1f0a1c7d273 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_29.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_29.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: Creative Commons Attribution Non Commercial Share Alike 2.0 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_29.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_29.yml
deleted file mode 100644
index 1143712547e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_29.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_3.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_3.RULE
index fc711c005af..9dbf0bbd50a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_3.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_notice: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/2.0
+---
+
is released under the [CC BY-NC-SA 2.0](https://creativecommons.org/licenses/by-nc-sa/2.0/) license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_3.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_3.yml
deleted file mode 100644
index 356c78faeed..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_3.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_notice: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/2.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_30.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_30.RULE
index e656e8c4713..7d8e7f05ca9 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_30.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_30.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
licenseId: CC-BY-NC-SA-2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_30.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_30.yml
deleted file mode 100644
index 1143712547e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_30.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_31.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_31.RULE
index 67318fff675..da517d8f9f0 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_31.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_31.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-2.0 Creative Commons Attribution Non Commercial Share Alike 2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_31.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_31.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_31.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_32.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_32.RULE
index 7c9034edb73..ec31bc295e8 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_32.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_32.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-NC-SA-2.0
+---
+
https://licenses.nuget.org/CC-BY-NC-SA-2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_32.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_32.yml
deleted file mode 100644
index 3053a0462bb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_32.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-NC-SA-2.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_33.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_33.RULE
index 7e0887b262f..d0e5868e3a5 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_33.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_33.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-NC-SA-2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_33.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_33.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_33.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_34.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_34.RULE
index 98cd5fc0d5f..b2dc1dae8f9 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_34.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_34.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-2.0
+---
+
{{CC-BY-NC-SA-2.0}} https://spdx.org/licenses/CC-BY-NC-SA-2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_34.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_34.yml
deleted file mode 100644
index b5ca95c5077..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_34.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-2.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_35.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_35.RULE
index 4f7d3b06435..b5a8bfda6af 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_35.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_35.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-2.0
+---
+
LICENSE {{CC-BY-NC-SA-2.0}} https://spdx.org/licenses/CC-BY-NC-SA-2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_35.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_35.yml
deleted file mode 100644
index b5ca95c5077..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_35.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-2.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_4.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_4.RULE
index cd9622d05be..bf241bea268 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_4.RULE
@@ -1,2 +1,8 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_notice: yes
+relevance: 100
+---
+
* This software is licensed under the "Creative Commons
- * License (Attribution-NonCommercial-ShareAlike 2.0)"
+ * License (Attribution-NonCommercial-ShareAlike 2.0)"
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_4.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_4.yml
deleted file mode 100644
index 1e4eb33c669..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_4.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_5.RULE
index d51071c465f..6eed324a0b4 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_5.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/2.0/
+---
+
* This software is licensed under the "Creative Commons
* License (Attribution-NonCommercial-ShareAlike 2.0)"
* and is copyrighted by
@@ -8,4 +15,4 @@
* is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * PURPOSE.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_5.yml
deleted file mode 100644
index 61252425022..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_5.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/2.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_6.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_6.RULE
index 5cc8d3398e5..38b151cb428 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_6.RULE
@@ -1,7 +1,14 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/2.0/
+---
+
* This software is licensed under the "Creative Commons
* License (Attribution-NonCommercial-ShareAlike 2.0)"
* and is copyrighted by
*
* Further information on this license can be found at:
* http://creativecommons.org/licenses/by-nc-sa/2.0/
- *
\ No newline at end of file
+ *
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_6.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_6.yml
deleted file mode 100644
index 61252425022..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_6.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/2.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_7.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_7.RULE
index da92d1c103f..e62cbce66ab 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_7.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_7.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_7.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_7.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_7.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_8.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_8.RULE
index d10f717c3ee..a8095df626a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_8.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
CCBYNCSAv2
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_8.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_8.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_9.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_9.RULE
index 349ef92d4b0..57a1157f86a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_9.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_9.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 2.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_9.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_9.yml
deleted file mode 100644
index 6df764733c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_9.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button.RULE
index 97d60253c0d..94468dd5e8f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licensebuttons.net/l/nc-sa/
+---
+
https://licensebuttons.net/l/nc-sa/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button.yml
deleted file mode 100644
index 3f05f520f58..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licensebuttons.net/l/nc-sa/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button_1.RULE
index 466cfdda8c8..ba660b77c9e 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licensebuttons.net/l/nc-sa/2.0/
+---
+
https://licensebuttons.net/l/nc-sa/2.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button_1.yml
deleted file mode 100644
index 22cafdc8c6c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_license_button_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licensebuttons.net/l/nc-sa/2.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_licensebutton.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_licensebutton.RULE
index e720bf576b3..7db82a0ae4f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_licensebutton.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_licensebutton.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licensebuttons.net/l/by-nc-sa/2.0
+---
+
https://licensebuttons.net/l/by-nc-sa/2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_licensebutton.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_licensebutton.yml
deleted file mode 100644
index 61dbeed9a16..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_licensebutton.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licensebuttons.net/l/by-nc-sa/2.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_1.RULE
index 16301a8005f..bd1a78b5876 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-sa-2.0
+---
+
https://spdx.org/licenses/cc-by-nc-sa-2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_1.yml
deleted file mode 100644
index 75f249b95d8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-sa-2.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_2.RULE
index aa0f9c2ccfc..269623fd77c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_2.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-sa-2.0.html
+---
+
https://spdx.org/licenses/cc-by-nc-sa-2.0.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_2.yml
deleted file mode 100644
index 610b0bb12df..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-sa-2.0.html
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_glc_13.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_glc_13.RULE
index a888b835d5e..61397d4af3e 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_glc_13.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_glc_13.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/2.0
+---
+
https://creativecommons.org/licenses/by-nc-sa/2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_glc_13.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_glc_13.yml
deleted file mode 100644
index 591bc51cc60..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.0_url_glc_13.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/2.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5.RULE
index 6ee28e995e2..17e079dd46b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/2.5/
+---
+
http://creativecommons.org/licenses/by-nc-sa/2.5/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5.SPDX.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5.SPDX.RULE
index c50ce32bbed..c585940f781 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5.SPDX.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5.SPDX.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_text: yes
+minimum_coverage: 10
+notes: license text as published by SPDX
+ignorable_urls:
+ - http://creativecommons.org/
+---
+
Creative Commons
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5.SPDX.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5.SPDX.yml
deleted file mode 100644
index 8469f428351..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5.SPDX.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_text: yes
-minimum_coverage: 10
-notes: license text as published by SPDX
-ignorable_urls:
- - http://creativecommons.org/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5.yml
deleted file mode 100644
index a361dafe863..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/2.5/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_1.RULE
index d500407ee85..2ac5c36b25a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
+---
+
http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_1.yml
deleted file mode 100644
index 257d2aa133a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_10.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_10.RULE
index a1d158f86f3..8bd307568ac 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_10.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_10.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 2.5 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_10.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_10.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_10.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_11.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_11.RULE
index 257bba60b69..2e6ca8c752a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_11.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_11.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 2.5 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_11.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_11.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_11.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_12.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_12.RULE
index ed700149502..4c3e37add8e 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_12.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_12.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_12.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_12.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_13.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_13.RULE
index 0b5798be345..0d7ab5a35f2 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_13.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_13.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_13.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_13.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_13.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_14.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_14.RULE
index 0860cbe18e2..3de8fa4b19f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_14.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_14.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_14.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_14.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_14.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_15.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_15.RULE
index b4f19aad925..345eddb4a3b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_15.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_15.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_text: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_15.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_15.yml
deleted file mode 100644
index 53fa1cfbe7d..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_15.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_16.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_16.RULE
index 82dbb94d4e8..bbac3a817ea 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_16.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_16.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
+---
+
https://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_16.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_16.yml
deleted file mode 100644
index e5cfbb24032..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_16.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_17.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_17.RULE
index e9a8bb394c2..f302a5be6be 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_17.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_17.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_text: yes
+ignorable_urls:
+ - http://creativecommons.org/
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 2.5 CREATIVE COMMONS
CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION
OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_17.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_17.yml
deleted file mode 100644
index e7c63e077b8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_17.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_text: yes
-ignorable_urls:
- - http://creativecommons.org/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_18.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_18.RULE
index 90e1567709d..87ffea9d471 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_18.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_18.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-2.5 Creative Commons Attribution Non Commercial Share Alike 2.5 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_18.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_18.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_18.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_19.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_19.RULE
index bf53bd57104..59b99d96923 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_19.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_19.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 2.5 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_19.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_19.yml
deleted file mode 100644
index abd34a1fbc7..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_19.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_2.RULE
index 4c70d0efa0c..41385dbd143 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_2.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_2.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_20.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_20.RULE
index 4145a481229..b6a045ca4ce 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_20.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_20.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
name: Creative Commons Attribution Non Commercial Share Alike 2.5 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_20.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_20.yml
deleted file mode 100644
index abd34a1fbc7..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_20.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_21.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_21.RULE
index 8691ba7b27f..cdf6c5f62a4 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_21.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_21.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 2.5 Generic CC-BY-NC-SA-2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_21.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_21.yml
deleted file mode 100644
index abd34a1fbc7..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_21.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_22.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_22.RULE
index 01f0e1a3b11..f77ba4e62f7 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_22.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_22.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: CC-BY-NC-SA-2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_22.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_22.yml
deleted file mode 100644
index 5399c015cbc..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_22.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_23.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_23.RULE
index f02d561bf48..d2f4307716f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_23.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_23.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: Creative Commons Attribution Non Commercial Share Alike 2.5 Generic
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_23.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_23.yml
deleted file mode 100644
index 5399c015cbc..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_23.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_24.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_24.RULE
index 2643563884d..faf4b6d5c3c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_24.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_24.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
licenseId: CC-BY-NC-SA-2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_24.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_24.yml
deleted file mode 100644
index 5399c015cbc..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_24.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_25.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_25.RULE
index 78dbf746635..90167324ce0 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_25.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_25.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-2.5 Creative Commons Attribution Non Commercial Share Alike 2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_25.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_25.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_25.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_26.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_26.RULE
index f5bb87676fb..8b0d72df742 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_26.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_26.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-NC-SA-2.5
+---
+
https://licenses.nuget.org/CC-BY-NC-SA-2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_26.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_26.yml
deleted file mode 100644
index afc64183361..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_26.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-NC-SA-2.5
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_27.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_27.RULE
index 0b032840a1b..557742f56d9 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_27.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_27.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-NC-SA-2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_27.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_27.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_27.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_28.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_28.RULE
index c30e0b1ef34..2d156a611aa 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_28.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_28.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-2.5
+---
+
{{CC-BY-NC-SA-2.5}} https://spdx.org/licenses/CC-BY-NC-SA-2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_28.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_28.yml
deleted file mode 100644
index 0d28cf444e5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_28.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-2.5
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_29.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_29.RULE
index 787e6dea131..dffc928a18c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_29.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_29.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-2.5
+---
+
LICENSE {{CC-BY-NC-SA-2.5}} https://spdx.org/licenses/CC-BY-NC-SA-2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_29.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_29.yml
deleted file mode 100644
index 0d28cf444e5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_29.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-2.5
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_3.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_3.RULE
index d5ad611b681..fe98d51b2fc 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_3.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/2.5/
+---
+
The data is distributed with the Natural Language Toolkit under the terms of
the Creative Commons Attribution-NonCommercial-ShareAlike License
[http://creativecommons.org/licenses/by-nc-sa/2.5/].
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_3.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_3.yml
deleted file mode 100644
index 988ef9fb7d6..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_3.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/2.5/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_4.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_4.RULE
index 720f085f6a6..1f4a3f544af 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_4.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/2.5/
+---
+
The data is distributed with the Natural Language Toolkit under the terms of
the Creative Commons Attribution-NonCommercial-ShareAlike License
[https://creativecommons.org/licenses/by-nc-sa/2.5/].
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_4.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_4.yml
deleted file mode 100644
index b99e781bec2..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/2.5/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_5.RULE
index 6f836914b64..817479abf71 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_5.RULE
@@ -1,2 +1,8 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_notice: yes
+relevance: 100
+---
+
The data is distributed with the Natural Language Toolkit under the terms of
the Creative Commons Attribution-NonCommercial-ShareAlike License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_5.yml
deleted file mode 100644
index 5fd37c51481..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_5.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_6.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_6.RULE
index 0ce3930ff8e..1c8e362fb17 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_6.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/2.5/
+---
+
The data is distributed under the terms of
the Creative Commons Attribution-NonCommercial-ShareAlike License
[http://creativecommons.org/licenses/by-nc-sa/2.5/].
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_6.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_6.yml
deleted file mode 100644
index 988ef9fb7d6..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_6.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/2.5/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_7.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_7.RULE
index 15bed66b221..b3438c1a790 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_7.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_7.RULE
@@ -1 +1,9 @@
-[https://creativecommons.org/licenses/by-nc-sa/2.5/].
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/2.5/
+---
+
+[https://creativecommons.org/licenses/by-nc-sa/2.5/].
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_7.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_7.yml
deleted file mode 100644
index 5a2737259b5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_7.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/2.5/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_8.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_8.RULE
index 6de5b9e37aa..bf56b92f925 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_8.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_8.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_8.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_9.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_9.RULE
index 1d078f91707..3415119d912 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_9.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_9.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 2.5 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_9.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_9.yml
deleted file mode 100644
index 40907edaa99..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_9.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_licensebutton.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_licensebutton.RULE
index 0842a6491d2..84c2d67c8aa 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_licensebutton.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_licensebutton.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licensebuttons.net/l/by-nc-sa/2.5
+---
+
https://licensebuttons.net/l/by-nc-sa/2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_licensebutton.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_licensebutton.yml
deleted file mode 100644
index 0dcee67252f..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_licensebutton.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licensebuttons.net/l/by-nc-sa/2.5
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_1.RULE
index 56beacba0ad..d277a6708b7 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-sa-2.5
+---
+
https://spdx.org/licenses/cc-by-nc-sa-2.5
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_1.yml
deleted file mode 100644
index a1fe4b7bd26..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-sa-2.5
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_2.RULE
index 9c6716e6c6e..72c152e5aa3 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_2.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-2.5
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-sa-2.5.html
+---
+
https://spdx.org/licenses/cc-by-nc-sa-2.5.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_2.yml
deleted file mode 100644
index f3d56095790..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-2.5_url_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-2.5
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-sa-2.5.html
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_1.RULE
index d791b161440..0426f4c45bf 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_1.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-de
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution Non Commercial Share Alike 3.0 Germany
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_1.yml
deleted file mode 100644
index 1433f64d94e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-de
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_2.RULE
index 46c891a9d50..61767243d94 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_2.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-de
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-3.0-DE Creative Commons Attribution Non Commercial Share Alike 3.0 Germany
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_2.yml
deleted file mode 100644
index 1433f64d94e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-de
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_3.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_3.RULE
index e86b0600e1b..a9f3792b612 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_3.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0-de
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-NC-SA-3.0-DE
+---
+
https://licenses.nuget.org/CC-BY-NC-SA-3.0-DE
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_3.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_3.yml
deleted file mode 100644
index a9400ec6a60..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_3.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-de
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-NC-SA-3.0-DE
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_4.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_4.RULE
index 3fe57cae85d..214eb5335fb 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_4.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-de
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-NC-SA-3.0-DE
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_4.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_4.yml
deleted file mode 100644
index 1433f64d94e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_4.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-de
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_5.RULE
index 8c05ec4a3ab..92ef983a9ab 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_5.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-3.0-de
+is_license_reference: yes
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-3.0-DE
+---
+
LICENSE {{CC-BY-NC-SA-3.0-DE}} https://spdx.org/licenses/CC-BY-NC-SA-3.0-DE
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_5.yml
deleted file mode 100644
index b74728cffd5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_5.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-de
-is_license_reference: yes
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-3.0-DE
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_6.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_6.RULE
index 999a3562615..17d975c0e2c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_6.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-3.0-de
+is_license_reference: yes
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-3.0-DE
+---
+
{{CC-BY-NC-SA-3.0-DE}} https://spdx.org/licenses/CC-BY-NC-SA-3.0-DE
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_6.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_6.yml
deleted file mode 100644
index b74728cffd5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-de_6.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-de
-is_license_reference: yes
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-3.0-DE
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_1.RULE
index 5cfa8430a46..d09f6bb4b47 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_1.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution Non Commercial Share Alike 3.0 IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_1.yml
deleted file mode 100644
index 4f74139dda6..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_10.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_10.RULE
index 78ac1941b43..e92b802dce0 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_10.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_10.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_reference: yes
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-3.0-IGO
+---
+
LICENSE {{CC-BY-NC-SA-3.0-IGO}} https://spdx.org/licenses/CC-BY-NC-SA-3.0-IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_10.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_10.yml
deleted file mode 100644
index 46d8b5d5940..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_10.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_reference: yes
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-3.0-IGO
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_11.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_11.RULE
index 3f2e0ab7161..11bc6571a31 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_11.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_11.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_reference: yes
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-3.0-IGO
+---
+
{{CC-BY-NC-SA-3.0-IGO}} https://spdx.org/licenses/CC-BY-NC-SA-3.0-IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_11.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_11.yml
deleted file mode 100644
index 46d8b5d5940..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_11.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_reference: yes
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-3.0-IGO
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_2.RULE
index 1c6f927c138..aeaae713676 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_2.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-3.0-IGO Creative Commons Attribution Non Commercial Share Alike 3.0 IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_2.yml
deleted file mode 100644
index 4f74139dda6..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_3.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_3.RULE
index bca920fb769..a7e5d23b88d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_3.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
name: Creative Commons Attribution Non Commercial Share Alike 3.0 IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_3.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_3.yml
deleted file mode 100644
index 30192968008..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_3.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_4.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_4.RULE
index e37a52d9ebe..bbbe2eaaab9 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_4.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 3.0 IGO CC-BY-NC-SA-3.0-IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_4.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_4.yml
deleted file mode 100644
index 30192968008..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_4.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_5.RULE
index 06173f6acee..de227e26074 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_5.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: CC-BY-NC-SA-3.0-IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_5.yml
deleted file mode 100644
index 6c458264af0..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_5.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_6.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_6.RULE
index 357e7f163a2..aaf6a643163 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_6.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: Creative Commons Attribution Non Commercial Share Alike 3.0 IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_6.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_6.yml
deleted file mode 100644
index 6c458264af0..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_6.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_7.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_7.RULE
index ce5034631ef..b4b66d95921 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_7.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_7.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
licenseId: CC-BY-NC-SA-3.0-IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_7.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_7.yml
deleted file mode 100644
index 6c458264af0..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_7.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_8.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_8.RULE
index a6832e07727..d568eb4b08f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_8.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-NC-SA-3.0-IGO
+---
+
https://licenses.nuget.org/CC-BY-NC-SA-3.0-IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_8.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_8.yml
deleted file mode 100644
index 289f1a33854..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_8.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-NC-SA-3.0-IGO
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_9.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_9.RULE
index 73d44cd09c5..3af5239c6d8 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_9.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_9.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-igo
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-NC-SA-3.0-IGO
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_9.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_9.yml
deleted file mode 100644
index 4f74139dda6..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-igo_9.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-igo
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_1.RULE
index 35559b4641e..0e36bc467b9 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_1.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 3.0 United States
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_1.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_10.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_10.RULE
index 3c4d363d71e..4142119841c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_10.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_10.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 3.0 US License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_10.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_10.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_10.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_11.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_11.RULE
index a3e8221a1b7..7073db15378 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_11.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_11.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 3.0 United States License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_11.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_11.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_11.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_12.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_12.RULE
index 48a90cbdab0..1dfb4fae9a1 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_12.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_12.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 3.0 US License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_12.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_12.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_13.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_13.RULE
index 78616148397..59d9cd27518 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_13.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_13.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 3.0 United States License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_13.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_13.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_13.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_14.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_14.RULE
index 884ff893348..2fb3789d12b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_14.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_14.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 3.0 US License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_14.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_14.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_14.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_15.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_15.RULE
index ddaef4d25c8..c0be493c160 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_15.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_15.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 3.0 United States License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_15.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_15.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_15.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_16.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_16.RULE
index c188c20d6da..fc931307a90 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_16.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_16.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 3.0 US License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_16.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_16.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_16.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_2.RULE
index 687e0c0f77d..6a9eaa959fc 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_2.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 3.0 US
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_2.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_3.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_3.RULE
index c4a98507356..0c401e29c1f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_3.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 3.0 United States
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_3.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_3.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_3.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_4.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_4.RULE
index e32fa2d6cc4..e234094c84d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_4.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 3.0 US
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_4.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_4.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_4.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_5.RULE
index 0cb207112e5..6acc11307c8 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_5.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 3.0 United States
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_5.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_5.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_6.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_6.RULE
index 9d193acb1dc..2e87d931794 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_6.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 3.0 US
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_6.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_6.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_6.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_7.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_7.RULE
index 87c0026d85e..643ad7785e5 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_7.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_7.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 3.0 United States
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_7.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_7.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_7.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_8.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_8.RULE
index 52137c498d6..e1ae51dded3 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_8.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 3.0 US
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_8.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_8.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_9.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_9.RULE
index 6263a2c4698..34743006582 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_9.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_9.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0-us
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 3.0 United States License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_9.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_9.yml
deleted file mode 100644
index 936ef703f88..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0-us_9.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0-us
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0.RULE
index fa8b1d6440f..1fd1d7004a7 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
+---
+
http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0.SPDX.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0.SPDX.RULE
index 00ab0e9a63f..047b9dbac85 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0.SPDX.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0.SPDX.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_text: yes
+minimum_coverage: 10
+notes: license text as published by SPDX
+ignorable_urls:
+ - http://creativecommons.org/
+---
+
Creative Commons
Attribution-NonCommercial-ShareAlike 3.0 Unported
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0.SPDX.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0.SPDX.yml
deleted file mode 100644
index 8f5ad522774..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0.SPDX.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_text: yes
-minimum_coverage: 10
-notes: license text as published by SPDX
-ignorable_urls:
- - http://creativecommons.org/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0.yml
deleted file mode 100644
index 0e3228f6175..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_1.RULE
index d1999262392..0966b9ab623 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/
+---
+
http://creativecommons.org/licenses/by-nc-sa/3.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_1.yml
deleted file mode 100644
index 8bb62710039..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_10.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_10.RULE
index 1a1e1b92ff6..c3028d928b3 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_10.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_10.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/
+---
+
/* is not free software; you can redistribute it and/or modify it under
* the terms of the Creative Commons Attribution-NonCommercial-ShareAlike 3.0
* Unported as published by the Creative Commons organization.
@@ -9,4 +16,4 @@
*
* You should have received a copy of the Creative Commons Attribution-
* NonCommercial-ShareAlike 3.0 along with ; if not, browse to
- * http://creativecommons.org/licenses/by-nc-sa/3.0/ */
+ * http://creativecommons.org/licenses/by-nc-sa/3.0/ */
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_10.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_10.yml
deleted file mode 100644
index c8a4710a796..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_10.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_11.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_11.RULE
index d10790de5e0..fcd00ad1d99 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_11.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_11.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_11.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_11.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_11.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_12.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_12.RULE
index b2cd2140b35..3baa4fad743 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_12.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_12.RULE
@@ -1 +1,7 @@
-Creative Commons Attribution-NonCommercial-ShareAlike
\ No newline at end of file
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 90
+---
+
+Creative Commons Attribution-NonCommercial-ShareAlike
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_12.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_12.yml
deleted file mode 100644
index 7ab1e35133a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 90
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_13.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_13.RULE
index 056613f6e83..6adedba0493 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_13.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_13.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/
+---
+
http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-Noncommercial-Share Alike 3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_13.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_13.yml
deleted file mode 100644
index 8bb62710039..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_13.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_14.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_14.RULE
index 7ee7d599b16..ca1ea9dda0d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_14.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_14.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+relevance: 100
+---
+
This work is licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 Unported License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_14.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_14.yml
deleted file mode 100644
index 0ffe21e0933..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_14.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_15.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_15.RULE
index 114ff477dd0..3e597bbaef3 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_15.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_15.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/3.0
+---
+
`CC-BY-NC-SA-3.0` - [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 International License](https://creativecommons.org/licenses/by-nc-sa/3.0/)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_15.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_15.yml
deleted file mode 100644
index dd56ae29b65..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_15.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_16.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_16.RULE
index dbef6dbe4a0..1661c02d494 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_16.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_16.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
`CC-BY-NC-SA-3.0` - [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 International License]
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_16.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_16.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_16.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_17.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_17.RULE
index d343c5a0719..b87c3788955 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_17.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_17.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/3.0
+---
+
[Creative Commons Attribution-NonCommercial-ShareAlike 3.0 International License](https://creativecommons.org/licenses/by-nc-sa/3.0/)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_17.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_17.yml
deleted file mode 100644
index dd56ae29b65..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_17.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_18.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_18.RULE
index 6772b9032f7..4da068bd7f9 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_18.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_18.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
[Creative Commons Attribution-NonCommercial-ShareAlike 3.0 International License]
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_18.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_18.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_18.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_19.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_19.RULE
index 0aead04580b..b50453c42d3 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_19.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_19.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
CCBYNCSAv3 – Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_19.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_19.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_19.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_2.RULE
index b5d0db7c4cd..278c63f5a07 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_2.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_text: yes
+ignorable_urls:
+ - http://creativecommons.org/
+---
+
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
License
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_2.yml
deleted file mode 100644
index 52defb681c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_text: yes
-ignorable_urls:
- - http://creativecommons.org/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_20.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_20.RULE
index dfbfb369569..fb37ed41410 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_20.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_20.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_20.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_20.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_20.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_21.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_21.RULE
index c7c00fab26d..80f3745d1fd 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_21.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_21.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
CCBYNCSAv3
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_21.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_21.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_21.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_22.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_22.RULE
index 525c0e52187..3f1abe8972b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_22.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_22.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US
+---
+
This book is licensed under a Creative Commons
http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US [Attribution-NonCommercial-ShareAlike 3.0 Unported] license.
For more information, please see the Creative Commons page.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_22.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_22.yml
deleted file mode 100644
index 9997f228a4e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_22.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_23.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_23.RULE
index c3f42935c19..61ddf947d7a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_23.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_23.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
+---
+
licensed under the Creative Commons License,
Attribution-NonCommercial-ShareAlike 3.0 unported.
(http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_23.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_23.yml
deleted file mode 100644
index 6a9c64406f2..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_23.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_24.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_24.RULE
index 94611b025cf..782a30e46ef 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_24.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_24.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_24.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_24.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_24.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_25.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_25.RULE
index 7b0c3b096cd..fbb1008002a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_25.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_25.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 3.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_25.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_25.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_25.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_26.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_26.RULE
index 1faaa39b592..97b96d4f229 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_26.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_26.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 3.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_26.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_26.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_26.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_27.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_27.RULE
index f1378fd5b85..b4fbdb0d560 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_27.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_27.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 3.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_27.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_27.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_27.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_28.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_28.RULE
index 6282e9c1ec6..e8442c5f41b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_28.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_28.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_28.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_28.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_28.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_29.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_29.RULE
index a5f6855c014..1fa45cbe0bd 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_29.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_29.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_29.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_29.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_29.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_3.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_3.RULE
index f0c0aa2216d..3bc76089978 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_3.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh
+---
+
CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_3.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_3.yml
deleted file mode 100644
index d107f591d1e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_3.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_30.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_30.RULE
index 3fbb5c9c593..98bd1a7ddbc 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_30.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_30.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_30.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_30.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_30.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_31.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_31.RULE
index 916ba6fe4c9..599d7601452 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_31.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_31.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_31.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_31.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_31.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_32.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_32.RULE
index fe33c4fb152..4b63f95c359 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_32.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_32.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 3.0 Unported License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_32.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_32.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_32.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_33.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_33.RULE
index 1b3a850ea05..300c41a24a7 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_33.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_33.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 3.0 Unported License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_33.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_33.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_33.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_34.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_34.RULE
index 2c11e7f2d8f..595dcc1b0a0 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_34.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_34.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 3.0 Unported License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_34.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_34.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_34.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_35.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_35.RULE
index c10c8e10670..740d98fd4a5 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_35.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_35.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 3.0 Unported
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_35.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_35.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_35.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_36.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_36.RULE
index 96723df87e7..1c154214f5a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_36.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_36.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 3.0 Unported
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_36.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_36.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_36.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_37.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_37.RULE
index bf9f5e383f7..9d92526cecb 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_37.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_37.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 3.0 Unported
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_37.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_37.yml
deleted file mode 100644
index be7f765ddcb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_37.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_38.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_38.RULE
index 09df538505a..a2fcb3e955f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_38.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_38.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_text: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_38.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_38.yml
deleted file mode 100644
index 94a5d9b4bc2..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_38.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_39.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_39.RULE
index 97d5b5ab4f6..ec3a73bfb91 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_39.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_39.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 90
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/igo
+---
+
http://creativecommons.org/licenses/by-nc-sa/3.0/igo
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_39.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_39.yml
deleted file mode 100644
index 5c4b5f1569c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_39.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 90
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/igo
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_4.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_4.RULE
index f1c28a0a89d..f7581df443f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_4.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/
+---
+
* This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0
* License. To view a copy of this license, visit
* http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter to Creative Commons,
@@ -6,4 +13,4 @@
* EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU
* ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
* ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
+ * POSSIBILITY OF SUCH DAMAGES.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_4.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_4.yml
deleted file mode 100644
index c8a4710a796..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_4.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_40.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_40.RULE
index 31c8172a640..90b78efce81 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_40.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_40.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 90
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/igo/legalcode
+---
+
http://creativecommons.org/licenses/by-nc-sa/3.0/igo/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_40.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_40.yml
deleted file mode 100644
index 2a48cc73e0d..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_40.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 90
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/igo/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_41.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_41.RULE
index 7da78ee31e8..a54395e476f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_41.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_41.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode.txt
+---
+
http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_41.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_41.yml
deleted file mode 100644
index c2f8d4f17a8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_41.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode.txt
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_42.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_42.RULE
index edf29bdb2c9..81fd9644686 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_42.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_42.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 90
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/3.0/igo
+---
+
https://creativecommons.org/licenses/by-nc-sa/3.0/igo
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_42.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_42.yml
deleted file mode 100644
index ba7960759cb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_42.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 90
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/3.0/igo
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_43.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_43.RULE
index 4f499e7acb1..c76cd6412fc 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_43.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_43.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 90
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/3.0/igo/legalcode
+---
+
https://creativecommons.org/licenses/by-nc-sa/3.0/igo/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_43.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_43.yml
deleted file mode 100644
index e994d49da8f..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_43.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 90
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/3.0/igo/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_44.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_44.RULE
index 360572eda4f..6341345838b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_44.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_44.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
+---
+
https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_44.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_44.yml
deleted file mode 100644
index 03d23715de0..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_44.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_45.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_45.RULE
index d6c7d1b49ea..af5198389de 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_45.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_45.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode.txt
+---
+
https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_45.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_45.yml
deleted file mode 100644
index 8d1c9d3cc31..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_45.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode.txt
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_46.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_46.RULE
index 38ff46eacc1..f2f0e7ad607 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_46.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_46.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_tag: yes
+relevance: 100
+---
+
License Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_46.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_46.yml
deleted file mode 100644
index db949002b80..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_46.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_tag: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_47.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_47.RULE
index 96192f53dad..102a18b36f5 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_47.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_47.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_text: yes
+ignorable_urls:
+ - http://creativecommons.org/
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported CREATIVE
COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES.
DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP.
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_47.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_47.yml
deleted file mode 100644
index 52defb681c8..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_47.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_text: yes
-ignorable_urls:
- - http://creativecommons.org/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_48.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_48.RULE
index e92d4199453..9ec3e4b3f87 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_48.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_48.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-3.0 Creative Commons Attribution Non Commercial Share Alike 3.0 Unported
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_48.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_48.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_48.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_49.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_49.RULE
index e69a9a8f3d9..ee72de695b9 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_49.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_49.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
name: Creative Commons Attribution Non Commercial Share Alike 3.0 Unported
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_49.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_49.yml
deleted file mode 100644
index 34c968686bd..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_49.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_5.RULE
index 7b9a94e4f74..898ef428d75 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_5.RULE
@@ -1,5 +1,11 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/
+---
+
* This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0
* License. To view a copy of this license, visit
* http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter to Creative Commons,
- * 543 Howard Street, 5th Floor, San Francisco, California, 94105, USA.
-
\ No newline at end of file
+ * 543 Howard Street, 5th Floor, San Francisco, California, 94105, USA.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_5.yml
deleted file mode 100644
index c8a4710a796..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_5.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_50.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_50.RULE
index 4f62ebd25e4..3d8de7fc43b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_50.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_50.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 3.0 Unported CC-BY-NC-SA-3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_50.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_50.yml
deleted file mode 100644
index 34c968686bd..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_50.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_51.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_51.RULE
index 28e091f9535..fc86b512c94 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_51.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_51.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: CC-BY-NC-SA-3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_51.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_51.yml
deleted file mode 100644
index 31db8bcd55c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_51.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_52.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_52.RULE
index 75c7f82201d..e13a9007600 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_52.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_52.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: Creative Commons Attribution Non Commercial Share Alike 3.0 Unported
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_52.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_52.yml
deleted file mode 100644
index 31db8bcd55c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_52.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_53.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_53.RULE
index 14a8241ab3a..ade18ac7b0c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_53.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_53.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
licenseId: CC-BY-NC-SA-3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_53.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_53.yml
deleted file mode 100644
index 31db8bcd55c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_53.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_54.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_54.RULE
index 6240d7cb0ce..819a231b386 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_54.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_54.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-3.0 Creative Commons Attribution Non Commercial Share Alike 3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_54.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_54.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_54.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_55.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_55.RULE
index b22361da94e..48085bbe257 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_55.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_55.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-NC-SA-3.0
+---
+
https://licenses.nuget.org/CC-BY-NC-SA-3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_55.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_55.yml
deleted file mode 100644
index 1f1950f8ca5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_55.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-NC-SA-3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_56.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_56.RULE
index e528cbf5145..42ab8d2cdad 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_56.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_56.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-NC-SA-3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_56.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_56.yml
deleted file mode 100644
index 321d300c4fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_56.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_57.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_57.RULE
index f2f42a44933..a4d2a06d5d4 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_57.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_57.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-3.0
+---
+
LICENSE {{CC-BY-NC-SA-3.0}} https://spdx.org/licenses/CC-BY-NC-SA-3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_57.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_57.yml
deleted file mode 100644
index 1caef1e0da5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_57.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_58.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_58.RULE
index 43567f5cf0b..74eed803d8b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_58.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_58.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-3.0
+---
+
{{CC-BY-NC-SA-3.0}} https://spdx.org/licenses/CC-BY-NC-SA-3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_58.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_58.yml
deleted file mode 100644
index 1caef1e0da5..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_58.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_6.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_6.RULE
index aa280b059c8..772f0a2c8da 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_6.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+minimum_coverage: 50
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc
+---
+
// The software code contained herein is licensed under the Creative
// Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
// To view this license, see http://creativecommons.org/licenses/by-nc-
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_6.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_6.yml
deleted file mode 100644
index fe904cffbf4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_6.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-minimum_coverage: 50
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_7.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_7.RULE
index f939a998a32..f19cf83b878 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_7.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_7.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/
+---
+
license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-Noncommercial-Share Alike 3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_7.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_7.yml
deleted file mode 100644
index c8a4710a796..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_7.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_8.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_8.RULE
index b0ccf00d6bc..6addcad2a69 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_8.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/
+---
+
This work is licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 Unported License.
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/
or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_8.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_8.yml
deleted file mode 100644
index c8a4710a796..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_8.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_9.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_9.RULE
index b8988fc1a22..ce02b022353 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_9.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_9.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+referenced_filenames:
+ - ../../LICENSE
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/
+---
+
License link
* license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">
Creative Commons Attribution-Noncommercial-Share Alike 3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_9.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_9.yml
deleted file mode 100644
index 5b33a886c6a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_9.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-referenced_filenames:
- - ../../LICENSE
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_and_proprietary-license_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_and_proprietary-license_1.RULE
index 2d9a2f03ef2..5ebea1820ea 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_and_proprietary-license_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_and_proprietary-license_1.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-3.0 AND proprietary-license
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc
+---
+
// This software has been licensed to Inc. for
// use in educational, training, and for promotional and
// demonstration purposes. All rights are otherwise retained
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_and_proprietary-license_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_and_proprietary-license_1.yml
deleted file mode 100644
index 95a323f705f..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_and_proprietary-license_1.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0 AND proprietary-license
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_licensebutton.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_licensebutton.RULE
index 31ca5f41fce..0da33772e48 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_licensebutton.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_licensebutton.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licensebuttons.net/l/by-nc-sa/3.0
+---
+
https://licensebuttons.net/l/by-nc-sa/3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_licensebutton.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_licensebutton.yml
deleted file mode 100644
index 3fc9db13669..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_licensebutton.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licensebuttons.net/l/by-nc-sa/3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_1.RULE
index 83767907cf8..5f85e7f6686 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-sa-3.0
+---
+
https://spdx.org/licenses/cc-by-nc-sa-3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_1.yml
deleted file mode 100644
index 32b68285351..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-sa-3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_2.RULE
index 5d5e2e7e0ba..d9359397415 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_2.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-sa-3.0.html
+---
+
https://spdx.org/licenses/cc-by-nc-sa-3.0.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_2.yml
deleted file mode 100644
index d9b63161046..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-sa-3.0.html
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_glc_17.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_glc_17.RULE
index e56c87c9643..250bced6782 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_glc_17.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_glc_17.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/3.0
+---
+
https://creativecommons.org/licenses/by-nc-sa/3.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_glc_17.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_glc_17.yml
deleted file mode 100644
index dd56ae29b65..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_url_glc_17.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/3.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_zh.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_zh.RULE
index 921fdafe013..0019ecb143a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_zh.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_zh.RULE
@@ -1,4 +1,11 @@
+---
+license_expression: cc-by-nc-sa-3.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh
+---
+
## License
-以上内容采用 [CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh) 进行许可, 转载请注明出处, 版权归本人及所有贡献者所有
+以上内容采用 [CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh) 进行许可, 转载请注明出处, 版权归本人及所有贡献者所有
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_zh.yml b/src/licensedcode/data/rules/cc-by-nc-sa-3.0_zh.yml
deleted file mode 100644
index d354350b8cf..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-3.0_zh.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-3.0
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0.RULE
index 25e4f8254a5..765361552ca 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+---
+
Attribution-NonCommercial-ShareAlike 4.0 International
=======================================================================
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0.SPDX.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0.SPDX.RULE
index e8a72154be3..e1a22e222b8 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0.SPDX.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0.SPDX.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+minimum_coverage: 10
+notes: license text as published by SPDX
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0.SPDX.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0.SPDX.yml
deleted file mode 100644
index 9c8120e11fb..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0.SPDX.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
-minimum_coverage: 10
-notes: license text as published by SPDX
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0.yml
deleted file mode 100644
index 0988658039e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_1.RULE
index a9983644e14..6444a4154db 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/4.0/
+---
+
http://creativecommons.org/licenses/by-nc-sa/4.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_1.yml
deleted file mode 100644
index 8237e1ec5d4..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_10.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_10.RULE
index 6b4473390d6..a5f39ace6bf 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_10.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_10.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 4.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_10.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_10.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_10.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_11.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_11.RULE
index 05d60d35fe2..ec4be008875 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_11.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_11.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 4.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_11.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_11.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_11.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_12.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_12.RULE
index 45eb51b9958..2707e68e981 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_12.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_12.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 4.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_12.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_12.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_12.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_13.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_13.RULE
index 5c0d845b27e..01e55ff2648 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_13.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_13.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 4.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_13.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_13.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_13.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_14.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_14.RULE
index f5c76100b87..0eb5d5a1bc1 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_14.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_14.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_14.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_14.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_14.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_15.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_15.RULE
index ebb7862740c..fd1fdcb6a06 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_15.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_15.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Non Commercial-Share Alike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_15.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_15.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_15.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_16.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_16.RULE
index e1fdd5da699..490a7ecfdc2 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_16.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_16.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-NonCommercial-ShareAlike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_16.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_16.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_16.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_17.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_17.RULE
index 1e78af327bb..23815a0ee9b 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_17.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_17.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Non Commercial-Share Alike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_17.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_17.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_17.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_18.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_18.RULE
index 121de4ed695..4c2d0dadfb3 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_18.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_18.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
Documentation is licensed under CC BY-NC-SA 4.0:
Attribution-NonCommercial-ShareAlike 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_18.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_18.yml
deleted file mode 100644
index 7081599981a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_18.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_19.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_19.RULE
index 85cf76d6e1b..c787fe59293 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_19.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_19.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/4.0/legalcode
+---
+
http://creativecommons.org/licenses/by-nc-sa/4.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_19.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_19.yml
deleted file mode 100644
index ba701e60662..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_19.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/4.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_2.RULE
index b57da323c50..d2ecd77b1d6 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_2.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/4.0/
+---
+
https://creativecommons.org/licenses/by-nc-sa/4.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_2.yml
deleted file mode 100644
index d529c7e28a2..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_20.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_20.RULE
index f7a56a7f732..ee44187af48 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_20.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_20.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/4.0/legalcode.txt
+---
+
http://creativecommons.org/licenses/by-nc-sa/4.0/legalcode.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_20.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_20.yml
deleted file mode 100644
index 92e373805ec..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_20.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/4.0/legalcode.txt
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_21.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_21.RULE
index 9a873ccb9ec..ffa983003eb 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_21.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_21.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode
+---
+
https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_21.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_21.yml
deleted file mode 100644
index 6b4e7706a87..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_21.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_22.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_22.RULE
index 48ee3fd1401..ef574b77b62 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_22.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_22.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode.txt
+---
+
https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_22.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_22.yml
deleted file mode 100644
index 9971dc6a170..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_22.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode.txt
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_23.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_23.RULE
index 1e03996d228..79a6efa50ff 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_23.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_23.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_text: yes
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Creative
Commons Corporation ("Creative Commons") is not a law firm and does not provide
legal services or legal advice. Distribution of Creative Commons public licenses
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_23.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_23.yml
deleted file mode 100644
index c691f6ce509..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_23.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_24.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_24.RULE
index cf4571da813..53b6cb1db98 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_24.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_24.RULE
@@ -1,7 +1,15 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/4.0
+---
+
This work is licensed under a {{Creative Commons Attribution-NonCommercial-ShareAlike 4.0}}
International License (the "License"). You may not use this file except in compliance with the
License. A copy of the License is located at http://creativecommons.org/licenses/by-nc-sa/4.0/.
This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
either express or implied. See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_24.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_24.yml
deleted file mode 100644
index 431a78a757f..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_24.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_25.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_25.RULE
index 655fc9d5b4b..be1cb52b700 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_25.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_25.RULE
@@ -1 +1,7 @@
-{{Creative Commons Attribution-NonCommercial-ShareAlike 4.0}} International License
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
+{{Creative Commons Attribution-NonCommercial-ShareAlike 4.0}} International License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_25.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_25.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_25.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_26.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_26.RULE
index 56d595e5fea..5603cbdf6cc 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_26.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_26.RULE
@@ -1 +1,6 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+---
+
This work is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License:
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_26.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_26.yml
deleted file mode 100644
index 0988658039e..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_26.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_27.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_27.RULE
index c1f1f4e3d73..dcf312fc2f2 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_27.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_27.RULE
@@ -1,2 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/4.0/
+---
+
This work is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License:
https://creativecommons.org/licenses/by-nc-sa/4.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_27.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_27.yml
deleted file mode 100644
index dae98e95d1c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_27.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_28.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_28.RULE
index f8311fda1cb..7484e19dd3c 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_28.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_28.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-4.0 Creative Commons Attribution Non Commercial Share Alike 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_28.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_28.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_28.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_29.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_29.RULE
index 4b1af9936d7..1428482ee6d 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_29.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_29.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_29.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_29.yml
deleted file mode 100644
index 327a2a412ee..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_29.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_3.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_3.RULE
index 2ee47cb3530..54eb5388171 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_3.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_text: yes
+---
+
Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License
By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_3.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_3.yml
deleted file mode 100644
index c691f6ce509..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_3.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_30.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_30.RULE
index ceb14bc3131..0e30fb48a20 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_30.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_30.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
name: Creative Commons Attribution Non Commercial Share Alike 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_30.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_30.yml
deleted file mode 100644
index 327a2a412ee..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_30.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_31.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_31.RULE
index 466b9852bb2..ff1efc71cb8 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_31.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_31.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Non Commercial Share Alike 4.0 International CC-BY-NC-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_31.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_31.yml
deleted file mode 100644
index 327a2a412ee..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_31.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_32.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_32.RULE
index 88771b7aef1..5ef99315835 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_32.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_32.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: CC-BY-NC-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_32.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_32.yml
deleted file mode 100644
index 9e67e776cb9..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_32.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_33.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_33.RULE
index b5b9a3c6075..b8d75ae475f 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_33.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_33.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: Creative Commons Attribution Non Commercial Share Alike 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_33.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_33.yml
deleted file mode 100644
index 9e67e776cb9..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_33.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_34.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_34.RULE
index ba47b99ed18..3da135208c2 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_34.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_34.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
licenseId: CC-BY-NC-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_34.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_34.yml
deleted file mode 100644
index 9e67e776cb9..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_34.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_35.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_35.RULE
index 1701e669f94..c25988ece9a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_35.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_35.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-NC-SA-4.0 Creative Commons Attribution Non Commercial Share Alike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_35.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_35.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_35.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_36.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_36.RULE
index e6db8a76483..69962a5bc61 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_36.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_36.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-NC-SA-4.0
+---
+
https://licenses.nuget.org/CC-BY-NC-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_36.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_36.yml
deleted file mode 100644
index 67e5a8cbea6..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_36.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-NC-SA-4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_37.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_37.RULE
index c05944cd6f4..3d90fbb2fc1 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_37.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_37.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-NC-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_37.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_37.yml
deleted file mode 100644
index 52fcc6b0e49..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_37.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_38.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_38.RULE
index 23ef6b421bf..aa1fc6292ca 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_38.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_38.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-4.0
+---
+
LICENSE {{CC-BY-NC-SA-4.0}} https://spdx.org/licenses/CC-BY-NC-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_38.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_38.yml
deleted file mode 100644
index 92745619630..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_38.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_39.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_39.RULE
index f0b01963373..00fb71bd4eb 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_39.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_39.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://spdx.org/licenses/CC-BY-NC-SA-4.0
+---
+
{{CC-BY-NC-SA-4.0}} https://spdx.org/licenses/CC-BY-NC-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_39.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_39.yml
deleted file mode 100644
index 92745619630..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_39.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://spdx.org/licenses/CC-BY-NC-SA-4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_4.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_4.RULE
index 3df1156e136..d6a25c84046 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_4.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_4.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_tag: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/4.0/
+---
+
`Creative Commons BY-NC-SA 4.0 License`__.
__ cc_license_
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_4.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_4.yml
deleted file mode 100644
index ca3a41aa246..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_tag: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_5.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_5.RULE
index b98fe06b8f2..b1436e9bd1e 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_5.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/4.0/
+---
+
Documentation is licensed under a
`Creative Commons BY-NC-SA 4.0 License`__.
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_5.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_5.yml
deleted file mode 100644
index 9b747b494fc..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_5.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-nc-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_6.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_6.RULE
index 38c2e3a194d..e0835654a76 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_6.RULE
@@ -1,2 +1,8 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
licensed under a
`Creative Commons BY-NC-SA 4.0 License`__.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_6.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_6.yml
deleted file mode 100644
index 7081599981a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_6.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_7.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_7.RULE
index b1b1d1f5d74..f7abbfa561a 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_7.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_7.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
Content and images licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_7.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_7.yml
deleted file mode 100644
index 7081599981a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_7.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_8.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_8.RULE
index 467d6049a3e..44b5e526c03 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_8.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_8.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_8.yml
deleted file mode 100644
index 7081599981a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_9.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_9.RULE
index 22ca17f7e29..4d6bc367f71 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_9.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_9.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
Content and images licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. Images are my own and are also available under the same license as the rest of the content.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_9.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_9.yml
deleted file mode 100644
index 7081599981a..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_9.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_licensebutton.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_licensebutton.RULE
index 066dc339746..53787948743 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_licensebutton.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_licensebutton.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licensebuttons.net/l/by-nc-sa/4.0
+---
+
https://licensebuttons.net/l/by-nc-sa/4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_licensebutton.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_licensebutton.yml
deleted file mode 100644
index 549acdd9b07..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_licensebutton.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licensebuttons.net/l/by-nc-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_1.RULE
index 022ccfdd685..3da8f26e058 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-sa-4.0
+---
+
https://spdx.org/licenses/cc-by-nc-sa-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_1.yml
deleted file mode 100644
index 1e219860e30..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-sa-4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_2.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_2.RULE
index 29f05bf7069..8c44f54bd64 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_2.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-nc-sa-4.0.html
+---
+
https://spdx.org/licenses/cc-by-nc-sa-4.0.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_2.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_2.yml
deleted file mode 100644
index 136d6d11525..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-nc-sa-4.0.html
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge.RULE
index e7d53b2fe65..f92ad5ef861 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/4.0
+---
+
[](https://creativecommons.org/licenses/by-nc-sa/4.0/)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge.yml
deleted file mode 100644
index e8f788ce48c..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge_1.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge_1.RULE
index 19c0debf4c2..8a4429ef8a2 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_reference: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-nc-sa/4.0
+ - https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-lightgrey.svg
+---
+
[](https://creativecommons.org/licenses/by-nc-sa/4.0/)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge_1.yml b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge_1.yml
deleted file mode 100644
index dbd00c8e313..00000000000
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_url_badge_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-nc-sa-4.0
-is_license_reference: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-nc-sa/4.0
- - https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-lightgrey.svg
diff --git a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_zh.RULE b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_zh.RULE
index d577ef2b868..9d89b26ebf3 100644
--- a/src/licensedcode/data/rules/cc-by-nc-sa-4.0_zh.RULE
+++ b/src/licensedcode/data/rules/cc-by-nc-sa-4.0_zh.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: cc-by-nc-sa-4.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-nc-sa/4.0
+ - https://github.com/kesenhoo/android-training-course-in-chinese
+---
+
## License
本站作品由
This work is licensed under a
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_42.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_42.yml
deleted file mode 100644
index bc9b456c41e..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_42.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_43.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_43.RULE
index 2fdebc25fc1..fce78a61024 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_43.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_43.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0/
+---
+
license" https://creativecommons.org/licenses/by-sa/4.0/">
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_43.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_43.yml
deleted file mode 100644
index bc9b456c41e..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_43.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_44.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_44.RULE
index e5753d677b2..4ef2e4c189e 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_44.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_44.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0/
+---
+
This work is licensed under a
Creative Commons Attribution-ShareAlike 4.0 International License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_44.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_44.yml
deleted file mode 100644
index bc9b456c41e..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_44.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_45.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_45.RULE
index 2b4ca31fc9e..7c15bf0c985 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_45.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_45.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_45.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_45.yml
deleted file mode 100644
index aa85f559227..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_45.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_46.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_46.RULE
index 4a22115de20..816db65f77f 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_46.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_46.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-sa/4.0
+---
+
## License

diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_46.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_46.yml
deleted file mode 100644
index 831af24f44d..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_46.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_47.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_47.RULE
index 22b64685398..c042053de15 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_47.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_47.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-sa/4.0
+---
+

This work is licensed under a [Creative Commons Attribution-ShareAlike 4.0 International](http://creativecommons.org/licenses/by-sa/4.0/) license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_47.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_47.yml
deleted file mode 100644
index 831af24f44d..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_47.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_48.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_48.RULE
index 2711f98f767..71b2ae5a258 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_48.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_48.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-sa/4.0
+---
+
This work is licensed under a [Creative Commons Attribution-ShareAlike 4.0 International](http://creativecommons.org/licenses/by-sa/4.0/) license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_48.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_48.yml
deleted file mode 100644
index 831af24f44d..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_48.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_49.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_49.RULE
index 218a63e6147..1fa3c6e98f2 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_49.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_49.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0
+---
+
## License

diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_49.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_49.yml
deleted file mode 100644
index 98befb62f0f..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_49.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_5.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_5.RULE
index 80d9ba82c4a..0be08fa20d7 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_5.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_5.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-ShareAlike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_5.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_5.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_5.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_50.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_50.RULE
index 5db720f9400..b108959fbc7 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_50.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_50.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0
+---
+
This work is licensed under a [Creative Commons Attribution-ShareAlike 4.0 International](https://creativecommons.org/licenses/by-sa/4.0/) license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_50.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_50.yml
deleted file mode 100644
index 98befb62f0f..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_50.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_51.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_51.RULE
index a0b976597f3..c12b6df7f41 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_51.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_51.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0/
+---
+
# License
Licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_51.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_51.yml
deleted file mode 100644
index bc9b456c41e..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_51.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_52.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_52.RULE
index bfea8828999..8eff19ccbea 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_52.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_52.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0/
+---
+
Licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_52.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_52.yml
deleted file mode 100644
index bc9b456c41e..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_52.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_53.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_53.RULE
index 75b5f8e82f8..27263a5685c 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_53.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_53.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0
+---
+
Licensed under CC BY-SA 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_53.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_53.yml
deleted file mode 100644
index 98befb62f0f..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_53.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_54.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_54.RULE
index 5b16ef862a7..f00bd9a2e84 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_54.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_54.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
The data is under the Creative Commons Attribution Share-Alike 4.0 license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_54.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_54.yml
deleted file mode 100644
index aa85f559227..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_54.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_540.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_540.RULE
index e4188b17075..79916d66522 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_540.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_540.RULE
@@ -1 +1,9 @@
-CC Attribution-ShareAlike http://creativecommons.org/licenses/by-sa/4.0/
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-sa/4.0/
+---
+
+CC Attribution-ShareAlike http://creativecommons.org/licenses/by-sa/4.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_540.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_540.yml
deleted file mode 100644
index 0685985fb9d..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_540.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_55.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_55.RULE
index 61689661d36..3df824822ac 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_55.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_55.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+referenced_filenames:
+ - LICENSE
+---
+
* This software may be modified and distributed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International License.
*
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_55.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_55.yml
deleted file mode 100644
index 8814f5c15b7..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_55.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-referenced_filenames:
- - LICENSE
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_56.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_56.RULE
index 8f14d305d04..862c322d178 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_56.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_56.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0/
+---
+
The documentation, its source code and related things are licensed under the Creative Commons `CC-BY-SA 4.0 license`_.
.. _CC-BY-SA 4.0 license: https://creativecommons.org/licenses/by-sa/4.0/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_56.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_56.yml
deleted file mode 100644
index bc9b456c41e..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_56.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_57.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_57.RULE
index 2cad5696cb5..17b0f34520c 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_57.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_57.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
Made available under CC-BY-SA.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_57.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_57.yml
deleted file mode 100644
index aa85f559227..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_57.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_58.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_58.RULE
index 18b4e865006..c1e1f58affe 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_58.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_58.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-sa/4.0
+---
+
CC BY-SA 4.0 (http://creativecommons.org/licenses/by-sa/4.0)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_58.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_58.yml
deleted file mode 100644
index 0f796d09fd5..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_58.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_59.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_59.RULE
index 91dcbb7f5b2..2ecae190c67 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_59.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_59.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0
+---
+
CC BY-SA 4.0 (https://creativecommons.org/licenses/by-sa/4.0)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_59.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_59.yml
deleted file mode 100644
index 5d8f27a9501..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_59.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_6.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_6.RULE
index bf32b820f04..e5c8c46fadb 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_6.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_6.RULE
@@ -1 +1,7 @@
-CC-BY-SA-4.0
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
+CC-BY-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_6.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_6.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_6.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_60.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_60.RULE
index 6a13f5a3e99..9fac4052ae8 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_60.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_60.RULE
@@ -1,2 +1,11 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-sa/4.0
+ - http://creativecommons.org/licenses/by-sa/4.0/
+---
+
[](http://creativecommons.org/licenses/by-sa/4.0/)
This work is licensed under a [Creative Commons Attribution-ShareAlike 4.0 International License](http://creativecommons.org/licenses/by-sa/4.0/").
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_60.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_60.yml
deleted file mode 100644
index 75a1ce7fc56..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_60.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-sa/4.0
- - http://creativecommons.org/licenses/by-sa/4.0/
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_61.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_61.RULE
index 2036986ff6e..d63e118a8f4 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_61.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_61.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-ShareAlike
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_61.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_61.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_61.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_62.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_62.RULE
index fc847e432fb..c7ac435f1b1 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_62.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_62.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
released under the Creative Commons Attribution-ShareAlike 4.0 International License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_62.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_62.yml
deleted file mode 100644
index aa85f559227..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_62.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_63.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_63.RULE
index 8c99907653e..cda7c26ee7b 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_63.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_63.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-Share Alike 4.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_63.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_63.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_63.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_64.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_64.RULE
index 6371d389f23..e8b18a0eeb1 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_64.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_64.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Share Alike 4.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_64.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_64.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_64.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_65.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_65.RULE
index d65b46a9c18..bf3cd3093b5 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_65.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_65.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-Share Alike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_65.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_65.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_65.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_66.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_66.RULE
index 8b1681d62b0..c494c491dc3 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_66.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_66.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-ShareAlike 4.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_66.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_66.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_66.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_67.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_67.RULE
index 868e5ada06b..b591e9fc07d 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_67.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_67.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-ShareAlike 4.0 License
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_67.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_67.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_67.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_68.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_68.RULE
index f10c1dfec6c..7212a257eaf 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_68.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_68.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-ShareAlike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_68.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_68.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_68.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_69.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_69.RULE
index 00600275079..e9bca0f1cc6 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_69.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_69.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-sa/4.0/legalcode
+---
+
http://creativecommons.org/licenses/by-sa/4.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_69.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_69.yml
deleted file mode 100644
index ee16eb00e05..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_69.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-sa/4.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_7.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_7.RULE
index 89111590b0f..027d67a731f 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_7.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_7.RULE
@@ -1,2 +1,8 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons
Attribution-ShareAlike International Public License (CC-BY-SA v4.0+)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_7.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_7.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_7.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_70.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_70.RULE
index efd1ac1b1d5..7bfc15b1e92 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_70.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_70.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-sa/4.0/legalcode.txt
+---
+
http://creativecommons.org/licenses/by-sa/4.0/legalcode.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_70.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_70.yml
deleted file mode 100644
index 1e398b5c443..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_70.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/by-sa/4.0/legalcode.txt
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE
index d980cbc0417..96aff958e83 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_71.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0/legalcode
+---
+
https://creativecommons.org/licenses/by-sa/4.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_71.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_71.yml
deleted file mode 100644
index 914ec1e199c..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_71.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_72.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_72.RULE
index df7b1f773f1..b843d8ba4a5 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_72.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_72.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt
+---
+
https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_72.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_72.yml
deleted file mode 100644
index 3feace7d70a..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_72.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_73.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_73.RULE
index 7378d3d8742..e58534537ab 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_73.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_73.RULE
@@ -1,2 +1,8 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_tag: yes
+relevance: 100
+---
+
LICENSE INFORMATION:
> CC-Attribution-ShareAlike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_73.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_73.yml
deleted file mode 100644
index 72745ea9d86..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_73.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_tag: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_74.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_74.RULE
index 633284ba7b9..018a7107619 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_74.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_74.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
> CC-Attribution-ShareAlike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_74.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_74.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_74.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_75.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_75.RULE
index 26c388903ba..99e5df0a988 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_75.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_75.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_tag: yes
+relevance: 100
+---
+
License: CC-Attribution-ShareAlike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_75.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_75.yml
deleted file mode 100644
index 72745ea9d86..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_75.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_tag: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_76.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_76.RULE
index f98e47ecfbd..514d489def0 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_76.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_76.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-ShareAlike license V4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_76.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_76.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_76.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_77.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_77.RULE
index 4f08de0a97a..75ae306f06f 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_77.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_77.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-ShareAlike license V 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_77.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_77.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_77.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_78.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_78.RULE
index a497b26aa34..4ad1c98017d 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_78.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_78.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-ShareAlike, V4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_78.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_78.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_78.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_79.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_79.RULE
index 7c8031f03a2..281672eea29 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_79.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_79.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-ShareAlike, V 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_79.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_79.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_79.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_8.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_8.RULE
index e0f0e75d2c1..0d35e0cb864 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_8.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_8.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
(CC-BY-SA v4.0+)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_8.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_8.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_80.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_80.RULE
index 570515ed89e..93d32fad9f7 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_80.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_80.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-share alike license V4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_80.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_80.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_80.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_81.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_81.RULE
index 4df1afcabb1..12c8a4f7ebe 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_81.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_81.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-share alike license V 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_81.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_81.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_81.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_82.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_82.RULE
index 50fd35affed..6f23d2185cc 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_82.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_82.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-share alike, V4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_82.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_82.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_82.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_83.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_83.RULE
index 38aab5a5317..7ab9600ea82 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_83.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_83.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Creative Commons Attribution-share alike, V 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_83.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_83.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_83.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_84.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_84.RULE
index 026857dfd63..93a008d1a77 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_84.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_84.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_text: yes
+relevance: 100
+---
+
Creative Commons Attribution-ShareAlike 4.0 International Public License
Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_84.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_84.yml
deleted file mode 100644
index 47a8fca8df1..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_84.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_text: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_85.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_85.RULE
index 270658c812f..8b47d1ad214 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_85.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_85.RULE
@@ -1,3 +1,10 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-sa/4.0
+---
+
This README.md file and the CONTRIBUTING.md file are licensed under the
Creative Commons Attribution 4.0 International License under the terms and
conditions set forth in the file LICENSE.docs. You may obtain a duplicate copy
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_85.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_85.yml
deleted file mode 100644
index 19e62821535..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_85.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_86.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_86.RULE
index ad593469e3f..c0aad1bcc32 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_86.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_86.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
licensed under a Creative Commons Attribution-ShareAlike 4.0 International license.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_86.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_86.yml
deleted file mode 100644
index aa85f559227..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_86.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_87.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_87.RULE
index 5152da71825..84f2a04ad3c 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_87.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_87.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+notes: https://www.snapeda.com/about/terms/
+---
+
licensed to you pursuant to Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA) ("Creative Commons License")
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_87.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_87.yml
deleted file mode 100644
index f5822740409..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_87.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-notes: https://www.snapeda.com/about/terms/
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_88.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_88.RULE
index 41d043eb599..abcccf21b5d 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_88.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_88.RULE
@@ -1 +1,6 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+---
+
CC-BY-SA-4.0 Creative Commons Attribution Share Alike 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_88.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_88.yml
deleted file mode 100644
index a6476da2c58..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_88.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_89.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_89.RULE
index 33627e2cb0e..5e3dfbbeeab 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_89.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_89.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
CC-BY-SA-4.0 Creative Commons Attribution Share Alike 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_89.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_89.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_89.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_9.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_9.RULE
index b049b1b3560..4c0c515fc92 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_9.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_9.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
Attribution-ShareAlike International Public License (CC-BY-SA v4.0+)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_9.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_9.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_9.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_90.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_90.RULE
index 66d7b6f3fe6..d4f7001bf53 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_90.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_90.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Share Alike 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_90.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_90.yml
deleted file mode 100644
index 8ab80b12953..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_90.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_91.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_91.RULE
index 4b800e1d70a..a1804611e81 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_91.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_91.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
name: Creative Commons Attribution Share Alike 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_91.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_91.yml
deleted file mode 100644
index 8ab80b12953..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_91.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_92.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_92.RULE
index f945a23a78a..d1f424ee8c5 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_92.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_92.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
Creative Commons Attribution Share Alike 4.0 International CC-BY-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_92.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_92.yml
deleted file mode 100644
index 8ab80b12953..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_92.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_93.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_93.RULE
index f81b9c11d00..6be3a8111c5 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_93.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_93.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: CC-BY-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_93.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_93.yml
deleted file mode 100644
index f08c6763d16..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_93.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_94.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_94.RULE
index ec745381793..2c26c6b70e0 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_94.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_94.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
license: Creative Commons Attribution Share Alike 4.0 International
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_94.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_94.yml
deleted file mode 100644
index f08c6763d16..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_94.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_95.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_95.RULE
index 3334775e8e8..a7ed95c0589 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_95.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_95.RULE
@@ -1 +1,10 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_tag: yes
+is_continuous: yes
+relevance: 100
+minimum_coverage: 100
+notes: Rule based on an SPDX license identifier and name
+---
+
licenseId: CC-BY-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_95.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_95.yml
deleted file mode 100644
index f08c6763d16..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_95.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_tag: yes
-is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_96.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_96.RULE
index 44fda501e9a..9c5b3bbb871 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_96.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_96.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
wikipedia.org/wiki/CC_BY-SA
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_96.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_96.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_96.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_97.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_97.RULE
index e9c7389addd..2be3acf4acd 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_97.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_97.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licenses.nuget.org/CC-BY-SA-4.0
+---
+
https://licenses.nuget.org/CC-BY-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_97.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_97.yml
deleted file mode 100644
index 3041aa9a73c..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_97.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licenses.nuget.org/CC-BY-SA-4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_98.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_98.RULE
index 15af56dd80b..4a8341764c5 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_98.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_98.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+---
+
licenses.nuget.org/CC-BY-SA-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_98.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_98.yml
deleted file mode 100644
index 3455c0ae394..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_98.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_99.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_99.RULE
index 0595a0d3af4..80da36d117c 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_99.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_99.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_notice: yes
+relevance: 100
+---
+
licensed under CC-BY-SA 4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_99.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_99.yml
deleted file mode 100644
index aa85f559227..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_99.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_and_cc-by-3.0_1.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_and_cc-by-3.0_1.RULE
index f05f19e8b31..c4e97242ad3 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_and_cc-by-3.0_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_and_cc-by-3.0_1.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-sa-4.0 AND cc-by-3.0
+is_license_notice: yes
+ignorable_urls:
+ - http://creativecommons.org/licenses/by-sa/4.0
+ - http://www.creativecommons.org/licenses/by/3.0/us
+---
+
This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
This database incorporates geographical data, which is made available under the Creative Commons Attribution 3.0 License. To view a copy of this license, visit http://www.creativecommons.org/licenses/by/3.0/us/.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_and_cc-by-3.0_1.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_and_cc-by-3.0_1.yml
deleted file mode 100644
index e1b71cea7ab..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_and_cc-by-3.0_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0 AND cc-by-3.0
-is_license_notice: yes
-ignorable_urls:
- - http://creativecommons.org/licenses/by-sa/4.0
- - http://www.creativecommons.org/licenses/by/3.0/us
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-1.0-plus_1.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-1.0-plus_1.RULE
index e10a78abdaa..adbf4a04231 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-1.0-plus_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-1.0-plus_1.RULE
@@ -1 +1,7 @@
+---
+license_expression: cc-by-sa-4.0 AND gpl-1.0-plus
+is_license_notice: yes
+relevance: 100
+---
+
The data is under the Creative Commons Attribution Share-Alike 4.0 license. The source code is under the GNU General Public License.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-1.0-plus_1.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-1.0-plus_1.yml
deleted file mode 100644
index ed79240fba2..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-1.0-plus_1.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0 AND gpl-1.0-plus
-is_license_notice: yes
-relevance: 100
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-3.0_1.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-3.0_1.RULE
index 553682c7d5f..7fb2c9c432d 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-3.0_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-3.0_1.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-sa-4.0 AND gpl-3.0
+is_license_notice: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0
+ - https://www.gnu.org/licenses/gpl-3.0
+---
+
## Licensing and Usage Terms
The documentation provided for this project is released under a Creative Commons
Attribution-ShareAlike 4.0 International License (CC BY-SA 4.0) https://creativecommons.org/licenses/by-sa/4.0/.
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-3.0_1.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-3.0_1.yml
deleted file mode 100644
index 3dd048609e2..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_and_gpl-3.0_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0 AND gpl-3.0
-is_license_notice: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0
- - https://www.gnu.org/licenses/gpl-3.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_and_url.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_and_url.RULE
index ea93960745b..8104a44e5eb 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_and_url.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_and_url.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0/legalcode
+---
+
[CC-BY-SA-4.0](https://creativecommons.org/licenses/by-sa/4.0/legalcode)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_and_url.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_and_url.yml
deleted file mode 100644
index 914ec1e199c..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_and_url.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_licensebutton.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_licensebutton.RULE
index abe477036f1..c5051abfc89 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_licensebutton.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_licensebutton.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://licensebuttons.net/l/by-sa/4.0
+---
+
https://licensebuttons.net/l/by-sa/4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_licensebutton.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_licensebutton.yml
deleted file mode 100644
index 0d04db2d8ef..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_licensebutton.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://licensebuttons.net/l/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_or_cc-by-nc-sa-4.0_or_cc-by-4.0_1.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_or_cc-by-nc-sa-4.0_or_cc-by-4.0_1.RULE
index de93229fc81..b3ad30607d3 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_or_cc-by-nc-sa-4.0_or_cc-by-4.0_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_or_cc-by-nc-sa-4.0_or_cc-by-4.0_1.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-sa-4.0 OR cc-by-nc-sa-4.0 OR cc-by-4.0
+is_license_notice: yes
+relevance: 80
+notes: A weak indication of a CC license
+---
+
Creative Commons-licensed
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_or_cc-by-nc-sa-4.0_or_cc-by-4.0_1.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_or_cc-by-nc-sa-4.0_or_cc-by-4.0_1.yml
deleted file mode 100644
index 1ee21cf6fce..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_or_cc-by-nc-sa-4.0_or_cc-by-4.0_1.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-sa-4.0 OR cc-by-nc-sa-4.0 OR cc-by-4.0
-is_license_notice: yes
-relevance: 80
-notes: A weak indication of a CC license
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_url_1.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_url_1.RULE
index 090a6297813..74c2472aeb8 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_url_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_url_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-sa-4.0
+---
+
https://spdx.org/licenses/cc-by-sa-4.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_url_1.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_url_1.yml
deleted file mode 100644
index eba302d11ff..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_url_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-sa-4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_url_2.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_url_2.RULE
index 177b2c341eb..9368456fbb0 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_url_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_url_2.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+relevance: 95
+ignorable_urls:
+ - https://spdx.org/licenses/cc-by-sa-4.0.html
+---
+
https://spdx.org/licenses/cc-by-sa-4.0.html
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_url_2.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_url_2.yml
deleted file mode 100644
index 0724726e115..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_url_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-relevance: 95
-ignorable_urls:
- - https://spdx.org/licenses/cc-by-sa-4.0.html
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge.RULE
index 657b5f79d72..ad2cef8bda2 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0
+ - https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg
+---
+
[](https://creativecommons.org/licenses/by-sa/4.0/)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge.yml
deleted file mode 100644
index 26929c2e044..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0
- - https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge_1.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge_1.RULE
index 5fbad1e4ab6..059f2ef394a 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge_1.RULE
@@ -1 +1,8 @@
+---
+license_expression: cc-by-sa-4.0
+is_license_reference: yes
+ignorable_urls:
+ - https://creativecommons.org/licenses/by-sa/4.0
+---
+
[](https://creativecommons.org/licenses/by-sa/4.0/)
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge_1.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge_1.yml
deleted file mode 100644
index ec30d371646..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_url_badge_1.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-license_expression: cc-by-sa-4.0
-is_license_reference: yes
-ignorable_urls:
- - https://creativecommons.org/licenses/by-sa/4.0
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_1.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_1.RULE
index c787c796e26..5fea91e9211 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_1.RULE
@@ -1 +1,6 @@
+---
+license_expression: cc-by-sa-4.0 WITH generic-exception
+is_license_text: yes
+---
+
This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA) with Design Exception 1.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_1.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_1.yml
deleted file mode 100644
index 084479ef950..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_1.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: cc-by-sa-4.0 WITH generic-exception
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_2.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_2.RULE
index bfb13213da9..d6a5395f3d3 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_2.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: cc-by-sa-4.0 WITH generic-exception
+is_license_notice: yes
+notes: https://www.kicad.org/libraries/license/
+---
+
are licensed under the Creative Commons CC-BY-SA 4.0 License, with the following exception:
To the extent that the creation of electronic designs that use 'Licensed Material' can be considered to be 'Adapted Material', then the copyright holder waives article 3 of the license with respect to these designs and any generated files which use data provided as part of the 'Licensed Material'.
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_2.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_2.yml
deleted file mode 100644
index 9801a7ba037..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0 WITH generic-exception
-is_license_notice: yes
-notes: https://www.kicad.org/libraries/license/
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_3.RULE b/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_3.RULE
index 40c4d836ed7..a70b52b2471 100644
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_3.RULE
+++ b/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_3.RULE
@@ -1,3 +1,9 @@
+---
+license_expression: cc-by-sa-4.0 WITH generic-exception
+is_license_notice: yes
+notes: https://www.kicad.org/libraries/license/
+---
+
Libraries License
The libraries are licensed under the Creative Commons CC-BY-SA 4.0 License, with the following exception:
diff --git a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_3.yml b/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_3.yml
deleted file mode 100644
index 9801a7ba037..00000000000
--- a/src/licensedcode/data/rules/cc-by-sa-4.0_with_generic-exception_3.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-license_expression: cc-by-sa-4.0 WITH generic-exception
-is_license_notice: yes
-notes: https://www.kicad.org/libraries/license/
diff --git a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit.RULE b/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit.RULE
index 729c9c7904e..348c9115275 100644
--- a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit.RULE
+++ b/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-by-2.0-uk
+is_license_notice: yes
+minimum_coverage: 50
+ignorable_urls:
+ - http://www.webtoolkit.info/license
+---
+
webtoolkit License
http://www.webtoolkit.info/license
diff --git a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit.yml b/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit.yml
deleted file mode 100644
index 7328461312d..00000000000
--- a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-2.0-uk
-is_license_notice: yes
-minimum_coverage: 50
-ignorable_urls:
- - http://www.webtoolkit.info/license
diff --git a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_1.RULE b/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_1.RULE
index b3c234150cc..a214ebd8a57 100644
--- a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_1.RULE
+++ b/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_1.RULE
@@ -1,3 +1,12 @@
+---
+license_expression: cc-by-2.0-uk
+is_license_notice: yes
+minimum_coverage: 50
+ignorable_urls:
+ - http://creativecommons.org/licenses/by/2.0/uk/
+ - http://www.webtoolkit.info/license
+---
+
webtoolkit License
http://www.webtoolkit.info/license
diff --git a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_1.yml b/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_1.yml
deleted file mode 100644
index 7dfaaa1ad18..00000000000
--- a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_1.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-license_expression: cc-by-2.0-uk
-is_license_notice: yes
-minimum_coverage: 50
-ignorable_urls:
- - http://creativecommons.org/licenses/by/2.0/uk/
- - http://www.webtoolkit.info/license
diff --git a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_2.RULE b/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_2.RULE
index 32d9a20a2db..eba604c8f1a 100644
--- a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_2.RULE
+++ b/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_2.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-by-2.0-uk
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://www.webtoolkit.info/license
+---
+
http://www.webtoolkit.info/license
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_2.yml b/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_2.yml
deleted file mode 100644
index 74d36e4a69e..00000000000
--- a/src/licensedcode/data/rules/cc-by-uk-2.0-webtoolkit_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-by-2.0-uk
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://www.webtoolkit.info/license
diff --git a/src/licensedcode/data/rules/cc-devnations-2.0_1.RULE b/src/licensedcode/data/rules/cc-devnations-2.0_1.RULE
index 724d588e216..bfd0bc4e743 100644
--- a/src/licensedcode/data/rules/cc-devnations-2.0_1.RULE
+++ b/src/licensedcode/data/rules/cc-devnations-2.0_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-devnations-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/devnations/2.0
+---
+
http://creativecommons.org/licenses/devnations/2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-devnations-2.0_1.yml b/src/licensedcode/data/rules/cc-devnations-2.0_1.yml
deleted file mode 100644
index ab418e76b85..00000000000
--- a/src/licensedcode/data/rules/cc-devnations-2.0_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-devnations-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/devnations/2.0
diff --git a/src/licensedcode/data/rules/cc-devnations-2.0_2.RULE b/src/licensedcode/data/rules/cc-devnations-2.0_2.RULE
index 172ea3cbd3d..8d9d0c3a216 100644
--- a/src/licensedcode/data/rules/cc-devnations-2.0_2.RULE
+++ b/src/licensedcode/data/rules/cc-devnations-2.0_2.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-devnations-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/devnations/2.0/legalcode
+---
+
http://creativecommons.org/licenses/devnations/2.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-devnations-2.0_2.yml b/src/licensedcode/data/rules/cc-devnations-2.0_2.yml
deleted file mode 100644
index d10a3243680..00000000000
--- a/src/licensedcode/data/rules/cc-devnations-2.0_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-devnations-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/devnations/2.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-devnations-2.0_3.RULE b/src/licensedcode/data/rules/cc-devnations-2.0_3.RULE
index 35f2080fb92..9978f2fefcf 100644
--- a/src/licensedcode/data/rules/cc-devnations-2.0_3.RULE
+++ b/src/licensedcode/data/rules/cc-devnations-2.0_3.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-devnations-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/devnations/2.0
+---
+
https://creativecommons.org/licenses/devnations/2.0
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-devnations-2.0_3.yml b/src/licensedcode/data/rules/cc-devnations-2.0_3.yml
deleted file mode 100644
index cfc0191affc..00000000000
--- a/src/licensedcode/data/rules/cc-devnations-2.0_3.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-devnations-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/devnations/2.0
diff --git a/src/licensedcode/data/rules/cc-devnations-2.0_4.RULE b/src/licensedcode/data/rules/cc-devnations-2.0_4.RULE
index 04e2df21837..5fda0ddbe2a 100644
--- a/src/licensedcode/data/rules/cc-devnations-2.0_4.RULE
+++ b/src/licensedcode/data/rules/cc-devnations-2.0_4.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-devnations-2.0
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - https://creativecommons.org/licenses/devnations/2.0/legalcode
+---
+
https://creativecommons.org/licenses/devnations/2.0/legalcode
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-devnations-2.0_4.yml b/src/licensedcode/data/rules/cc-devnations-2.0_4.yml
deleted file mode 100644
index dfa9c091b8c..00000000000
--- a/src/licensedcode/data/rules/cc-devnations-2.0_4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-devnations-2.0
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - https://creativecommons.org/licenses/devnations/2.0/legalcode
diff --git a/src/licensedcode/data/rules/cc-pd_1.RULE b/src/licensedcode/data/rules/cc-pd_1.RULE
index 754df3734c8..8780a566cd1 100644
--- a/src/licensedcode/data/rules/cc-pd_1.RULE
+++ b/src/licensedcode/data/rules/cc-pd_1.RULE
@@ -1 +1,9 @@
+---
+license_expression: cc-pd
+is_license_reference: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/publicdomain/
+---
+
http://creativecommons.org/licenses/publicdomain/
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-pd_1.yml b/src/licensedcode/data/rules/cc-pd_1.yml
deleted file mode 100644
index 49af3d36cdb..00000000000
--- a/src/licensedcode/data/rules/cc-pd_1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-pd
-is_license_reference: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/publicdomain/
diff --git a/src/licensedcode/data/rules/cc-pd_10.RULE b/src/licensedcode/data/rules/cc-pd_10.RULE
index e3dfcdb41dd..7970fa88355 100644
--- a/src/licensedcode/data/rules/cc-pd_10.RULE
+++ b/src/licensedcode/data/rules/cc-pd_10.RULE
@@ -1,3 +1,8 @@
+---
+license_expression: cc-pd
+is_license_text: yes
+---
+
Public Domain Dedication
This license is acceptable for Free Cultural Works.
diff --git a/src/licensedcode/data/rules/cc-pd_10.yml b/src/licensedcode/data/rules/cc-pd_10.yml
deleted file mode 100644
index 9df044922f4..00000000000
--- a/src/licensedcode/data/rules/cc-pd_10.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-license_expression: cc-pd
-is_license_text: yes
diff --git a/src/licensedcode/data/rules/cc-pd_11.RULE b/src/licensedcode/data/rules/cc-pd_11.RULE
index 6b4a67bd5be..ed1ad4cceae 100644
--- a/src/licensedcode/data/rules/cc-pd_11.RULE
+++ b/src/licensedcode/data/rules/cc-pd_11.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: cc-pd
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/publicdomain
+---
+
released to the public domain, as explained at
* http://creativecommons.org/licenses/publicdomain
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-pd_11.yml b/src/licensedcode/data/rules/cc-pd_11.yml
deleted file mode 100644
index 27a5f6f3e15..00000000000
--- a/src/licensedcode/data/rules/cc-pd_11.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-pd
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/publicdomain
diff --git a/src/licensedcode/data/rules/cc-pd_12.RULE b/src/licensedcode/data/rules/cc-pd_12.RULE
index a549a10735a..faf5d49a44c 100644
--- a/src/licensedcode/data/rules/cc-pd_12.RULE
+++ b/src/licensedcode/data/rules/cc-pd_12.RULE
@@ -1,2 +1,10 @@
+---
+license_expression: cc-pd
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/publicdomain
+---
+
and released to the public domain, as explained at
* http://creativecommons.org/licenses/publicdomain
\ No newline at end of file
diff --git a/src/licensedcode/data/rules/cc-pd_12.yml b/src/licensedcode/data/rules/cc-pd_12.yml
deleted file mode 100644
index 27a5f6f3e15..00000000000
--- a/src/licensedcode/data/rules/cc-pd_12.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-pd
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/publicdomain
diff --git a/src/licensedcode/data/rules/cc-pd_13.RULE b/src/licensedcode/data/rules/cc-pd_13.RULE
index 48ed964ae4c..1223d309086 100644
--- a/src/licensedcode/data/rules/cc-pd_13.RULE
+++ b/src/licensedcode/data/rules/cc-pd_13.RULE
@@ -1,3 +1,11 @@
+---
+license_expression: cc-pd
+is_license_notice: yes
+relevance: 100
+ignorable_urls:
+ - http://creativecommons.org/licenses/publicdomain/
+---
+
# This work is hereby released into the Public Domain. To view a copy of
# the public domain dedication, visit
# http://creativecommons.org/licenses/publicdomain/ or send a letter to
diff --git a/src/licensedcode/data/rules/cc-pd_13.yml b/src/licensedcode/data/rules/cc-pd_13.yml
deleted file mode 100644
index 7d240cd9d29..00000000000
--- a/src/licensedcode/data/rules/cc-pd_13.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-license_expression: cc-pd
-is_license_notice: yes
-relevance: 100
-ignorable_urls:
- - http://creativecommons.org/licenses/publicdomain/
diff --git a/src/licensedcode/data/rules/cc-pd_14.RULE b/src/licensedcode/data/rules/cc-pd_14.RULE
index ab13453a2bc..c9de48d5b6e 100644
--- a/src/licensedcode/data/rules/cc-pd_14.RULE
+++ b/src/licensedcode/data/rules/cc-pd_14.RULE
@@ -1,3 +1,14 @@
+---
+license_expression: cc-pd
+is_license_tag: yes
+relevance: 100
+ignorable_urls:
+ - http://web.resource.org/cc/DerivativeWorks
+ - http://web.resource.org/cc/Distribution
+ - http://web.resource.org/cc/PublicDomain
+ - http://web.resource.org/cc/Reproduction
+---
+