diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7482ac3..d93236d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,20 +1,46 @@
-
-# This is a comment.
+# 📀 Code Owners
+#
+# Copyright © 2021, California Institute of Technology ("Caltech").
+# U.S. Government sponsorship acknowledged.
+#
+# All rights reserved.
+#
+# 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 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.
+# • Neither the name of Caltech nor its operating division, the Jet Propulsion
+#   Laboratory, nor the names of its contributors may be used to endorse or
+#   promote products derived from this software without specific prior written
+#   permission.
+#
+# 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.
+#
+#
 # Each line is a file pattern followed by one or more owners.
-
+#
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-
-# ***************************************************************
 #
-# Go to https://github.com/orgs/pds-data-dictionaries/teams to
-# find out more information about your applicable team
-
-*       @NASA-PDS/pds-registry-committers
+# Go to https://github.com/orgs/NASA-PDS/teams to find out about our teams
 
-# **************************************************************
+* @NASA-PDS/pds-registry-committers
 
-# For more information on populating this file, go to
+# For more information on populating this file, check out
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..07a033f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "<system feature> <is not/does not> <expected behaviour>"
+labels: bug, needs:triage
+assignees: jordanpadams
+
+---
+
+## 🐛 Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+## 📜 To Reproduce
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+## 🕵️ Expected behavior
+<!-- A clear and concise description of what you expected to happen -->
+
+## 📚 Version of Software Used
+<!-- Software should have a `-V` or `--version` flag to get this information. -->
+
+## 🩺 Test Data / Additional context
+<!-- If applicable, Add test data or any other context about the problem here -->
+
+##  🏞Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+## 🖥 System Info
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+---
+<!-- FOR DEV TEAM USE -->
+
+## 🦄 Related requirements
+
+
+## ⚙️ Engineering Details
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..b0e3d2b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,32 @@
+---
+name: Feature request
+about: Suggest a new idea or new requirement for this project
+title: As a <what is the user's role?> I want to <what is the user trying to accomplish?>
+labels: needs:triage, requirement
+assignees: jordanpadams
+
+---
+
+<!--
+   For more information on how to populate this new feature request, see the PDS Wiki on User Story Development:
+   https://github.com/NASA-PDS/nasa-pds.github.io/wiki/Issue-Tracking#user-story-development
+-->
+
+## 💪 Motivation
+...so that I can <!-- why do you want to do this? -->
+
+## 📖 Additional Details
+<!-- Please prove any additional details or information that could help provide some context for the user story. -->
+
+## ⚖️ Acceptance Criteria
+**Given** <!-- a condition -->
+**When I perform** <!-- an action -->
+**Then I expect** <!-- the result -->
+
+<!-- For Internal Dev Team Use -->
+
+## ⚙️ Engineering Details
+<!--
+    Provide some design / implementation details and/or a sub-task checklist as needed.
+    Convert issue to Epic if estimate is outside the scope of 1 sprint.
+-->
diff --git a/.github/ISSUE_TEMPLATE/i-t-bug-report.md b/.github/ISSUE_TEMPLATE/i-t-bug-report.md
new file mode 100644
index 0000000..a7328d3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/i-t-bug-report.md
@@ -0,0 +1,59 @@
+---
+name: I&T Bug Report
+about: Report a bug found or test case failure during PDS System I&T
+title: "<system feature> <is not/does not> <expected behaviour>"
+labels: I&T, bug, needs:triage
+assignees: jordanpadams
+
+---
+
+## 🐛 Describe the bug identified during I&T
+<!-- A clear and concise description of what the bug is. -->
+
+
+## 🥼 Related Test Case(s)
+<!-- Document related test cases below -->
+
+
+## 🔁 : Related issues
+<!-- Reference related issues below, e.g.
+* for issues in this repo: #1 (remove back ticks)
+* for issues in other repos: NASA-PDS/my_repo#1, NASA-PDS/that_repo#2
+-->
+
+---
+
+## ➕ Additional Details
+<!-- Enter additional details to support the ticket if the info above is not sufficient to replicate -->
+
+### 📜 To Reproduce
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+### 🕵️ Expected behavior
+<!-- A clear and concise description of what you expected to happen -->
+
+### 📚 Version of Software Used
+<!-- Software should have a `-V` or `--version` flag to get this information. -->
+
+### 🩺 Test Data / Additional context
+<!-- If applicable, Add test data or any other context about the problem here -->
+
+###  🏞Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+### 🖥 System Info
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+---
+<!-- FOR DEV TEAM USE -->
+
+## 🦄 Related requirements
+
+
+## ⚙️ Engineering Details
diff --git a/.github/ISSUE_TEMPLATE/pds4-standards-change-request.md b/.github/ISSUE_TEMPLATE/pds4-standards-change-request.md
new file mode 100644
index 0000000..a136f3d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/pds4-standards-change-request.md
@@ -0,0 +1,13 @@
+---
+name: PDS4 Standards Change Request
+about: Tasks related to PDS4 Standards Change Request in design and implementation
+  queue
+title: 'CCB-xxx: Copy SCR title here'
+labels: requirement, pending-scr, p.must-have, needs:triage
+assignees: jordanpadams
+
+---
+
+**Link to SCR:** _Insert URL here to PDS CCB JIRA ticket, if available_
+
+**SCR Details:** _Attach PDF export of issue details. If SCR design is not complete, leave blank for now_
diff --git a/.github/ISSUE_TEMPLATE/vulnerability-issue.md b/.github/ISSUE_TEMPLATE/vulnerability-issue.md
new file mode 100644
index 0000000..ed0d753
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/vulnerability-issue.md
@@ -0,0 +1,14 @@
+---
+name: Vulnerability Issue
+about: Describe security vulnerability
+title: "[SECURITY] Title Here"
+labels: bug, needs:triage, security
+assignees: jordanpadams
+
+---
+
+## Vulnerability
+_Describe the vulnerability_
+
+## Software Version
+_Version_
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 1ffa64d..b14a627 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,12 +1,17 @@
-**Summary***
+## 📜 Summary
+
 Brief summary of changes if not sufficiently described by commit messages.
 
-**Test Data and/or Report**
+
+## 🩺 Test Data and/or Report
+
 One of the following should be included here:
 * Reference to regression test included in code (preferred wherever reasonable)
 * Attach test data here + outputs of tests
 
-**Related Issues**
+
+## 🧩 Related Issues
+
 <!--
     Reference related issues here and use `Fixes` or `Resolves` in order to automatically close the issue upon merge. For more information on autolinking to tickets see https://docs.github.com/en/github/writing-on-github/autolinked-references-and-urls.
 
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..f5f4b8b
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,195 @@
+Apache License
+==============
+
+_Version 2.0, January 2004_  
+_&lt;<http://www.apache.org/licenses/>&gt;_
+
+### Terms and Conditions for use, reproduction, and distribution
+
+#### 1. Definitions
+
+“License” shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+“Licensor” shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+“Legal Entity” shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, “control” means **(i)** the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
+outstanding shares, or **(iii)** beneficial ownership of such entity.
+
+“You” (or “Your”) shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+“Source” form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+“Object” form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+“Work” shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+“Derivative Works” shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+“Contribution” shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+“submitted” means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as “Not a Contribution.”
+
+“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+#### 2. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+#### 3. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+#### 4. Redistribution
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+* **(b)** You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+#### 5. Submission of Contributions
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+#### 6. Trademarks
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+#### 7. Disclaimer of Warranty
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+#### 8. Limitation of Liability
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+#### 9. Accepting Warranty or Additional Liability
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+_END OF TERMS AND CONDITIONS_
+
+### APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets `[]` replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same “printed page” as the copyright notice for easier identification within
+third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+      http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index a8d2587..0000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2019 California Institute of Technology
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/NOTICE.txt b/NOTICE.txt
index 3271d48..a4c8854 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,6 +1,6 @@
-PDS XYZ Tool (update licensing below per specific organization)
+PDS Application Programmer's Interface
 
-Copyright 2020, California Institute of Technology ("Caltech").
+Copyright 2021, California Institute of Technology ("Caltech").
 U.S. Government sponsorship acknowledged.
 
 All rights reserved.
diff --git a/README.md b/README.md
index ff7dd5c..7898877 100644
--- a/README.md
+++ b/README.md
@@ -1,54 +1,45 @@
 # NASA PDS Federated API
-This repo is the entry point for the NASA PDS federated API specifications.
 
-The specifications are discussed in the PDS Working Group and a first level of specification is shared on google drive.
+This repository is the entry point for the NASA PDS federated API specifications.
 
-The formal specification in Open API standard is shared on swaggerHub: https://app.swaggerhub.com/apis/PDS_APIs/pds_federated_api/0.1.dev
+The specifications are discussed in the PDS Working Group and a first level of specification is shared on Google drive.
 
-Various implementation flavour are also being made available:
-- java library: https://github.com/NASA-PDS/pds-api-javalib
-- java stub and demo server: https://github.com/NASA-PDS/pds-api-service , deployed on https://pds-gamma.jpl.nasa.gov/api/swagger-ui.html
-- python stub service: https://github.com/NASA-PDS/pds-api-pythonlib
-- python client: https://github.com/NASA-PDS/pds-api-client
+The formal specification in Open API standard is shared on SwaggerHub: https://app.swaggerhub.com/apis/PDS_APIs/pds_federated_api/0.1.dev
 
-# API Documentation 
-
-The API Documentation is generated in github action workflow on:
-
-https://nasa-pds.github.io/pds-api/
-
-A draft of the PDS API Specification can be found on Google Drive:
-
-https://docs.google.com/document/d/16d0MVh48bFLvWsa5-B_Hy-cby1rGWdnNojWOJpUcOvA/edit#heading=h.3pbz9ppxrxvr 
-
-
-# Generate POSTMAN Test Collection
+👉 **Note:** this link may be broken.
 
-POSTMAN is a popular tool to make web API testing more user friendly: https://www.postman.com/
+Various implementation flavors are available:
 
-POSTMAN is a standalone desktop application that you first need to download and install: https://www.postman.com/downloads/
+-   Java library: https://github.com/NASA-PDS/pds-api-javalib
+-   Java stub and demo server: https://github.com/NASA-PDS/pds-api-service , deployed on https://pds-gamma.jpl.nasa.gov/api/swagger-ui.html
+-   Python stub service: https://github.com/NASA-PDS/pds-api-pythonlib
+-   Python client: https://github.com/NASA-PDS/pds-api-client
 
-To create a test collection for the PDS federated API, the steps are:
-
-  1. go to import (top-left)
-  2. choose 'Link' tab
-  3. Use link `https://raw.githubusercontent.com/NASA-PDS/pds-api/main/json-unresolved/swagger.json`
-  4. In settings, for request parameter generation, select `Example`, this will assign example values to the API arguments. If you select `Schema` no value will be assigned.
-  5. Create a virtual environment: click the wheel on top-right, then 'Add'
-  6. Create constant `baseUrl` and assign value of your root server without trailing `/`, for example `https://pds-gamma.jpl.nasa.gov/api`
-  7. Make sure your new environment is selected, use top-right drop down menu.
-  8. In the left menu, go to your new collection folder named `Planetary Data System API`, select a request.
-  9. Adjust the request's parameters and hit `Send`
-  10. You can extend the collection by duplicating and editing existing requests
- 
-
-Warning: if you reimport the same specification in the same folder, your manually set parameters will be lost.
 
+# API Documentation 
 
+The API Documentation is available at: https://nasa-pds.github.io/pds-api/
 
+We also publish [a draft of the PDS API Specification](https://docs.google.com/document/d/16d0MVh48bFLvWsa5-B_Hy-cby1rGWdnNojWOJpUcOvA/edit#heading=h.3pbz9ppxrxvr).
 
 
+# Generate Postman Test Collection
 
+Postman is a popular tool to make web API testing more user friendly: https://www.postman.com/
 
+Postman is a standalone desktop application that you first need to [download and install](https://www.Postman.com/downloads/).
 
+To create a test collection for the PDS federated API, the steps are:
 
+1.  Go to import (top-left)
+2.  Choose 'Link' tab
+3.  Use link `https://raw.githubusercontent.com/NASA-PDS/pds-api/main/json-unresolved/swagger.json`
+4.  In settings, for request parameter generation, select `Example`, this will assign example values to the API arguments. If you select `Schema` no value will be assigned.
+5.  Create a virtual environment: click the wheel on top-right, then 'Add'
+6.  Create constant `baseUrl` and assign value of your root server without trailing `/`, for example `https://pds-gamma.jpl.nasa.gov/api`
+7.  Make sure your new environment is selected, use top-right drop down menu.
+8.  In the left menu, go to your new collection folder named `Planetary Data System API`, select a request.
+9.  Adjust the request's parameters and hit `Send`
+10. You can extend the collection by duplicating and editing existing requests
+ 
+⚠️ **Warning:** if you reimport the same specification in the same folder, your manually set parameters will be lost.
diff --git a/SECURITY.md b/SECURITY.md
index 55c7474..383f992 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,16 +1,8 @@
-# Security Policy
+# 👮‍♀️ Security Policy
 
-## Supported Versions
+This document describes the security policy of the PDS API.
 
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.18.2   | :white_check_mark: |
-| 1.17.5   | :white_check_mark: |
-| < 1.17.5   | :x: |
+## 🚨 Reporting a Vulnerability
 
-## Reporting a Vulnerability
-
-Please create a new issue using the [Vulnerability Issue template](https://github.com/NASA-PDS-Incubator/validate/issues/new?assignees=jordanpadams&labels=triage-needed%2C+security&template=vulnerability-issue.md&title=%5BSECURITY%5D+Title+Here)
+Please create a new issue using the [Vulnerability Issue template](https://github.com/NASA-PDS/pds-api/issues/new).