diff --git a/.flake8 b/.flake8
@@ -6,7 +6,7 @@ exclude =
     __pycache__,
     build,
     dist,
-    doc/source/conf.py
+    docs/source/conf.py
 max-line-length = 115
 # Ignore some style 'errors' produced while formatting by 'black'
 # https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings

diff --git a/.github/ISSUE_TEMPLATE/release_checklist.md b/.github/ISSUE_TEMPLATE/release_checklist.md
@@ -34,7 +34,7 @@ Please let the maintainer know that all checks are done and the package is ready
 <!-- After the maintainer releases the PyPI package, please check the following when creating a PR for conda-forge release.-->
 
 - [ ] Ensure that the full release has appeared on PyPI successfully.
-- [ ] New package dependencies listed in `conda.txt` and `test.txt` are added to `meta.yaml` in the feedstock.
+- [ ] New package dependencies listed in `conda.txt` and `tests.txt` are added to `meta.yaml` in the feedstock.
 - [ ] Close any open issues on the feedstock. Reach out to the maintainer if you have questions.
 - [ ] Tag the maintainer for conda-forge release.
 

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -10,4 +10,4 @@ python:
     - requirements: requirements/docs.txt
 
 sphinx:
-  configuration: doc/source/conf.py
+  configuration: docs/source/conf.py
diff --git a/doc/Makefile → docs/Makefile b/doc/Makefile → docs/Makefile
diff --git a/doc/make.bat → docs/make.bat b/doc/make.bat → docs/make.bat
diff --git a/doc/manual/Makefile → docs/manual/Makefile b/doc/manual/Makefile → docs/manual/Makefile
diff --git a/doc/manual/requirements.txt → docs/manual/requirements.txt b/doc/manual/requirements.txt → docs/manual/requirements.txt
diff --git a/doc/source/_static/.placeholder → docs/source/_static/.placeholder b/doc/source/_static/.placeholder → docs/source/_static/.placeholder
diff --git a/doc/source/api/diffpy.structure.apps.rst → docs/source/api/diffpy.structure.apps.rst b/doc/source/api/diffpy.structure.apps.rst → docs/source/api/diffpy.structure.apps.rst
diff --git a/...source/api/diffpy.structure.expansion.rst → ...source/api/diffpy.structure.expansion.rst b/...source/api/diffpy.structure.expansion.rst → ...source/api/diffpy.structure.expansion.rst
diff --git a/doc/source/api/diffpy.structure.parsers.rst → docs/source/api/diffpy.structure.parsers.rst b/doc/source/api/diffpy.structure.parsers.rst → docs/source/api/diffpy.structure.parsers.rst
diff --git a/doc/source/api/diffpy.structure.rst → docs/source/api/diffpy.structure.rst b/doc/source/api/diffpy.structure.rst → docs/source/api/diffpy.structure.rst
diff --git a/doc/source/conf.py → docs/source/conf.py b/doc/source/conf.py → docs/source/conf.py
@@ -139,7 +139,7 @@
     "github_user": "diffpy",
     "github_repo": "diffpy.structure",
     "github_version": "main",
-    "conf_py_path": "/doc/source/",
+    "conf_py_path": "/docs/source/",
 }
 
 # Theme options are theme-specific and customize the look and feel of a theme
@@ -222,7 +222,7 @@
 
 # Output file base name for HTML help builder.
 basename = "diffpy.structure".replace(" ", "").replace(".", "")
-htmlhelp_basename = basename + "doc"
+htmlhelp_basename = basename + "docs"
 
 
 # -- Options for LaTeX output ---------------------------------------------

diff --git a/doc/source/diffpy.structure.apps.rst → docs/source/diffpy.structure.apps.rst b/doc/source/diffpy.structure.apps.rst → docs/source/diffpy.structure.apps.rst
diff --git a/doc/source/diffpy.structure.expansion.rst → docs/source/diffpy.structure.expansion.rst b/doc/source/diffpy.structure.expansion.rst → docs/source/diffpy.structure.expansion.rst
diff --git a/doc/source/diffpy.structure.parsers.rst → docs/source/diffpy.structure.parsers.rst b/doc/source/diffpy.structure.parsers.rst → docs/source/diffpy.structure.parsers.rst
diff --git a/doc/source/img/.placeholder → docs/source/img/.placeholder b/doc/source/img/.placeholder → docs/source/img/.placeholder
diff --git a/doc/source/index.rst → docs/source/index.rst b/doc/source/index.rst → docs/source/index.rst
diff --git a/doc/source/license.rst → docs/source/license.rst b/doc/source/license.rst → docs/source/license.rst
diff --git a/doc/source/mod-atom.rst → docs/source/mod-atom.rst b/doc/source/mod-atom.rst → docs/source/mod-atom.rst
diff --git a/doc/source/mod-lattice.rst → docs/source/mod-lattice.rst b/doc/source/mod-lattice.rst → docs/source/mod-lattice.rst
diff --git a/doc/source/mod-spacegroup.rst → docs/source/mod-spacegroup.rst b/doc/source/mod-spacegroup.rst → docs/source/mod-spacegroup.rst
diff --git a/doc/source/release.rst → docs/source/release.rst b/doc/source/release.rst → docs/source/release.rst
diff --git a/doc/source/snippets/.placeholder → docs/source/snippets/.placeholder b/doc/source/snippets/.placeholder → docs/source/snippets/.placeholder
diff --git a/news/new-group-standard.rst b/news/new-group-standard.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* Use the names CODE-OF-CONDUCT.rst, docs and requirements/tests.txt according to the new group standard.
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>
diff --git a/requirements/test.txt → requirements/tests.txt b/requirements/test.txt → requirements/tests.txt