From 107a4a1c58cd91bc7dc9a7a8e7c13c34e19489a4 Mon Sep 17 00:00:00 2001
From: Sarah Withee <2601974+geekygirlsarah@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:51 -0500
Subject: [PATCH 01/15] Rename thesaurus languages to entries

---
 .github/ISSUE_TEMPLATE/language_issues.md     |   2 +-
 .github/ISSUE_TEMPLATE/language_request.md    |   2 +-
 .../validate-language-info-files.yml          |   4 +-
 .../commands/generate_missing_templates.py    |   6 +-
 web/management/commands/generate_template.py  |   4 +-
 .../commands/validatelanginfofiles.py         |   2 +-
 .../commands/validatemetainfofile.py          |  10 +-
 web/models.py                                 | 114 +++++-----
 web/tests/test_models.py                      |  66 +++---
 web/tests/test_views.py                       |   4 +-
 web/thesaurus_template_generators.py          |  18 +-
 web/views.py                                  | 200 +++++++++---------
 12 files changed, 216 insertions(+), 216 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/language_issues.md b/.github/ISSUE_TEMPLATE/language_issues.md
index 8e3a50d4d..703e35819 100644
--- a/.github/ISSUE_TEMPLATE/language_issues.md
+++ b/.github/ISSUE_TEMPLATE/language_issues.md
@@ -1,5 +1,5 @@
 ---
-name: Language Issue
+name: ThesaurusEntry Issue
 about: Use this template to report issues with a language
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/language_request.md b/.github/ISSUE_TEMPLATE/language_request.md
index d60895eb8..4a1782603 100644
--- a/.github/ISSUE_TEMPLATE/language_request.md
+++ b/.github/ISSUE_TEMPLATE/language_request.md
@@ -1,5 +1,5 @@
 ---
-name: Language Request
+name: ThesaurusEntry Request
 about: Use this template to request a new language
 ---
 
diff --git a/.github/workflows/validate-language-info-files.yml b/.github/workflows/validate-language-info-files.yml
index ac513a3dc..2ff777a76 100644
--- a/.github/workflows/validate-language-info-files.yml
+++ b/.github/workflows/validate-language-info-files.yml
@@ -1,4 +1,4 @@
-name: Validate Language Info Files
+name: Validate ThesaurusEntry Info Files
 
 on:
   push:
@@ -10,7 +10,7 @@ on:
 
 jobs:
   run:
-    name: Validate Language Info Files
+    name: Validate ThesaurusEntry Info Files
     runs-on: ubuntu-latest
     steps:
 
diff --git a/web/management/commands/generate_missing_templates.py b/web/management/commands/generate_missing_templates.py
index 1fc8c0a31..95f93c7c0 100644
--- a/web/management/commands/generate_missing_templates.py
+++ b/web/management/commands/generate_missing_templates.py
@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 
-from web.models import Language, MetaInfo
+from web.models import ThesaurusEntry, ThesaurusMetaInfo
 
 import os
 
@@ -9,12 +9,12 @@ class Command(BaseCommand):
     help = 'Generate missing language thesaurus files to be filled out'
 
     def handle(self, *args, **options):
-        meta_info = MetaInfo()
+        meta_info = ThesaurusMetaInfo()
         languages = meta_info.languages
         structures = meta_info.structures
         
         for language in languages:
-            versions = Language(language, languages[language]).versions()
+            versions = ThesaurusEntry(language, languages[language]).versions()
             for version in versions:
                 for structure in structures:
                     file_path = os.path.join(
diff --git a/web/management/commands/generate_template.py b/web/management/commands/generate_template.py
index f60217ef1..23a94d245 100644
--- a/web/management/commands/generate_template.py
+++ b/web/management/commands/generate_template.py
@@ -1,7 +1,7 @@
 from django.core.management.base import BaseCommand
 
 from web.thesaurus_template_generators import generate_language_template
-from web.models import MetaInfo
+from web.models import ThesaurusMetaInfo
 from packaging.version import parse as parse_version
 
 import os
@@ -11,7 +11,7 @@ class Command(BaseCommand):
     help = 'Generate language thesaurus files to be filled out'
 
     def add_arguments(self, parser):
-        structures = list(MetaInfo().structures.keys())
+        structures = list(ThesaurusMetaInfo().structures.keys())
 
         parser.add_argument('language', help="Key of the programming language")
         parser.add_argument(
diff --git a/web/management/commands/validatelanginfofiles.py b/web/management/commands/validatelanginfofiles.py
index e6c35e38f..fb6cb326a 100644
--- a/web/management/commands/validatelanginfofiles.py
+++ b/web/management/commands/validatelanginfofiles.py
@@ -80,7 +80,7 @@ def check_meta_section(self, data, relative_path):
 
         if not language_name:
             self.report_error(f"`{relative_path}` has an empty `language_name` attribute and needs to be updated")
-        elif language_name in ["Human-Friendly Language Name", "Human-Readable Language Name"]:
+        elif language_name in ["Human-Friendly ThesaurusEntry Name", "Human-Readable ThesaurusEntry Name"]:
             self.report_error(f"`{relative_path}` has the default `language_name` attribute and needs to be updated")
 
         if "categories" in data:
diff --git a/web/management/commands/validatemetainfofile.py b/web/management/commands/validatemetainfofile.py
index 1fe975b41..71ceebde8 100644
--- a/web/management/commands/validatemetainfofile.py
+++ b/web/management/commands/validatemetainfofile.py
@@ -2,7 +2,7 @@
 
 from django.core.management.base import BaseCommand, CommandError
 
-from web.models import MetaInfo
+from web.models import ThesaurusMetaInfo
 
 
 class Command(BaseCommand):
@@ -16,7 +16,7 @@ def __init__(self, *args, **kwargs):
         self.meta_path = self.thesauruses_path / "_meta"
 
     def handle(self, *args, **options):
-        self.metainfo = MetaInfo()
+        self.metainfo = ThesaurusMetaInfo()
         
         self.check_thesaurus_directories()
         self.check_meta_info_consistency()
@@ -61,10 +61,10 @@ def check_meta_info_consistency(self):
                 self.report_error(f"{lang_name} is listed as a language in `meta_info.json` but the directory `{path}` doesn't exist")
 
     def check_meta_files_consistency(self):
-        """Check structures in _meta match those in MetaInfo"""
+        """Check structures in _meta match those in ThesaurusMetaInfo"""
         meta_files = {f.name for f in self.meta_path.iterdir() if f.is_file()}
         
-        # Check files in _meta are listed in MetaInfo
+        # Check files in _meta are listed in ThesaurusMetaInfo
         for meta_file in meta_files:
             if not meta_file.endswith(".json"):
                 continue
@@ -72,7 +72,7 @@ def check_meta_files_consistency(self):
             if structure_name not in self.metainfo.structures:
                 self.report_error(f"`{self.meta_path / meta_file}` is not listed as a structure in `meta_info.json`")
 
-        # Check structures listed in MetaInfo have corresponding files in _meta
+        # Check structures listed in ThesaurusMetaInfo have corresponding files in _meta
         for structure in self.metainfo.structures:
             path = self.meta_path / f"{structure}.json"
             if not path.is_file():
diff --git a/web/models.py b/web/models.py
index 0236e79ca..06caddc72 100644
--- a/web/models.py
+++ b/web/models.py
@@ -38,7 +38,7 @@ def __init__(self, key, name):
             MetaStructure._cached_files[key] = self.categories
 
 
-class Language:
+class ThesaurusEntry:
     """
     Represents a programming language and knows how to fetch concepts for a
     structure key
@@ -46,7 +46,7 @@ class Language:
 
     def __init__(self, key, name):
         """
-        Initialize the Language object, which will contain concepts for a given
+        Initialize the ThesaurusEntry object, which will contain concepts for a given
         structure
 
         :param key: key of the language in the meta_info.json file
@@ -63,7 +63,7 @@ def __init__(self, key, name):
 
 
     def versions(self):
-        """Generate all versions and their paths for the Language"""
+        """Generate all versions and their paths for the ThesaurusEntry"""
         versions = dict()
         try:
             for entry in os.scandir(self.language_dir):
@@ -89,7 +89,7 @@ def __bool__(self):
 
     def load_concepts(self, structure_key, version):
         """
-        Loads the structure file into the Language object
+        Loads the structure file into the ThesaurusEntry object
 
         :param structure_key: the key for the structure to load
         :param version: the version of the language
@@ -101,12 +101,12 @@ def load_concepts(self, structure_key, version):
         self.version = version
 
     def load_filled_concepts(self, structure_key, version):
-        from web.thesaurus_template_generators import generate_language_template
+        from web.thesaurus_template_generators import generate_entry_template
         """
-        Loads the concepts from the language's structure file
+        Loads the concepts from the entry's structure file
 
         :param structure_key: the ID for the concept to load
-        :param version: the version of the language
+        :param version: the version of the entry
         :return: a dict containing the code and comment, and possibly the
             'not-implemented' flag. They are empty code entries if not specified
         :rtype: object Filled template
@@ -114,7 +114,7 @@ def load_filled_concepts(self, structure_key, version):
 
         self.load_concepts(structure_key, version)
 
-        template = generate_language_template(
+        template = generate_entry_template(
             self.key,
             structure_key,
             version
@@ -128,24 +128,24 @@ def load_filled_concepts(self, structure_key, version):
 
         return response
 
-    def load_comparison(self, structure_key, lang, version_lang, version_self):
-        lang = Language(lang, "")
+    def load_comparison(self, structure_key, entry_key, version_entry, version_self):
+        entry_obj = ThesaurusEntry(entry_key, "")
         self_filled_concept = self.load_filled_concepts(structure_key, version_self)
-        lang_filled_concept = lang.load_filled_concepts(structure_key, version_lang)
+        entry_filled_concept = entry_obj.load_filled_concepts(structure_key, version_entry)
 
-        if self_filled_concept is False or lang_filled_concept is False:
+        if self_filled_concept is False or entry_filled_concept is False:
             return False
 
         response = json.dumps({
             "meta": {
-                "language_1": self.key,
-                "language_version_1": version_self,
-                "language_2": lang.key,
-                "language_version_2": version_lang,
+                "entry_1": self.key,
+                "entry_version_1": version_self,
+                "entry_2": entry_obj.key,
+                "entry_version_2": version_entry,
                 "structure": structure_key
             },
             "concepts1": json.loads(self_filled_concept)['concepts'],
-            "concepts2": json.loads(lang_filled_concept)['concepts']
+            "concepts2": json.loads(entry_filled_concept)['concepts']
         }, indent=2)
 
         return response
@@ -154,7 +154,7 @@ def load_comparison(self, structure_key, lang, version_lang, version_self):
     def concept(self, concept_key):
         """
         Get the concept (including code and comment) from the concept file for
-        that Language
+        that ThesaurusEntry
 
         :param concept_key: key for the concept to look up
         :returns: a dict containing the code and comment, and possibly the
@@ -248,8 +248,8 @@ def has_any_implemented_in_category(self, category_concepts_keys):
         return False
 
 
-class MissingLanguageError(Exception):
-    """Error for when a requested language is not defined in `meta.json`"""
+class MissingEntryError(Exception):
+    """Error for when a requested entry is not defined in `meta.json`"""
     def __init__(self, key):
         super().__init__()
         self.key = key
@@ -257,31 +257,31 @@ def __init__(self, key):
 
 class MissingStructureError(Exception):
     """
-    Error that signals that a specific language & version does not have the structure
+    Error that signals that a specific entry & version does not have the structure
     defined
     """
-    def __init__(self, structure, language_key, language_name, language_version):
+    def __init__(self, structure, entry_key, entry_name, entry_version):
         super().__init__()
         self.structure = structure
-        self.language_key = language_key
-        self.language_name = language_name
-        self.language_version = language_version
+        self.entry_key = entry_key
+        self.entry_name = entry_name
+        self.entry_version = entry_version
 
 
-class MetaInfo:
+class ThesaurusMetaInfo:
     """Holds info about structures and languages"""
     _cached_structures = None
     _cached_languages = None
 
     def __init__(self):
         """
-        Initializes MetaInfo object with meta language information
+        Initializes ThesaurusMetaInfo object with meta language information
 
         :rtype: None
         """
-        if MetaInfo._cached_structures is not None:
-            self.structures = MetaInfo._cached_structures
-            self.languages = MetaInfo._cached_languages
+        if ThesaurusMetaInfo._cached_structures is not None:
+            self.structures = ThesaurusMetaInfo._cached_structures
+            self.languages = ThesaurusMetaInfo._cached_languages
             return
 
         meta_info_file_path = os.path.join(
@@ -290,54 +290,54 @@ def __init__(self):
             meta_info_json = json.load(meta_file)
         self.structures = meta_info_json["structures"]
         self.languages = meta_info_json["languages"]
-        MetaInfo._cached_structures = self.structures
-        MetaInfo._cached_languages = self.languages
+        ThesaurusMetaInfo._cached_structures = self.structures
+        ThesaurusMetaInfo._cached_languages = self.languages
         
 
-    def language_name(self, language_key):
+    def entry_name(self, entry_key):
         """
-        Given a structure key (from meta_info.json), returns the language's human-friendly name
+        Given a structure key (from meta_info.json), returns the entry's human-friendly name
 
-        :param language_key: key of the language located in the meta_info.json file
+        :param entry_key: key of the entry located in the meta_info.json file
         :return: string with the human-friendly name
         """
-        return self.languages[language_key]
+        return self.languages[entry_key]
 
-    def language(self, language_key):
+    def entry(self, entry_key):
         """
-        Given a language key (from meta_info.json), returns the whole
-        Language for it
+        Given a entry key (from meta_info.json), returns the whole
+        ThesaurusEntry for it
 
-        :param language_key: key of the language located in the meta_info.json
+        :param entry_key: key of the entry located in the meta_info.json
             file
-        :return: Language for the requested key
-        :rtype: Language
+        :return: ThesaurusEntry for the requested key
+        :rtype: ThesaurusEntry
         """
-        return Language(
-            language_key,
-            self.language_name(language_key),
+        return ThesaurusEntry(
+            entry_key,
+            self.entry_name(entry_key),
         )
 
 
-    def load_languages(self, language_keys_versions, meta_structure):
-        """Tries to load all languages from `language_keys` and the requested `structure`"""
-        languages = []
-        for language_key, version in language_keys_versions:
+    def load_entries(self, entry_keys_versions, meta_structure):
+        """Tries to load all entries from `entry_keys` and the requested `structure`"""
+        entries = []
+        for entry_key, version in entry_keys_versions:
             try:
-                language = self.language(language_key)
-                version = version or sorted(language.versions())[-1]
-                language.load_concepts(meta_structure.key, version)
-                languages.append(language)
+                entry = self.entry(entry_key)
+                version = version or sorted(entry.versions())[-1]
+                entry.load_concepts(meta_structure.key, version)
+                entries.append(entry)
             except FileNotFoundError as file_not_found:
                 raise MissingStructureError(
                     meta_structure,
-                    language_key,
-                    self.language_name(language_key),
+                    entry_key,
+                    self.entry_name(entry_key),
                     version,
                 ) from file_not_found
             except KeyError as key_error:
-                raise MissingLanguageError(language_key) from key_error
-        return languages
+                raise MissingEntryError(entry_key) from key_error
+        return entries
 
 
     def structure_name(self, structure_key):
diff --git a/web/tests/test_models.py b/web/tests/test_models.py
index 62d236cb6..cd7acbd86 100644
--- a/web/tests/test_models.py
+++ b/web/tests/test_models.py
@@ -3,15 +3,15 @@
 
 from django.test import TestCase
 
-from web.models import Language, MetaInfo, MetaStructure
+from web.models import ThesaurusEntry, ThesaurusMetaInfo, MetaStructure
 
 
 class TestMetaStructures(TestCase):
-    """TestCase for Language, MetaInfo and MetaStructure"""
+    """TestCase for ThesaurusEntry, ThesaurusMetaInfo and MetaStructure"""
 
     def setUp(self):
         """prepare sample data for the tests"""
-        self.metainfo = MetaInfo()
+        self.metainfo = ThesaurusMetaInfo()
         with open("web/thesauruses/meta_info.json", 'r') as meta_file:
             meta_data = json.load(meta_file)
         self.structures = meta_data["structures"]
@@ -32,18 +32,18 @@ def setUp(self):
             "concept3": {"not-implemented": "true"},
             "concept4": {"code": ["line1", "line2"]}
         }
-        language = Language(language_key, language_name)
+        language = ThesaurusEntry(language_key, language_name)
 
         # This is like the manual work of calling language.load_structure()
         language.concepts = concepts
         self.dummy_language = language
 
     def test_metainfo_structure(self):
-        """test MetaInfo creation"""
+        """test ThesaurusMetaInfo creation"""
         self.assertIsNotNone(self.metainfo)
 
     def test_metainfo_structure_name(self):
-        """test MetaInfo#name"""
+        """test ThesaurusMetaInfo#name"""
         test_key = self.metainfo.structure_name(
             self.sample["structure_key"])
 
@@ -57,15 +57,15 @@ def test_metastructure_init(self):
         self.assertIsNotNone(metastructure.categories)
 
     def test_language_init(self):
-        """test Language creation"""
-        language = Language(self.sample["language_key"], self.sample["language_name"])
+        """test ThesaurusEntry creation"""
+        language = ThesaurusEntry(self.sample["language_key"], self.sample["language_name"])
 
         self.assertIsNotNone(language)
         self.assertIsNotNone(language.key)
         self.assertIsNone(language.concepts)
 
     def test_language_bad_key_and_lang_exists(self):
-        """test Language behaviour with bad language key"""
+        """test ThesaurusEntry behaviour with bad language key"""
         language = self.dummy_language
 
         self.assertEqual(bool(language), False)
@@ -78,8 +78,8 @@ def test_language_bad_key_and_lang_exists(self):
     # if someone can think of a better solution, I'm here for it!
 
     # def test_language_has_key_and_lang_exists(self):
-    #     """test Language behaviour with good key and existing structure"""
-    #     language = Language(self.sample["language_key"])
+    #     """test ThesaurusEntry behaviour with good key and existing structure"""
+    #     language = ThesaurusEntry(self.sample["language_key"])
     #
     #     self.assertEqual(language.has_key(), True)
     #     self.assertEqual(language.lang_exists(), True)
@@ -88,7 +88,7 @@ def test_language_bad_key_and_lang_exists(self):
     #     self.assertEqual(language.has_key(), True)
 
     def test_language_get_concept(self):
-        """test concept retrieval of a Language"""
+        """test concept retrieval of a ThesaurusEntry"""
         language = self.dummy_language
         # Test unknown concept
         self.assertEqual(language.concept("12345"), dict({
@@ -118,7 +118,7 @@ def test_language_concept_unknown(self):
         self.assertEqual(language.concept_unknown("concept4"), False)
 
     def test_language_concept_implemented(self):
-        """test Language#concept_implemented"""
+        """test ThesaurusEntry#concept_implemented"""
         language = self.dummy_language
 
         # Test unknown concept
@@ -132,7 +132,7 @@ def test_language_concept_implemented(self):
         self.assertEqual(language.concept_implemented("concept4"), True)
 
     def test_language_get_concept_code(self):
-        """test Language#get_concept_code"""
+        """test ThesaurusEntry#get_concept_code"""
         language = self.dummy_language
 
         # Test unknown concept
@@ -145,15 +145,15 @@ def test_language_get_concept_code(self):
         self.assertEqual(language.concept_code("concept4"), "line1\nline2")
 
     def test_language_versions(self):
-        """test Language#versions"""
-        language = Language("python", "Python")
+        """test ThesaurusEntry#versions"""
+        language = ThesaurusEntry("python", "Python")
         versions = language.versions()
         self.assertGreater(len(versions), 0)
         self.assertIn("3", versions)
 
     def test_language_load_filled_concepts(self):
-        """test Language#load_filled_concepts"""
-        language = Language("python", "Python")
+        """test ThesaurusEntry#load_filled_concepts"""
+        language = ThesaurusEntry("python", "Python")
         # Python 3 has data_types structure
         response = language.load_filled_concepts("data_types", "3")
         response_json = json.loads(response)
@@ -164,34 +164,34 @@ def test_language_load_filled_concepts(self):
         self.assertIn("boolean", response_json["concepts"])
 
     def test_language_load_comparison(self):
-        """test Language#load_comparison"""
-        language = Language("python", "Python")
+        """test ThesaurusEntry#load_comparison"""
+        language = ThesaurusEntry("python", "Python")
         response = language.load_comparison("data_types", "javascript", "ECMAScript 2023", "3")
         response_json = json.loads(response)
-        self.assertEqual(response_json["meta"]["language_1"], "python")
-        self.assertEqual(response_json["meta"]["language_2"], "javascript")
+        self.assertEqual(response_json["meta"]["entry_1"], "python")
+        self.assertEqual(response_json["meta"]["entry_2"], "javascript")
         self.assertIn("concepts1", response_json)
         self.assertIn("concepts2", response_json)
 
-    def test_metainfo_language_methods(self):
-        """test MetaInfo language related methods"""
-        self.assertEqual(self.metainfo.language_name("python"), "Python")
-        lang = self.metainfo.language("python")
-        self.assertIsInstance(lang, Language)
+    def test_metainfo_entry_methods(self):
+        """test ThesaurusMetaInfo entry related methods"""
+        self.assertEqual(self.metainfo.entry_name("python"), "Python")
+        lang = self.metainfo.entry("python")
+        self.assertIsInstance(lang, ThesaurusEntry)
         self.assertEqual(lang.key, "python")
 
-    def test_metainfo_load_languages(self):
-        """test MetaInfo#load_languages"""
+    def test_metainfo_load_entries(self):
+        """test ThesaurusMetaInfo#load_entries"""
         structure = self.metainfo.structure("data_types")
-        langs = self.metainfo.load_languages([("python", "3"), ("javascript", "ECMAScript 2023")], structure)
+        langs = self.metainfo.load_entries([("python", "3"), ("javascript", "ECMAScript 2023")], structure)
         self.assertEqual(len(langs), 2)
         self.assertEqual(langs[0].key, "python")
         self.assertEqual(langs[1].key, "javascript")
 
-    def test_metainfo_load_languages_missing_structure(self):
-        """test MetaInfo#load_languages with missing structure"""
+    def test_metainfo_load_entries_missing_structure(self):
+        """test ThesaurusMetaInfo#load_entries with missing structure"""
         from web.models import MissingStructureError
         structure = self.metainfo.structure("data_types")
         with self.assertRaises(MissingStructureError):
             # python 3 definitely has data_types, but let's try something that doesn't exist
-            self.metainfo.load_languages([("python", "non_existent_version")], structure)
+            self.metainfo.load_entries([("python", "non_existent_version")], structure)
diff --git a/web/tests/test_views.py b/web/tests/test_views.py
index 39c810b12..324e2aec8 100644
--- a/web/tests/test_views.py
+++ b/web/tests/test_views.py
@@ -294,8 +294,8 @@ def test_api_compare_valid(self):
         self.assertIn('meta', response_data)
         self.assertIn('concepts1', response_data)
         self.assertIn('concepts2', response_data)
-        self.assertEqual(response_data['meta']['language_1'], 'python')
-        self.assertEqual(response_data['meta']['language_2'], 'javascript')
+        self.assertEqual(response_data['meta']['entry_1'], 'python')
+        self.assertEqual(response_data['meta']['entry_2'], 'javascript')
 
     def test_concepts_view_valid_params(self):
         """Test concepts view with valid parameters that should return 200"""
diff --git a/web/thesaurus_template_generators.py b/web/thesaurus_template_generators.py
index 1b73f12e0..a5faeff3f 100644
--- a/web/thesaurus_template_generators.py
+++ b/web/thesaurus_template_generators.py
@@ -1,20 +1,20 @@
 """Generator functions for thesaurus files"""
 import json
-from web.models import MetaInfo
+from web.models import ThesaurusMetaInfo
 
 
-def generate_language_template(language_key, structure_key, version=None):
-    """Generate a template for the given language and structure"""
-    meta_info = MetaInfo()
+def generate_entry_template(entry_key, structure_key, version=None):
+    """Generate a template for the given entry and structure"""
+    meta_info = ThesaurusMetaInfo()
     if structure_key not in meta_info.structures:
         raise ValueError
-    language_name = meta_info.languages.get(
-        language_key,
-        'Human-Readable Language Name'
+    entry_name = meta_info.languages.get(
+        entry_key,
+        'Human-Readable Name'
     )
     meta = {
-        'language': language_key,
-        'language_name': language_name,
+        'language': entry_key,
+        'language_name': entry_name,
         'structure': structure_key,
     }
 
diff --git a/web/views.py b/web/views.py
index 39100fab0..373bafb06 100644
--- a/web/views.py
+++ b/web/views.py
@@ -22,15 +22,15 @@
 
 from codethesaurus.settings import BASE_DIR
 from web.models import (
-    Language,
+    ThesaurusEntry,
     LookupData,
-    MetaInfo,
-    MissingLanguageError,
+    ThesaurusMetaInfo,
+    MissingEntryError,
     MissingLookup,
     MissingStructureError,
     SiteVisit,
 )
-from web.thesaurus_template_generators import generate_language_template
+from web.thesaurus_template_generators import generate_entry_template
 
 
 def store_url_info(request):
@@ -105,40 +105,40 @@ def index(request):
     if "lang" in request.GET and "concept" in request.GET:
         return concepts(request)
 
-    meta_info = MetaInfo()
+    meta_info = ThesaurusMetaInfo()
 
-    meta_data_langs = dict()
+    meta_data_entries = dict()
     for key in meta_info.languages:
-        lang = meta_info.language(key)
-        meta_data_langs[key] = [{
-            "name": lang.name,
+        entry = meta_info.entry(key)
+        meta_data_entries[key] = [{
+            "name": entry.name,
             "version": version,
             "availStructs": []
-        } for version in lang.versions()]
+        } for version in entry.versions()]
 
-    random_langs = random.sample(list(meta_data_langs.values()), k=3)
+    random_entries = random.sample(list(meta_data_entries.values()), k=3)
 
     thesauruses_dir = os.path.join(BASE_DIR, 'web', 'thesauruses')
     meta_dir = os.path.join(thesauruses_dir, '_meta')
     meta_concepts = os.listdir(meta_dir)
-    for lang in os.listdir(thesauruses_dir):
-        if 'meta' in lang:
+    for entry_dir in os.listdir(thesauruses_dir):
+        if 'meta' in entry_dir:
             continue
-        for ver in os.listdir(os.path.join(thesauruses_dir, lang)):
+        for ver in os.listdir(os.path.join(thesauruses_dir, entry_dir)):
             for concept_json in meta_concepts:
                 concept_name = concept_json.split('.')[0]
-                if os.path.isdir(os.path.join(thesauruses_dir, lang, ver)):
-                    if concept_json in os.listdir(os.path.join(thesauruses_dir, lang, ver)):
-                        for i in meta_data_langs[lang]:
+                if os.path.isdir(os.path.join(thesauruses_dir, entry_dir, ver)):
+                    if concept_json in os.listdir(os.path.join(thesauruses_dir, entry_dir, ver)):
+                        for i in meta_data_entries[entry_dir]:
                             if i['version'] == ver:
                                 i['availStructs'].append(concept_name)
                                 break
 
     content = {
         'title': 'Welcome',
-        'languages': meta_data_langs,
+        'languages': meta_data_entries,
         'structures': meta_info.structures,
-        'randomLanguages': random_langs,
+        'randomLanguages': random_entries,
         'description': 'Code Thesaurus: A polyglot developer reference tool'
     }
     return render(request, 'index.html', content)
@@ -154,7 +154,7 @@ def statistics(request):
     """
     store_url_info(request)
 
-    meta_info = MetaInfo()
+    meta_info = ThesaurusMetaInfo()
 
     # Most popular languages (considering both language1 and language2)
     # We need to aggregate counts for each language across both fields.
@@ -174,8 +174,8 @@ def statistics(request):
     popular_languages = []
     for lang_key, count in sorted_langs[:10]:
         try:
-            name = meta_info.language_name(lang_key)
-        except (KeyError, MissingLanguageError):
+            name = meta_info.entry_name(lang_key)
+        except (KeyError, MissingEntryError):
             name = lang_key
         popular_languages.append({'name': name, 'count': count})
 
@@ -196,12 +196,12 @@ def statistics(request):
     popular_comparisons = []
     for item in comparison_counts:
         try:
-            name1 = meta_info.language_name(item['language1'])
-        except (KeyError, MissingLanguageError):
+            name1 = meta_info.entry_name(item['language1'])
+        except (KeyError, MissingEntryError):
             name1 = item['language1']
         try:
-            name2 = meta_info.language_name(item['language2'])
-        except (KeyError, MissingLanguageError):
+            name2 = meta_info.entry_name(item['language2'])
+        except (KeyError, MissingEntryError):
             name2 = item['language2']
         popular_comparisons.append({'lang1': name1, 'lang2': name2, 'count': item['count']})
 
@@ -229,8 +229,8 @@ def statistics(request):
     popular_concept_langs = []
     for (lang_key, struct_key), count in sorted_concept_langs[:10]:
         try:
-            lang_name = meta_info.language_name(lang_key)
-        except (KeyError, MissingLanguageError):
+            lang_name = meta_info.entry_name(lang_key)
+        except (KeyError, MissingEntryError):
             lang_name = lang_key
         try:
             struct_name = meta_info.structure_name(struct_key)
@@ -248,12 +248,12 @@ def statistics(request):
     recent_lookups = []
     for item in recent_lookups_query:
         try:
-            name1 = meta_info.language_name(item.language1)
-        except (KeyError, MissingLanguageError):
+            name1 = meta_info.entry_name(item.language1)
+        except (KeyError, MissingEntryError):
             name1 = item.language1
         try:
-            name2 = meta_info.language_name(item.language2) if item.language2 else None
-        except (KeyError, MissingLanguageError):
+            name2 = meta_info.entry_name(item.language2) if item.language2 else None
+        except (KeyError, MissingEntryError):
             name2 = item.language2
         
         try:
@@ -276,17 +276,17 @@ def statistics(request):
     for item in missing_items_counts:
         label = item['item_value']
         if item['item_type'] == 'language':
-            label = f"Language: {item['item_value']}"
+            label = f"ThesaurusEntry: {item['item_value']}"
         elif item['item_type'] == 'structure':
             try:
-                lang_name = meta_info.language_name(item['language_context'])
-            except (KeyError, MissingLanguageError):
+                lang_name = meta_info.entry_name(item['language_context'])
+            except (KeyError, MissingEntryError):
                 lang_name = item['language_context']
             label = f"Structure: {item['item_value']} (for {lang_name})"
         elif item['item_type'] == 'concept':
             try:
-                lang_name = meta_info.language_name(item['language_context'])
-            except (KeyError, MissingLanguageError):
+                lang_name = meta_info.entry_name(item['language_context'])
+            except (KeyError, MissingEntryError):
                 lang_name = item['language_context']
             label = f"Concept: {item['item_value']} (missing in {lang_name})"
         
@@ -348,7 +348,7 @@ def concepts(request):
     if errors:
         return render_errors(request, errors)
 
-    meta_info = MetaInfo()
+    meta_info = ThesaurusMetaInfo()
     try:
         meta_structure = meta_info.structure(structure_key)
     except KeyError:
@@ -356,7 +356,7 @@ def concepts(request):
                 Double-check your URL and try again."])
 
     try:
-        languages = meta_info.load_languages(language_strings, meta_structure)
+        entries = meta_info.load_entries(language_strings, meta_structure)
     except MissingStructureError as missing_structure:
         store_missing_info(
             visit,
@@ -373,16 +373,16 @@ def concepts(request):
                 "lang": missing_structure.language_key,
                 "lang_name": missing_structure.language_name,
                 "version": missing_structure.language_version,
-                "template": generate_language_template(
+                "template": generate_entry_template(
                     missing_structure.language_key,
                     missing_structure.structure.key,
                     missing_structure.language_version
                 )
             }
         ))
-    except MissingLanguageError as missing_language:
-        store_missing_info(visit, 'language', missing_language.key)
-        errors.append(f"The language \"{missing_language.key}\" isn't valid. \
+    except MissingEntryError as missing_entry:
+        store_missing_info(visit, 'language', missing_entry.key)
+        errors.append(f"The entry \"{missing_entry.key}\" isn't valid. \
                         Double-check your URL and try again.")
 
     if errors:
@@ -391,19 +391,19 @@ def concepts(request):
     store_lookup_info(
         request,
         visit,
-        languages[0].key,
-        languages[0].version,
-        languages[1].key if len(languages) > 1 else "",
-        languages[1].version if len(languages) > 1 else "",
+        entries[0].key,
+        entries[0].version,
+        entries[1].key if len(entries) > 1 else "",
+        entries[1].version if len(entries) > 1 else "",
         meta_structure.key
     )
 
-    lexers = [get_highlighter(lang.key) for lang in languages]
+    lexers = [get_highlighter(entry.key) for entry in entries]
     all_categories = []
 
     for (category_key, category) in meta_structure.categories.items():
         concept_keys = list(category.keys())
-        concepts_list = [concepts_data(key, name, languages, lexers, visit) for (key, name) in category.items()]
+        concepts_list = [concepts_data(key, name, entries, lexers, visit) for (key, name) in category.items()]
 
         category_entry = {
             "key": category_key,
@@ -411,35 +411,35 @@ def concepts(request):
             "is_incomplete": []
         }
 
-        for lang in languages:
+        for entry in entries:
             is_incomplete = False
             # If nothing in this category is implemented for this language
-            if not lang.has_any_implemented_in_category(concept_keys):
+            if not entry.has_any_implemented_in_category(concept_keys):
                 is_incomplete = True
             # OR if at least one concept is missing code/comment
-            elif lang.is_category_incomplete(concept_keys):
+            elif entry.is_category_incomplete(concept_keys):
                 is_incomplete = True
             
             category_entry["is_incomplete"].append(is_incomplete)
             
         all_categories.append(category_entry)
 
-    for i, lang in enumerate(languages):
-        lang._is_incomplete = any(cat["is_incomplete"][i] for cat in all_categories)
+    for i, entry in enumerate(entries):
+        entry._is_incomplete = any(cat["is_incomplete"][i] for cat in all_categories)
 
-    return render_concepts(request, languages, meta_structure, all_categories)
+    return render_concepts(request, entries, meta_structure, all_categories)
 
 
 @require_http_methods(['GET'])
-def render_concepts(request, languages, structure, all_categories):
-    """Renders the `structure` page for all `languages`"""
+def render_concepts(request, entries, structure, all_categories):
+    """Renders the `structure` page for all `entries`"""
 
-    language_name_versions = [f"{l.name} ({l.version})" for l in languages]
-    if len(languages) == 1:
-        title = f"Reference for {language_name_versions[0]}"
+    entry_name_versions = [f"{l.name} ({l.version})" for l in entries]
+    if len(entries) == 1:
+        title = f"Reference for {entry_name_versions[0]}"
     else:
-        title = f"Comparing {', '.join(language_name_versions[:-1])}\
-                and {language_name_versions[-1]}"
+        title = f"Comparing {', '.join(entry_name_versions[:-1])}\
+                and {entry_name_versions[-1]}"
 
 
     response = {
@@ -448,12 +448,12 @@ def render_concepts(request, languages, structure, all_categories):
         "concept_name": structure.name,
         "languages": [
             {
-                "key": language.key,
-                "version": language.version,
-                "name": language.name,
-                "is_incomplete": language._is_incomplete,
+                "key": entry.key,
+                "version": entry.version,
+                "name": entry.name,
+                "is_incomplete": entry._is_incomplete,
             }
-            for language in languages
+            for entry in entries
         ],
         "categories": all_categories,
         "description": f"Code Thesaurus: {title}"
@@ -524,75 +524,75 @@ def error_handler_500_server_error(request):
     return HttpResponseServerError(response)
 
 #get lexer 
-def get_highlighter(language):
+def get_highlighter(entry_key):
     SIMILAR_LEXERS = settings.SIMILAR_LEXERS
     try:
-        lexer = get_lexer_by_name(language, startinline=True)
+        lexer = get_lexer_by_name(entry_key, startinline=True)
     except ClassNotFound:
-        lexer = get_lexer_by_name(SIMILAR_LEXERS.get(language, "text"), startinline=True)
+        lexer = get_lexer_by_name(SIMILAR_LEXERS.get(entry_key, "text"), startinline=True)
     return lexer
 
 # Helper functions
-def format_code_for_display(concept_key, lang, lexer=None):
+def format_code_for_display(concept_key, entry, lexer=None):
     """
     Returns the formatted HTML formatted syntax-highlighted text for a concept key (from a meta
-            language file) and a language
+            thesaurus file) and an entry
 
     :param concept_key: name of the key to format
-    :param lang: language to format it (in meta language/syntax highlighter format)
+    :param entry: entry to format it (in meta entry/syntax highlighter format)
     :param lexer: optional pre-fetched lexer
     :return: string with code with applied HTML formatting
     """
 
-    if lang.concept_unknown(concept_key) or lang.concept_code(concept_key) is None:
+    if entry.concept_unknown(concept_key) or entry.concept_code(concept_key) is None:
         return "Unknown"
-    if lang.concept_implemented(concept_key):
+    if entry.concept_implemented(concept_key):
         if lexer is None:
-            lexer = get_highlighter(lang.key)
+            lexer = get_highlighter(entry.key)
         return highlight(
-            lang.concept_code(concept_key),
+            entry.concept_code(concept_key),
             lexer,
             HtmlFormatter()
         )
     return None
 
 
-def format_comment_for_display(concept_key, lang):
+def format_comment_for_display(concept_key, entry):
     """
-    Returns the formatted HTML formatted comment text for a concept key (from a meta language
-            file) and a language
+    Returns the formatted HTML formatted comment text for a concept key (from a meta thesaurus
+            file) and an entry
 
-    :param concept_key: the concept key located in the meta language JSON file
-    :param lang: the key of the language to fetch concept key from
+    :param concept_key: the concept key located in the meta thesaurus JSON file
+    :param entry: the entry to fetch concept key from
     :return: formatted HTML for the comment
     """
-    if not lang.concept_implemented(concept_key) and lang.concept_comment(concept_key) == "":
-        return "Not Implemented In This Language"
-    return lang.concept_comment(concept_key)
+    if not entry.concept_implemented(concept_key) and entry.concept_comment(concept_key) == "":
+        return "Not Implemented"
+    return entry.concept_comment(concept_key)
 
 
-def concepts_data(key, name, languages, lexers=None, visit=None):
+def concepts_data(key, name, entries, lexers=None, visit=None):
     """
-    Generates the comparision object of a single concept
+    Generates the comparison object of a single concept
 
     :param key: key of the concept
     :param name: name of the concept
-    :param languages: list of languages to compare / get a reference for
-    :param lexers: optional list of pre-fetched lexers corresponding to languages
+    :param entries: list of entries to compare / get a reference for
+    :param lexers: optional list of pre-fetched lexers corresponding to entries
     :param visit: optional SiteVisit for logging missing items
-    :return: string with code with applied HTML formatting
+    :return: dict with code and comment for each entry
     """
     data = []
-    for i, lang in enumerate(languages):
+    for i, entry in enumerate(entries):
         lexer = lexers[i] if lexers else None
         
         # Log if concept is not implemented
-        if visit and not lang.concept_implemented(key):
-            store_missing_info(visit, 'concept', key, lang.key)
+        if visit and not entry.concept_implemented(key):
+            store_missing_info(visit, 'concept', key, entry.key)
             
         data.append({
-            "code": format_code_for_display(key, lang, lexer),
-            "comment": format_comment_for_display(key, lang)
+            "code": format_code_for_display(key, entry, lexer),
+            "comment": format_comment_for_display(key, entry)
         })
 
     return {
@@ -653,14 +653,14 @@ def api_reference(request, structure_key, lang, version):
     """
     visit = store_url_info(request)
 
-    lang_obj = Language(lang, "")
+    entry_obj = ThesaurusEntry(lang, "")
 
     try:
-        response = lang_obj.load_filled_concepts(structure_key, version)
+        response = entry_obj.load_filled_concepts(structure_key, version)
     except Exception as e:
         # Determine if it's a language or structure issue
-        # If Language(lang, "") failed to find versions, it might be a language issue
-        if not lang_obj.versions():
+        # If ThesaurusEntry(lang, "") failed to find versions, it might be a language issue
+        if not entry_obj.versions():
             store_missing_info(visit, 'language', lang)
         else:
             store_missing_info(visit, 'structure', structure_key, lang)
@@ -697,7 +697,7 @@ def api_compare(request, structure_key, lang1, version1, lang2, version2):
     visit = store_url_info(request)
 
     try:
-        response = Language(lang1, "").load_comparison(structure_key, lang2, version2, version1)
+        response = ThesaurusEntry(lang1, "").load_comparison(structure_key, lang2, version2, version1)
     except Exception:
         # Simple logging for now
         store_missing_info(visit, 'structure', structure_key, f"{lang1}/{lang2}")

From 393f014cb63de99e2fd11cbd2c5bc2f895c225fd Mon Sep 17 00:00:00 2001
From: Sarah Withee <2601974+geekygirlsarah@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:35:58 -0500
Subject: [PATCH 02/15] (wip) Move language files to a langs/ directory

---
 .../{ => langs}/ada/2012/classes.json         |   0
 .../ada/2012/control_structures.json          |   0
 .../{ => langs}/ada/2012/data_types.json      |   0
 .../{ => langs}/ada/2012/functions.json       |   0
 .../{ => langs}/ada/2012/lists.json           |   0
 .../{ => langs}/ada/2012/operators.json       |   0
 .../{ => langs}/bash/3/classes.json           |   0
 .../bash/3/control_structures.json            |   0
 .../{ => langs}/bash/3/data_types.json        |   0
 .../{ => langs}/bash/3/functions.json         |   0
 .../{ => langs}/bash/3/operators.json         |   0
 .../{ => langs}/bash/5/classes.json           |   0
 .../bash/5/control_structures.json            |   0
 .../{ => langs}/bash/5/data_types.json        |   0
 .../{ => langs}/bash/5/functions.json         |   0
 .../{ => langs}/bash/5/operators.json         |   0
 web/thesauruses/{ => langs}/c/17/classes.json |   0
 .../{ => langs}/c/17/control_structures.json  |   0
 .../{ => langs}/c/17/data_types.json          |   0
 .../{ => langs}/c/17/functions.json           |   0
 web/thesauruses/{ => langs}/c/17/io.json      |   0
 .../{ => langs}/c/17/operators.json           |   0
 web/thesauruses/{ => langs}/c/17/strings.json |   0
 .../{ => langs}/clips/641/rules_facts.json    |   0
 .../{ => langs}/clojure/1/data_types.json     |   0
 .../{ => langs}/clojure/1/functions.json      |   0
 .../{ => langs}/clojure/1/operators.json      |   0
 .../{ => langs}/cpp/C++17/classes.json        |   0
 .../cpp/C++17/control_structures.json         |   0
 .../{ => langs}/cpp/C++17/data_types.json     |   0
 .../{ => langs}/cpp/C++17/functions.json      |   0
 .../{ => langs}/cpp/C++17/operators.json      |   0
 .../{ => langs}/cpp/C++17/strings.json        |   0
 .../{ => langs}/cpp/C++20/classes.json        |   0
 .../cpp/C++20/control_structures.json         |   0
 .../{ => langs}/cpp/C++20/data_types.json     |   0
 .../{ => langs}/cpp/C++20/functions.json      |   0
 web/thesauruses/{ => langs}/cpp/C++20/io.json |   0
 .../{ => langs}/cpp/C++20/operators.json      |   0
 .../{ => langs}/csharp/9/classes.json         |   0
 .../csharp/9/control_structures.json          |   0
 .../{ => langs}/csharp/9/data_types.json      |   0
 .../csharp/9/exception_handling.json          |   0
 .../{ => langs}/csharp/9/functions.json       |   0
 .../{ => langs}/csharp/9/lists.json           |   0
 .../{ => langs}/csharp/9/operators.json       |   0
 .../{ => langs}/csharp/9/queues_stacks.json   |   0
 .../{ => langs}/csharp/9/strings.json         |   0
 .../{ => langs}/go/1/control_structures.json  |   0
 .../{ => langs}/go/1/data_types.json          |   0
 .../{ => langs}/go/1/functions.json           |   0
 web/thesauruses/{ => langs}/go/1/lists.json   |   0
 .../{ => langs}/go/1/operators.json           |   0
 web/thesauruses/{ => langs}/go/1/strings.json |   0
 .../{ => langs}/haskell/2010/classes.json     |   0
 .../haskell/2010/control_structures.json      |   0
 .../{ => langs}/haskell/2010/data_types.json  |   0
 .../{ => langs}/haskell/2010/functions.json   |   0
 .../{ => langs}/haskell/2010/lists.json       |   0
 .../{ => langs}/haskell/2010/operators.json   |   0
 .../{ => langs}/haskell/2010/strings.json     |   0
 .../{ => langs}/java/11/classes.json          |   0
 .../java/11/control_structures.json           |   0
 .../{ => langs}/java/11/data_types.json       |   0
 .../java/11/exception_handling.json           |   0
 .../{ => langs}/java/11/functions.json        |   0
 .../{ => langs}/java/11/lists.json            |   0
 .../{ => langs}/java/11/operators.json        |   0
 .../{ => langs}/java/11/strings.json          |   0
 .../{ => langs}/java/15/classes.json          |   0
 .../java/15/control_structures.json           |   0
 .../{ => langs}/java/15/data_types.json       |   0
 .../java/15/exception_handling.json           |   0
 .../{ => langs}/java/15/functions.json        |   0
 .../{ => langs}/java/15/lists.json            |   0
 .../{ => langs}/java/15/operators.json        |   0
 .../{ => langs}/java/15/strings.json          |   0
 .../{ => langs}/java/17/classes.json          |   0
 .../java/17/control_structures.json           |   0
 .../{ => langs}/java/17/data_types.json       |   0
 .../java/17/exception_handling.json           |   0
 .../{ => langs}/java/17/functions.json        |   0
 .../{ => langs}/java/17/lists.json            |   0
 .../{ => langs}/java/17/operators.json        |   0
 .../{ => langs}/java/17/strings.json          |   0
 .../javascript/ECMAScript 2009/classes.json   |   0
 .../ECMAScript 2009/control_structures.json   |   0
 .../ECMAScript 2009/data_types.json           |   0
 .../ECMAScript 2009/exception_handling.json   |   0
 .../javascript/ECMAScript 2009/functions.json |   0
 .../javascript/ECMAScript 2009/io.json        |   0
 .../javascript/ECMAScript 2009/lists.json     |   0
 .../javascript/ECMAScript 2009/operators.json |   0
 .../ECMAScript 2009/queues_stacks.json        |   0
 .../javascript/ECMAScript 2009/strings.json   |   0
 .../javascript/ECMAScript 2020/classes.json   |   0
 .../ECMAScript 2020/control_structures.json   |   0
 .../ECMAScript 2020/data_types.json           |   0
 .../ECMAScript 2020/exception_handling.json   |   0
 .../javascript/ECMAScript 2020/functions.json |   0
 .../javascript/ECMAScript 2020/io.json        |   0
 .../javascript/ECMAScript 2020/lists.json     |   0
 .../javascript/ECMAScript 2020/operators.json |   0
 .../ECMAScript 2020/queues_stacks.json        |   0
 .../javascript/ECMAScript 2020/strings.json   |   0
 .../javascript/ECMAScript 2021/classes.json   |   0
 .../ECMAScript 2021/control_structures.json   |   0
 .../ECMAScript 2021/data_types.json           |   0
 .../ECMAScript 2021/exception_handling.json   |   0
 .../javascript/ECMAScript 2021/functions.json |   0
 .../javascript/ECMAScript 2021/io.json        |   0
 .../javascript/ECMAScript 2021/lists.json     |   0
 .../javascript/ECMAScript 2021/operators.json |   0
 .../ECMAScript 2021/queues_stacks.json        |   0
 .../javascript/ECMAScript 2021/strings.json   |   0
 .../javascript/ECMAScript 2023/classes.json   |   0
 .../ECMAScript 2023/control_structures.json   |   0
 .../ECMAScript 2023/data_types.json           |   0
 .../ECMAScript 2023/exception_handling.json   |   0
 .../javascript/ECMAScript 2023/functions.json |   0
 .../javascript/ECMAScript 2023/io.json        |   0
 .../javascript/ECMAScript 2023/lists.json     |   0
 .../javascript/ECMAScript 2023/operators.json |   0
 .../ECMAScript 2023/queues_stacks.json        |   0
 .../javascript/ECMAScript 2023/strings.json   |   0
 .../{ => langs}/kotlin/1.5/classes.json       |   0
 .../kotlin/1.5/control_structures.json        |   0
 .../{ => langs}/kotlin/1.5/data_types.json    |   0
 .../{ => langs}/kotlin/1.5/functions.json     |   0
 .../{ => langs}/kotlin/1.5/io.json            |   0
 .../{ => langs}/kotlin/1.5/lists.json         |   0
 .../{ => langs}/kotlin/1.5/operators.json     |   0
 .../{ => langs}/kotlin/1.5/queues_stacks.json |   0
 .../{ => langs}/kotlin/1.5/strings.json       |   0
 .../{ => langs}/lua/5/control_structures.json |   0
 .../{ => langs}/lua/5/data_types.json         | 240 +++----
 .../{ => langs}/lua/5/functions.json          | 212 +++---
 .../{ => langs}/lua/5/operators.json          | 486 +++++++-------
 .../{ => langs}/lua/5/queues_stacks.json      | 622 +++++++++---------
 .../{ => langs}/lua/5/strings.json            | 572 ++++++++--------
 .../{ => langs}/nim/1/classes.json            |   0
 .../{ => langs}/nim/1/control_structures.json |   0
 .../{ => langs}/nim/1/data_types.json         |   0
 .../{ => langs}/nim/1/exception_handling.json |   0
 .../{ => langs}/nim/1/functions.json          |   0
 web/thesauruses/{ => langs}/nim/1/lists.json  |   0
 .../{ => langs}/nim/1/operators.json          |   0
 .../objectivec/2/control_structures.json      |   0
 .../{ => langs}/objectivec/2/data_types.json  |   0
 .../{ => langs}/objectivec/2/functions.json   |   0
 .../{ => langs}/objectivec/2/lists.json       |   0
 .../{ => langs}/objectivec/2/operators.json   |   0
 .../objectivec/2/queues_stacks.json           |   0
 .../perl/5/control_structures.json            |   0
 .../{ => langs}/perl/5/data_types.json        |   0
 .../{ => langs}/perl/5/operators.json         |   0
 .../{ => langs}/php/7/classes.json            |   0
 .../{ => langs}/php/7/control_structures.json |   0
 .../{ => langs}/php/7/data_types.json         |   0
 .../{ => langs}/php/7/exception_handling.json |   0
 .../{ => langs}/php/7/functions.json          |   0
 web/thesauruses/{ => langs}/php/7/lists.json  |   0
 .../{ => langs}/php/7/operators.json          |   0
 .../{ => langs}/php/8/classes.json            |   0
 .../{ => langs}/php/8/control_structures.json |   0
 .../{ => langs}/php/8/data_types.json         |   0
 .../{ => langs}/php/8/exception_handling.json |   0
 .../{ => langs}/php/8/functions.json          |   0
 web/thesauruses/{ => langs}/php/8/lists.json  |   0
 .../{ => langs}/php/8/operators.json          |   0
 .../{ => langs}/php/8/queues_stacks.json      |   0
 .../{ => langs}/powershell/7/classes.json     |   0
 .../powershell/7/control_structures.json      |   0
 .../{ => langs}/powershell/7/data_types.json  |   0
 .../{ => langs}/python/3/classes.json         |   0
 .../python/3/control_structures.json          |   0
 .../{ => langs}/python/3/data_types.json      |   0
 .../python/3/exception_handling.json          |   0
 .../{ => langs}/python/3/functions.json       |   0
 web/thesauruses/{ => langs}/python/3/io.json  |   0
 .../{ => langs}/python/3/lists.json           |   0
 .../{ => langs}/python/3/operators.json       |   0
 .../{ => langs}/python/3/queues_stacks.json   |   0
 .../{ => langs}/python/3/strings.json         |   0
 web/thesauruses/{ => langs}/r/4/classes.json  |   0
 .../{ => langs}/r/4/data_types.json           |   0
 web/thesauruses/{ => langs}/r/4/io.json       |   0
 web/thesauruses/{ => langs}/r/4/lists.json    |   0
 .../{ => langs}/r/4/operators.json            |   0
 .../{ => langs}/ruby/3/classes.json           |   0
 .../ruby/3/control_structures.json            |   0
 .../{ => langs}/ruby/3/data_types.json        |   0
 .../ruby/3/exception_handling.json            |   0
 .../{ => langs}/ruby/3/functions.json         |   0
 web/thesauruses/{ => langs}/ruby/3/lists.json |   0
 .../{ => langs}/ruby/3/strings.json           |   0
 .../rust/1/control_structures.json            |   0
 .../{ => langs}/rust/1/data_types.json        |   0
 .../{ => langs}/rust/1/functions.json         |   0
 .../{ => langs}/rust/1/operators.json         |   0
 .../{ => langs}/rust/1/queues_stacks.json     |   0
 .../{ => langs}/rust/1/strings.json           |   0
 .../scala/2/control_structures.json           |   0
 .../{ => langs}/scala/2/data_types.json       |   0
 .../{ => langs}/scala/2/functions.json        |   0
 .../{ => langs}/scala/2/operators.json        |   0
 .../{ => langs}/swift/5/classes.json          |   0
 .../swift/5/control_structures.json           |   0
 .../{ => langs}/swift/5/data_types.json       |   0
 .../{ => langs}/swift/5/functions.json        |   0
 .../{ => langs}/swift/5/lists.json            |   0
 .../{ => langs}/swift/5/operators.json        |   0
 .../{ => langs}/swift/5/strings.json          |   0
 .../{ => langs}/typescript/4/classes.json     |   0
 .../typescript/4/control_structures.json      |   0
 .../{ => langs}/typescript/4/data_types.json  |   0
 .../typescript/4/exception_handling.json      |   0
 .../{ => langs}/typescript/4/functions.json   |   0
 .../{ => langs}/typescript/4/lists.json       |   0
 .../{ => langs}/typescript/4/operators.json   |   0
 .../typescript/4/queues_stacks.json           |   0
 .../{ => langs}/typescript/4/strings.json     |   0
 .../{ => langs}/vbnet/16/classes.json         |   0
 .../vbnet/16/control_structures.json          |   0
 .../{ => langs}/vbnet/16/data_types.json      |   0
 .../{ => langs}/vbnet/16/functions.json       |   0
 .../{ => langs}/vbnet/16/lists.json           |   0
 .../{ => langs}/vbnet/16/operators.json       |   0
 .../{ => langs}/vbnet/16/strings.json         |   0
 229 files changed, 1066 insertions(+), 1066 deletions(-)
 rename web/thesauruses/{ => langs}/ada/2012/classes.json (100%)
 rename web/thesauruses/{ => langs}/ada/2012/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/ada/2012/data_types.json (100%)
 rename web/thesauruses/{ => langs}/ada/2012/functions.json (100%)
 rename web/thesauruses/{ => langs}/ada/2012/lists.json (100%)
 rename web/thesauruses/{ => langs}/ada/2012/operators.json (100%)
 rename web/thesauruses/{ => langs}/bash/3/classes.json (100%)
 rename web/thesauruses/{ => langs}/bash/3/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/bash/3/data_types.json (100%)
 rename web/thesauruses/{ => langs}/bash/3/functions.json (100%)
 rename web/thesauruses/{ => langs}/bash/3/operators.json (100%)
 rename web/thesauruses/{ => langs}/bash/5/classes.json (100%)
 rename web/thesauruses/{ => langs}/bash/5/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/bash/5/data_types.json (100%)
 rename web/thesauruses/{ => langs}/bash/5/functions.json (100%)
 rename web/thesauruses/{ => langs}/bash/5/operators.json (100%)
 rename web/thesauruses/{ => langs}/c/17/classes.json (100%)
 rename web/thesauruses/{ => langs}/c/17/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/c/17/data_types.json (100%)
 rename web/thesauruses/{ => langs}/c/17/functions.json (100%)
 rename web/thesauruses/{ => langs}/c/17/io.json (100%)
 rename web/thesauruses/{ => langs}/c/17/operators.json (100%)
 rename web/thesauruses/{ => langs}/c/17/strings.json (100%)
 rename web/thesauruses/{ => langs}/clips/641/rules_facts.json (100%)
 rename web/thesauruses/{ => langs}/clojure/1/data_types.json (100%)
 rename web/thesauruses/{ => langs}/clojure/1/functions.json (100%)
 rename web/thesauruses/{ => langs}/clojure/1/operators.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++17/classes.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++17/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++17/data_types.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++17/functions.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++17/operators.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++17/strings.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++20/classes.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++20/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++20/data_types.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++20/functions.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++20/io.json (100%)
 rename web/thesauruses/{ => langs}/cpp/C++20/operators.json (100%)
 rename web/thesauruses/{ => langs}/csharp/9/classes.json (100%)
 rename web/thesauruses/{ => langs}/csharp/9/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/csharp/9/data_types.json (100%)
 rename web/thesauruses/{ => langs}/csharp/9/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/csharp/9/functions.json (100%)
 rename web/thesauruses/{ => langs}/csharp/9/lists.json (100%)
 rename web/thesauruses/{ => langs}/csharp/9/operators.json (100%)
 rename web/thesauruses/{ => langs}/csharp/9/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/csharp/9/strings.json (100%)
 rename web/thesauruses/{ => langs}/go/1/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/go/1/data_types.json (100%)
 rename web/thesauruses/{ => langs}/go/1/functions.json (100%)
 rename web/thesauruses/{ => langs}/go/1/lists.json (100%)
 rename web/thesauruses/{ => langs}/go/1/operators.json (100%)
 rename web/thesauruses/{ => langs}/go/1/strings.json (100%)
 rename web/thesauruses/{ => langs}/haskell/2010/classes.json (100%)
 rename web/thesauruses/{ => langs}/haskell/2010/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/haskell/2010/data_types.json (100%)
 rename web/thesauruses/{ => langs}/haskell/2010/functions.json (100%)
 rename web/thesauruses/{ => langs}/haskell/2010/lists.json (100%)
 rename web/thesauruses/{ => langs}/haskell/2010/operators.json (100%)
 rename web/thesauruses/{ => langs}/haskell/2010/strings.json (100%)
 rename web/thesauruses/{ => langs}/java/11/classes.json (100%)
 rename web/thesauruses/{ => langs}/java/11/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/java/11/data_types.json (100%)
 rename web/thesauruses/{ => langs}/java/11/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/java/11/functions.json (100%)
 rename web/thesauruses/{ => langs}/java/11/lists.json (100%)
 rename web/thesauruses/{ => langs}/java/11/operators.json (100%)
 rename web/thesauruses/{ => langs}/java/11/strings.json (100%)
 rename web/thesauruses/{ => langs}/java/15/classes.json (100%)
 rename web/thesauruses/{ => langs}/java/15/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/java/15/data_types.json (100%)
 rename web/thesauruses/{ => langs}/java/15/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/java/15/functions.json (100%)
 rename web/thesauruses/{ => langs}/java/15/lists.json (100%)
 rename web/thesauruses/{ => langs}/java/15/operators.json (100%)
 rename web/thesauruses/{ => langs}/java/15/strings.json (100%)
 rename web/thesauruses/{ => langs}/java/17/classes.json (100%)
 rename web/thesauruses/{ => langs}/java/17/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/java/17/data_types.json (100%)
 rename web/thesauruses/{ => langs}/java/17/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/java/17/functions.json (100%)
 rename web/thesauruses/{ => langs}/java/17/lists.json (100%)
 rename web/thesauruses/{ => langs}/java/17/operators.json (100%)
 rename web/thesauruses/{ => langs}/java/17/strings.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2009/classes.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2009/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2009/data_types.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2009/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2009/functions.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2009/io.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2009/lists.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2009/operators.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2009/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2009/strings.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2020/classes.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2020/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2020/data_types.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2020/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2020/functions.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2020/io.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2020/lists.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2020/operators.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2020/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2020/strings.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2021/classes.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2021/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2021/data_types.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2021/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2021/functions.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2021/io.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2021/lists.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2021/operators.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2021/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2021/strings.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2023/classes.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2023/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2023/data_types.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2023/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2023/functions.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2023/io.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2023/lists.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2023/operators.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2023/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/javascript/ECMAScript 2023/strings.json (100%)
 rename web/thesauruses/{ => langs}/kotlin/1.5/classes.json (100%)
 rename web/thesauruses/{ => langs}/kotlin/1.5/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/kotlin/1.5/data_types.json (100%)
 rename web/thesauruses/{ => langs}/kotlin/1.5/functions.json (100%)
 rename web/thesauruses/{ => langs}/kotlin/1.5/io.json (100%)
 rename web/thesauruses/{ => langs}/kotlin/1.5/lists.json (100%)
 rename web/thesauruses/{ => langs}/kotlin/1.5/operators.json (100%)
 rename web/thesauruses/{ => langs}/kotlin/1.5/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/kotlin/1.5/strings.json (100%)
 rename web/thesauruses/{ => langs}/lua/5/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/lua/5/data_types.json (96%)
 rename web/thesauruses/{ => langs}/lua/5/functions.json (97%)
 rename web/thesauruses/{ => langs}/lua/5/operators.json (95%)
 rename web/thesauruses/{ => langs}/lua/5/queues_stacks.json (96%)
 rename web/thesauruses/{ => langs}/lua/5/strings.json (97%)
 rename web/thesauruses/{ => langs}/nim/1/classes.json (100%)
 rename web/thesauruses/{ => langs}/nim/1/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/nim/1/data_types.json (100%)
 rename web/thesauruses/{ => langs}/nim/1/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/nim/1/functions.json (100%)
 rename web/thesauruses/{ => langs}/nim/1/lists.json (100%)
 rename web/thesauruses/{ => langs}/nim/1/operators.json (100%)
 rename web/thesauruses/{ => langs}/objectivec/2/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/objectivec/2/data_types.json (100%)
 rename web/thesauruses/{ => langs}/objectivec/2/functions.json (100%)
 rename web/thesauruses/{ => langs}/objectivec/2/lists.json (100%)
 rename web/thesauruses/{ => langs}/objectivec/2/operators.json (100%)
 rename web/thesauruses/{ => langs}/objectivec/2/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/perl/5/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/perl/5/data_types.json (100%)
 rename web/thesauruses/{ => langs}/perl/5/operators.json (100%)
 rename web/thesauruses/{ => langs}/php/7/classes.json (100%)
 rename web/thesauruses/{ => langs}/php/7/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/php/7/data_types.json (100%)
 rename web/thesauruses/{ => langs}/php/7/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/php/7/functions.json (100%)
 rename web/thesauruses/{ => langs}/php/7/lists.json (100%)
 rename web/thesauruses/{ => langs}/php/7/operators.json (100%)
 rename web/thesauruses/{ => langs}/php/8/classes.json (100%)
 rename web/thesauruses/{ => langs}/php/8/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/php/8/data_types.json (100%)
 rename web/thesauruses/{ => langs}/php/8/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/php/8/functions.json (100%)
 rename web/thesauruses/{ => langs}/php/8/lists.json (100%)
 rename web/thesauruses/{ => langs}/php/8/operators.json (100%)
 rename web/thesauruses/{ => langs}/php/8/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/powershell/7/classes.json (100%)
 rename web/thesauruses/{ => langs}/powershell/7/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/powershell/7/data_types.json (100%)
 rename web/thesauruses/{ => langs}/python/3/classes.json (100%)
 rename web/thesauruses/{ => langs}/python/3/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/python/3/data_types.json (100%)
 rename web/thesauruses/{ => langs}/python/3/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/python/3/functions.json (100%)
 rename web/thesauruses/{ => langs}/python/3/io.json (100%)
 rename web/thesauruses/{ => langs}/python/3/lists.json (100%)
 rename web/thesauruses/{ => langs}/python/3/operators.json (100%)
 rename web/thesauruses/{ => langs}/python/3/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/python/3/strings.json (100%)
 rename web/thesauruses/{ => langs}/r/4/classes.json (100%)
 rename web/thesauruses/{ => langs}/r/4/data_types.json (100%)
 rename web/thesauruses/{ => langs}/r/4/io.json (100%)
 rename web/thesauruses/{ => langs}/r/4/lists.json (100%)
 rename web/thesauruses/{ => langs}/r/4/operators.json (100%)
 rename web/thesauruses/{ => langs}/ruby/3/classes.json (100%)
 rename web/thesauruses/{ => langs}/ruby/3/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/ruby/3/data_types.json (100%)
 rename web/thesauruses/{ => langs}/ruby/3/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/ruby/3/functions.json (100%)
 rename web/thesauruses/{ => langs}/ruby/3/lists.json (100%)
 rename web/thesauruses/{ => langs}/ruby/3/strings.json (100%)
 rename web/thesauruses/{ => langs}/rust/1/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/rust/1/data_types.json (100%)
 rename web/thesauruses/{ => langs}/rust/1/functions.json (100%)
 rename web/thesauruses/{ => langs}/rust/1/operators.json (100%)
 rename web/thesauruses/{ => langs}/rust/1/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/rust/1/strings.json (100%)
 rename web/thesauruses/{ => langs}/scala/2/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/scala/2/data_types.json (100%)
 rename web/thesauruses/{ => langs}/scala/2/functions.json (100%)
 rename web/thesauruses/{ => langs}/scala/2/operators.json (100%)
 rename web/thesauruses/{ => langs}/swift/5/classes.json (100%)
 rename web/thesauruses/{ => langs}/swift/5/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/swift/5/data_types.json (100%)
 rename web/thesauruses/{ => langs}/swift/5/functions.json (100%)
 rename web/thesauruses/{ => langs}/swift/5/lists.json (100%)
 rename web/thesauruses/{ => langs}/swift/5/operators.json (100%)
 rename web/thesauruses/{ => langs}/swift/5/strings.json (100%)
 rename web/thesauruses/{ => langs}/typescript/4/classes.json (100%)
 rename web/thesauruses/{ => langs}/typescript/4/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/typescript/4/data_types.json (100%)
 rename web/thesauruses/{ => langs}/typescript/4/exception_handling.json (100%)
 rename web/thesauruses/{ => langs}/typescript/4/functions.json (100%)
 rename web/thesauruses/{ => langs}/typescript/4/lists.json (100%)
 rename web/thesauruses/{ => langs}/typescript/4/operators.json (100%)
 rename web/thesauruses/{ => langs}/typescript/4/queues_stacks.json (100%)
 rename web/thesauruses/{ => langs}/typescript/4/strings.json (100%)
 rename web/thesauruses/{ => langs}/vbnet/16/classes.json (100%)
 rename web/thesauruses/{ => langs}/vbnet/16/control_structures.json (100%)
 rename web/thesauruses/{ => langs}/vbnet/16/data_types.json (100%)
 rename web/thesauruses/{ => langs}/vbnet/16/functions.json (100%)
 rename web/thesauruses/{ => langs}/vbnet/16/lists.json (100%)
 rename web/thesauruses/{ => langs}/vbnet/16/operators.json (100%)
 rename web/thesauruses/{ => langs}/vbnet/16/strings.json (100%)

diff --git a/web/thesauruses/ada/2012/classes.json b/web/thesauruses/langs/ada/2012/classes.json
similarity index 100%
rename from web/thesauruses/ada/2012/classes.json
rename to web/thesauruses/langs/ada/2012/classes.json
diff --git a/web/thesauruses/ada/2012/control_structures.json b/web/thesauruses/langs/ada/2012/control_structures.json
similarity index 100%
rename from web/thesauruses/ada/2012/control_structures.json
rename to web/thesauruses/langs/ada/2012/control_structures.json
diff --git a/web/thesauruses/ada/2012/data_types.json b/web/thesauruses/langs/ada/2012/data_types.json
similarity index 100%
rename from web/thesauruses/ada/2012/data_types.json
rename to web/thesauruses/langs/ada/2012/data_types.json
diff --git a/web/thesauruses/ada/2012/functions.json b/web/thesauruses/langs/ada/2012/functions.json
similarity index 100%
rename from web/thesauruses/ada/2012/functions.json
rename to web/thesauruses/langs/ada/2012/functions.json
diff --git a/web/thesauruses/ada/2012/lists.json b/web/thesauruses/langs/ada/2012/lists.json
similarity index 100%
rename from web/thesauruses/ada/2012/lists.json
rename to web/thesauruses/langs/ada/2012/lists.json
diff --git a/web/thesauruses/ada/2012/operators.json b/web/thesauruses/langs/ada/2012/operators.json
similarity index 100%
rename from web/thesauruses/ada/2012/operators.json
rename to web/thesauruses/langs/ada/2012/operators.json
diff --git a/web/thesauruses/bash/3/classes.json b/web/thesauruses/langs/bash/3/classes.json
similarity index 100%
rename from web/thesauruses/bash/3/classes.json
rename to web/thesauruses/langs/bash/3/classes.json
diff --git a/web/thesauruses/bash/3/control_structures.json b/web/thesauruses/langs/bash/3/control_structures.json
similarity index 100%
rename from web/thesauruses/bash/3/control_structures.json
rename to web/thesauruses/langs/bash/3/control_structures.json
diff --git a/web/thesauruses/bash/3/data_types.json b/web/thesauruses/langs/bash/3/data_types.json
similarity index 100%
rename from web/thesauruses/bash/3/data_types.json
rename to web/thesauruses/langs/bash/3/data_types.json
diff --git a/web/thesauruses/bash/3/functions.json b/web/thesauruses/langs/bash/3/functions.json
similarity index 100%
rename from web/thesauruses/bash/3/functions.json
rename to web/thesauruses/langs/bash/3/functions.json
diff --git a/web/thesauruses/bash/3/operators.json b/web/thesauruses/langs/bash/3/operators.json
similarity index 100%
rename from web/thesauruses/bash/3/operators.json
rename to web/thesauruses/langs/bash/3/operators.json
diff --git a/web/thesauruses/bash/5/classes.json b/web/thesauruses/langs/bash/5/classes.json
similarity index 100%
rename from web/thesauruses/bash/5/classes.json
rename to web/thesauruses/langs/bash/5/classes.json
diff --git a/web/thesauruses/bash/5/control_structures.json b/web/thesauruses/langs/bash/5/control_structures.json
similarity index 100%
rename from web/thesauruses/bash/5/control_structures.json
rename to web/thesauruses/langs/bash/5/control_structures.json
diff --git a/web/thesauruses/bash/5/data_types.json b/web/thesauruses/langs/bash/5/data_types.json
similarity index 100%
rename from web/thesauruses/bash/5/data_types.json
rename to web/thesauruses/langs/bash/5/data_types.json
diff --git a/web/thesauruses/bash/5/functions.json b/web/thesauruses/langs/bash/5/functions.json
similarity index 100%
rename from web/thesauruses/bash/5/functions.json
rename to web/thesauruses/langs/bash/5/functions.json
diff --git a/web/thesauruses/bash/5/operators.json b/web/thesauruses/langs/bash/5/operators.json
similarity index 100%
rename from web/thesauruses/bash/5/operators.json
rename to web/thesauruses/langs/bash/5/operators.json
diff --git a/web/thesauruses/c/17/classes.json b/web/thesauruses/langs/c/17/classes.json
similarity index 100%
rename from web/thesauruses/c/17/classes.json
rename to web/thesauruses/langs/c/17/classes.json
diff --git a/web/thesauruses/c/17/control_structures.json b/web/thesauruses/langs/c/17/control_structures.json
similarity index 100%
rename from web/thesauruses/c/17/control_structures.json
rename to web/thesauruses/langs/c/17/control_structures.json
diff --git a/web/thesauruses/c/17/data_types.json b/web/thesauruses/langs/c/17/data_types.json
similarity index 100%
rename from web/thesauruses/c/17/data_types.json
rename to web/thesauruses/langs/c/17/data_types.json
diff --git a/web/thesauruses/c/17/functions.json b/web/thesauruses/langs/c/17/functions.json
similarity index 100%
rename from web/thesauruses/c/17/functions.json
rename to web/thesauruses/langs/c/17/functions.json
diff --git a/web/thesauruses/c/17/io.json b/web/thesauruses/langs/c/17/io.json
similarity index 100%
rename from web/thesauruses/c/17/io.json
rename to web/thesauruses/langs/c/17/io.json
diff --git a/web/thesauruses/c/17/operators.json b/web/thesauruses/langs/c/17/operators.json
similarity index 100%
rename from web/thesauruses/c/17/operators.json
rename to web/thesauruses/langs/c/17/operators.json
diff --git a/web/thesauruses/c/17/strings.json b/web/thesauruses/langs/c/17/strings.json
similarity index 100%
rename from web/thesauruses/c/17/strings.json
rename to web/thesauruses/langs/c/17/strings.json
diff --git a/web/thesauruses/clips/641/rules_facts.json b/web/thesauruses/langs/clips/641/rules_facts.json
similarity index 100%
rename from web/thesauruses/clips/641/rules_facts.json
rename to web/thesauruses/langs/clips/641/rules_facts.json
diff --git a/web/thesauruses/clojure/1/data_types.json b/web/thesauruses/langs/clojure/1/data_types.json
similarity index 100%
rename from web/thesauruses/clojure/1/data_types.json
rename to web/thesauruses/langs/clojure/1/data_types.json
diff --git a/web/thesauruses/clojure/1/functions.json b/web/thesauruses/langs/clojure/1/functions.json
similarity index 100%
rename from web/thesauruses/clojure/1/functions.json
rename to web/thesauruses/langs/clojure/1/functions.json
diff --git a/web/thesauruses/clojure/1/operators.json b/web/thesauruses/langs/clojure/1/operators.json
similarity index 100%
rename from web/thesauruses/clojure/1/operators.json
rename to web/thesauruses/langs/clojure/1/operators.json
diff --git a/web/thesauruses/cpp/C++17/classes.json b/web/thesauruses/langs/cpp/C++17/classes.json
similarity index 100%
rename from web/thesauruses/cpp/C++17/classes.json
rename to web/thesauruses/langs/cpp/C++17/classes.json
diff --git a/web/thesauruses/cpp/C++17/control_structures.json b/web/thesauruses/langs/cpp/C++17/control_structures.json
similarity index 100%
rename from web/thesauruses/cpp/C++17/control_structures.json
rename to web/thesauruses/langs/cpp/C++17/control_structures.json
diff --git a/web/thesauruses/cpp/C++17/data_types.json b/web/thesauruses/langs/cpp/C++17/data_types.json
similarity index 100%
rename from web/thesauruses/cpp/C++17/data_types.json
rename to web/thesauruses/langs/cpp/C++17/data_types.json
diff --git a/web/thesauruses/cpp/C++17/functions.json b/web/thesauruses/langs/cpp/C++17/functions.json
similarity index 100%
rename from web/thesauruses/cpp/C++17/functions.json
rename to web/thesauruses/langs/cpp/C++17/functions.json
diff --git a/web/thesauruses/cpp/C++17/operators.json b/web/thesauruses/langs/cpp/C++17/operators.json
similarity index 100%
rename from web/thesauruses/cpp/C++17/operators.json
rename to web/thesauruses/langs/cpp/C++17/operators.json
diff --git a/web/thesauruses/cpp/C++17/strings.json b/web/thesauruses/langs/cpp/C++17/strings.json
similarity index 100%
rename from web/thesauruses/cpp/C++17/strings.json
rename to web/thesauruses/langs/cpp/C++17/strings.json
diff --git a/web/thesauruses/cpp/C++20/classes.json b/web/thesauruses/langs/cpp/C++20/classes.json
similarity index 100%
rename from web/thesauruses/cpp/C++20/classes.json
rename to web/thesauruses/langs/cpp/C++20/classes.json
diff --git a/web/thesauruses/cpp/C++20/control_structures.json b/web/thesauruses/langs/cpp/C++20/control_structures.json
similarity index 100%
rename from web/thesauruses/cpp/C++20/control_structures.json
rename to web/thesauruses/langs/cpp/C++20/control_structures.json
diff --git a/web/thesauruses/cpp/C++20/data_types.json b/web/thesauruses/langs/cpp/C++20/data_types.json
similarity index 100%
rename from web/thesauruses/cpp/C++20/data_types.json
rename to web/thesauruses/langs/cpp/C++20/data_types.json
diff --git a/web/thesauruses/cpp/C++20/functions.json b/web/thesauruses/langs/cpp/C++20/functions.json
similarity index 100%
rename from web/thesauruses/cpp/C++20/functions.json
rename to web/thesauruses/langs/cpp/C++20/functions.json
diff --git a/web/thesauruses/cpp/C++20/io.json b/web/thesauruses/langs/cpp/C++20/io.json
similarity index 100%
rename from web/thesauruses/cpp/C++20/io.json
rename to web/thesauruses/langs/cpp/C++20/io.json
diff --git a/web/thesauruses/cpp/C++20/operators.json b/web/thesauruses/langs/cpp/C++20/operators.json
similarity index 100%
rename from web/thesauruses/cpp/C++20/operators.json
rename to web/thesauruses/langs/cpp/C++20/operators.json
diff --git a/web/thesauruses/csharp/9/classes.json b/web/thesauruses/langs/csharp/9/classes.json
similarity index 100%
rename from web/thesauruses/csharp/9/classes.json
rename to web/thesauruses/langs/csharp/9/classes.json
diff --git a/web/thesauruses/csharp/9/control_structures.json b/web/thesauruses/langs/csharp/9/control_structures.json
similarity index 100%
rename from web/thesauruses/csharp/9/control_structures.json
rename to web/thesauruses/langs/csharp/9/control_structures.json
diff --git a/web/thesauruses/csharp/9/data_types.json b/web/thesauruses/langs/csharp/9/data_types.json
similarity index 100%
rename from web/thesauruses/csharp/9/data_types.json
rename to web/thesauruses/langs/csharp/9/data_types.json
diff --git a/web/thesauruses/csharp/9/exception_handling.json b/web/thesauruses/langs/csharp/9/exception_handling.json
similarity index 100%
rename from web/thesauruses/csharp/9/exception_handling.json
rename to web/thesauruses/langs/csharp/9/exception_handling.json
diff --git a/web/thesauruses/csharp/9/functions.json b/web/thesauruses/langs/csharp/9/functions.json
similarity index 100%
rename from web/thesauruses/csharp/9/functions.json
rename to web/thesauruses/langs/csharp/9/functions.json
diff --git a/web/thesauruses/csharp/9/lists.json b/web/thesauruses/langs/csharp/9/lists.json
similarity index 100%
rename from web/thesauruses/csharp/9/lists.json
rename to web/thesauruses/langs/csharp/9/lists.json
diff --git a/web/thesauruses/csharp/9/operators.json b/web/thesauruses/langs/csharp/9/operators.json
similarity index 100%
rename from web/thesauruses/csharp/9/operators.json
rename to web/thesauruses/langs/csharp/9/operators.json
diff --git a/web/thesauruses/csharp/9/queues_stacks.json b/web/thesauruses/langs/csharp/9/queues_stacks.json
similarity index 100%
rename from web/thesauruses/csharp/9/queues_stacks.json
rename to web/thesauruses/langs/csharp/9/queues_stacks.json
diff --git a/web/thesauruses/csharp/9/strings.json b/web/thesauruses/langs/csharp/9/strings.json
similarity index 100%
rename from web/thesauruses/csharp/9/strings.json
rename to web/thesauruses/langs/csharp/9/strings.json
diff --git a/web/thesauruses/go/1/control_structures.json b/web/thesauruses/langs/go/1/control_structures.json
similarity index 100%
rename from web/thesauruses/go/1/control_structures.json
rename to web/thesauruses/langs/go/1/control_structures.json
diff --git a/web/thesauruses/go/1/data_types.json b/web/thesauruses/langs/go/1/data_types.json
similarity index 100%
rename from web/thesauruses/go/1/data_types.json
rename to web/thesauruses/langs/go/1/data_types.json
diff --git a/web/thesauruses/go/1/functions.json b/web/thesauruses/langs/go/1/functions.json
similarity index 100%
rename from web/thesauruses/go/1/functions.json
rename to web/thesauruses/langs/go/1/functions.json
diff --git a/web/thesauruses/go/1/lists.json b/web/thesauruses/langs/go/1/lists.json
similarity index 100%
rename from web/thesauruses/go/1/lists.json
rename to web/thesauruses/langs/go/1/lists.json
diff --git a/web/thesauruses/go/1/operators.json b/web/thesauruses/langs/go/1/operators.json
similarity index 100%
rename from web/thesauruses/go/1/operators.json
rename to web/thesauruses/langs/go/1/operators.json
diff --git a/web/thesauruses/go/1/strings.json b/web/thesauruses/langs/go/1/strings.json
similarity index 100%
rename from web/thesauruses/go/1/strings.json
rename to web/thesauruses/langs/go/1/strings.json
diff --git a/web/thesauruses/haskell/2010/classes.json b/web/thesauruses/langs/haskell/2010/classes.json
similarity index 100%
rename from web/thesauruses/haskell/2010/classes.json
rename to web/thesauruses/langs/haskell/2010/classes.json
diff --git a/web/thesauruses/haskell/2010/control_structures.json b/web/thesauruses/langs/haskell/2010/control_structures.json
similarity index 100%
rename from web/thesauruses/haskell/2010/control_structures.json
rename to web/thesauruses/langs/haskell/2010/control_structures.json
diff --git a/web/thesauruses/haskell/2010/data_types.json b/web/thesauruses/langs/haskell/2010/data_types.json
similarity index 100%
rename from web/thesauruses/haskell/2010/data_types.json
rename to web/thesauruses/langs/haskell/2010/data_types.json
diff --git a/web/thesauruses/haskell/2010/functions.json b/web/thesauruses/langs/haskell/2010/functions.json
similarity index 100%
rename from web/thesauruses/haskell/2010/functions.json
rename to web/thesauruses/langs/haskell/2010/functions.json
diff --git a/web/thesauruses/haskell/2010/lists.json b/web/thesauruses/langs/haskell/2010/lists.json
similarity index 100%
rename from web/thesauruses/haskell/2010/lists.json
rename to web/thesauruses/langs/haskell/2010/lists.json
diff --git a/web/thesauruses/haskell/2010/operators.json b/web/thesauruses/langs/haskell/2010/operators.json
similarity index 100%
rename from web/thesauruses/haskell/2010/operators.json
rename to web/thesauruses/langs/haskell/2010/operators.json
diff --git a/web/thesauruses/haskell/2010/strings.json b/web/thesauruses/langs/haskell/2010/strings.json
similarity index 100%
rename from web/thesauruses/haskell/2010/strings.json
rename to web/thesauruses/langs/haskell/2010/strings.json
diff --git a/web/thesauruses/java/11/classes.json b/web/thesauruses/langs/java/11/classes.json
similarity index 100%
rename from web/thesauruses/java/11/classes.json
rename to web/thesauruses/langs/java/11/classes.json
diff --git a/web/thesauruses/java/11/control_structures.json b/web/thesauruses/langs/java/11/control_structures.json
similarity index 100%
rename from web/thesauruses/java/11/control_structures.json
rename to web/thesauruses/langs/java/11/control_structures.json
diff --git a/web/thesauruses/java/11/data_types.json b/web/thesauruses/langs/java/11/data_types.json
similarity index 100%
rename from web/thesauruses/java/11/data_types.json
rename to web/thesauruses/langs/java/11/data_types.json
diff --git a/web/thesauruses/java/11/exception_handling.json b/web/thesauruses/langs/java/11/exception_handling.json
similarity index 100%
rename from web/thesauruses/java/11/exception_handling.json
rename to web/thesauruses/langs/java/11/exception_handling.json
diff --git a/web/thesauruses/java/11/functions.json b/web/thesauruses/langs/java/11/functions.json
similarity index 100%
rename from web/thesauruses/java/11/functions.json
rename to web/thesauruses/langs/java/11/functions.json
diff --git a/web/thesauruses/java/11/lists.json b/web/thesauruses/langs/java/11/lists.json
similarity index 100%
rename from web/thesauruses/java/11/lists.json
rename to web/thesauruses/langs/java/11/lists.json
diff --git a/web/thesauruses/java/11/operators.json b/web/thesauruses/langs/java/11/operators.json
similarity index 100%
rename from web/thesauruses/java/11/operators.json
rename to web/thesauruses/langs/java/11/operators.json
diff --git a/web/thesauruses/java/11/strings.json b/web/thesauruses/langs/java/11/strings.json
similarity index 100%
rename from web/thesauruses/java/11/strings.json
rename to web/thesauruses/langs/java/11/strings.json
diff --git a/web/thesauruses/java/15/classes.json b/web/thesauruses/langs/java/15/classes.json
similarity index 100%
rename from web/thesauruses/java/15/classes.json
rename to web/thesauruses/langs/java/15/classes.json
diff --git a/web/thesauruses/java/15/control_structures.json b/web/thesauruses/langs/java/15/control_structures.json
similarity index 100%
rename from web/thesauruses/java/15/control_structures.json
rename to web/thesauruses/langs/java/15/control_structures.json
diff --git a/web/thesauruses/java/15/data_types.json b/web/thesauruses/langs/java/15/data_types.json
similarity index 100%
rename from web/thesauruses/java/15/data_types.json
rename to web/thesauruses/langs/java/15/data_types.json
diff --git a/web/thesauruses/java/15/exception_handling.json b/web/thesauruses/langs/java/15/exception_handling.json
similarity index 100%
rename from web/thesauruses/java/15/exception_handling.json
rename to web/thesauruses/langs/java/15/exception_handling.json
diff --git a/web/thesauruses/java/15/functions.json b/web/thesauruses/langs/java/15/functions.json
similarity index 100%
rename from web/thesauruses/java/15/functions.json
rename to web/thesauruses/langs/java/15/functions.json
diff --git a/web/thesauruses/java/15/lists.json b/web/thesauruses/langs/java/15/lists.json
similarity index 100%
rename from web/thesauruses/java/15/lists.json
rename to web/thesauruses/langs/java/15/lists.json
diff --git a/web/thesauruses/java/15/operators.json b/web/thesauruses/langs/java/15/operators.json
similarity index 100%
rename from web/thesauruses/java/15/operators.json
rename to web/thesauruses/langs/java/15/operators.json
diff --git a/web/thesauruses/java/15/strings.json b/web/thesauruses/langs/java/15/strings.json
similarity index 100%
rename from web/thesauruses/java/15/strings.json
rename to web/thesauruses/langs/java/15/strings.json
diff --git a/web/thesauruses/java/17/classes.json b/web/thesauruses/langs/java/17/classes.json
similarity index 100%
rename from web/thesauruses/java/17/classes.json
rename to web/thesauruses/langs/java/17/classes.json
diff --git a/web/thesauruses/java/17/control_structures.json b/web/thesauruses/langs/java/17/control_structures.json
similarity index 100%
rename from web/thesauruses/java/17/control_structures.json
rename to web/thesauruses/langs/java/17/control_structures.json
diff --git a/web/thesauruses/java/17/data_types.json b/web/thesauruses/langs/java/17/data_types.json
similarity index 100%
rename from web/thesauruses/java/17/data_types.json
rename to web/thesauruses/langs/java/17/data_types.json
diff --git a/web/thesauruses/java/17/exception_handling.json b/web/thesauruses/langs/java/17/exception_handling.json
similarity index 100%
rename from web/thesauruses/java/17/exception_handling.json
rename to web/thesauruses/langs/java/17/exception_handling.json
diff --git a/web/thesauruses/java/17/functions.json b/web/thesauruses/langs/java/17/functions.json
similarity index 100%
rename from web/thesauruses/java/17/functions.json
rename to web/thesauruses/langs/java/17/functions.json
diff --git a/web/thesauruses/java/17/lists.json b/web/thesauruses/langs/java/17/lists.json
similarity index 100%
rename from web/thesauruses/java/17/lists.json
rename to web/thesauruses/langs/java/17/lists.json
diff --git a/web/thesauruses/java/17/operators.json b/web/thesauruses/langs/java/17/operators.json
similarity index 100%
rename from web/thesauruses/java/17/operators.json
rename to web/thesauruses/langs/java/17/operators.json
diff --git a/web/thesauruses/java/17/strings.json b/web/thesauruses/langs/java/17/strings.json
similarity index 100%
rename from web/thesauruses/java/17/strings.json
rename to web/thesauruses/langs/java/17/strings.json
diff --git a/web/thesauruses/javascript/ECMAScript 2009/classes.json b/web/thesauruses/langs/javascript/ECMAScript 2009/classes.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2009/classes.json
rename to web/thesauruses/langs/javascript/ECMAScript 2009/classes.json
diff --git a/web/thesauruses/javascript/ECMAScript 2009/control_structures.json b/web/thesauruses/langs/javascript/ECMAScript 2009/control_structures.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2009/control_structures.json
rename to web/thesauruses/langs/javascript/ECMAScript 2009/control_structures.json
diff --git a/web/thesauruses/javascript/ECMAScript 2009/data_types.json b/web/thesauruses/langs/javascript/ECMAScript 2009/data_types.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2009/data_types.json
rename to web/thesauruses/langs/javascript/ECMAScript 2009/data_types.json
diff --git a/web/thesauruses/javascript/ECMAScript 2009/exception_handling.json b/web/thesauruses/langs/javascript/ECMAScript 2009/exception_handling.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2009/exception_handling.json
rename to web/thesauruses/langs/javascript/ECMAScript 2009/exception_handling.json
diff --git a/web/thesauruses/javascript/ECMAScript 2009/functions.json b/web/thesauruses/langs/javascript/ECMAScript 2009/functions.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2009/functions.json
rename to web/thesauruses/langs/javascript/ECMAScript 2009/functions.json
diff --git a/web/thesauruses/javascript/ECMAScript 2009/io.json b/web/thesauruses/langs/javascript/ECMAScript 2009/io.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2009/io.json
rename to web/thesauruses/langs/javascript/ECMAScript 2009/io.json
diff --git a/web/thesauruses/javascript/ECMAScript 2009/lists.json b/web/thesauruses/langs/javascript/ECMAScript 2009/lists.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2009/lists.json
rename to web/thesauruses/langs/javascript/ECMAScript 2009/lists.json
diff --git a/web/thesauruses/javascript/ECMAScript 2009/operators.json b/web/thesauruses/langs/javascript/ECMAScript 2009/operators.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2009/operators.json
rename to web/thesauruses/langs/javascript/ECMAScript 2009/operators.json
diff --git a/web/thesauruses/javascript/ECMAScript 2009/queues_stacks.json b/web/thesauruses/langs/javascript/ECMAScript 2009/queues_stacks.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2009/queues_stacks.json
rename to web/thesauruses/langs/javascript/ECMAScript 2009/queues_stacks.json
diff --git a/web/thesauruses/javascript/ECMAScript 2009/strings.json b/web/thesauruses/langs/javascript/ECMAScript 2009/strings.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2009/strings.json
rename to web/thesauruses/langs/javascript/ECMAScript 2009/strings.json
diff --git a/web/thesauruses/javascript/ECMAScript 2020/classes.json b/web/thesauruses/langs/javascript/ECMAScript 2020/classes.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2020/classes.json
rename to web/thesauruses/langs/javascript/ECMAScript 2020/classes.json
diff --git a/web/thesauruses/javascript/ECMAScript 2020/control_structures.json b/web/thesauruses/langs/javascript/ECMAScript 2020/control_structures.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2020/control_structures.json
rename to web/thesauruses/langs/javascript/ECMAScript 2020/control_structures.json
diff --git a/web/thesauruses/javascript/ECMAScript 2020/data_types.json b/web/thesauruses/langs/javascript/ECMAScript 2020/data_types.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2020/data_types.json
rename to web/thesauruses/langs/javascript/ECMAScript 2020/data_types.json
diff --git a/web/thesauruses/javascript/ECMAScript 2020/exception_handling.json b/web/thesauruses/langs/javascript/ECMAScript 2020/exception_handling.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2020/exception_handling.json
rename to web/thesauruses/langs/javascript/ECMAScript 2020/exception_handling.json
diff --git a/web/thesauruses/javascript/ECMAScript 2020/functions.json b/web/thesauruses/langs/javascript/ECMAScript 2020/functions.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2020/functions.json
rename to web/thesauruses/langs/javascript/ECMAScript 2020/functions.json
diff --git a/web/thesauruses/javascript/ECMAScript 2020/io.json b/web/thesauruses/langs/javascript/ECMAScript 2020/io.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2020/io.json
rename to web/thesauruses/langs/javascript/ECMAScript 2020/io.json
diff --git a/web/thesauruses/javascript/ECMAScript 2020/lists.json b/web/thesauruses/langs/javascript/ECMAScript 2020/lists.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2020/lists.json
rename to web/thesauruses/langs/javascript/ECMAScript 2020/lists.json
diff --git a/web/thesauruses/javascript/ECMAScript 2020/operators.json b/web/thesauruses/langs/javascript/ECMAScript 2020/operators.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2020/operators.json
rename to web/thesauruses/langs/javascript/ECMAScript 2020/operators.json
diff --git a/web/thesauruses/javascript/ECMAScript 2020/queues_stacks.json b/web/thesauruses/langs/javascript/ECMAScript 2020/queues_stacks.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2020/queues_stacks.json
rename to web/thesauruses/langs/javascript/ECMAScript 2020/queues_stacks.json
diff --git a/web/thesauruses/javascript/ECMAScript 2020/strings.json b/web/thesauruses/langs/javascript/ECMAScript 2020/strings.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2020/strings.json
rename to web/thesauruses/langs/javascript/ECMAScript 2020/strings.json
diff --git a/web/thesauruses/javascript/ECMAScript 2021/classes.json b/web/thesauruses/langs/javascript/ECMAScript 2021/classes.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2021/classes.json
rename to web/thesauruses/langs/javascript/ECMAScript 2021/classes.json
diff --git a/web/thesauruses/javascript/ECMAScript 2021/control_structures.json b/web/thesauruses/langs/javascript/ECMAScript 2021/control_structures.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2021/control_structures.json
rename to web/thesauruses/langs/javascript/ECMAScript 2021/control_structures.json
diff --git a/web/thesauruses/javascript/ECMAScript 2021/data_types.json b/web/thesauruses/langs/javascript/ECMAScript 2021/data_types.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2021/data_types.json
rename to web/thesauruses/langs/javascript/ECMAScript 2021/data_types.json
diff --git a/web/thesauruses/javascript/ECMAScript 2021/exception_handling.json b/web/thesauruses/langs/javascript/ECMAScript 2021/exception_handling.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2021/exception_handling.json
rename to web/thesauruses/langs/javascript/ECMAScript 2021/exception_handling.json
diff --git a/web/thesauruses/javascript/ECMAScript 2021/functions.json b/web/thesauruses/langs/javascript/ECMAScript 2021/functions.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2021/functions.json
rename to web/thesauruses/langs/javascript/ECMAScript 2021/functions.json
diff --git a/web/thesauruses/javascript/ECMAScript 2021/io.json b/web/thesauruses/langs/javascript/ECMAScript 2021/io.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2021/io.json
rename to web/thesauruses/langs/javascript/ECMAScript 2021/io.json
diff --git a/web/thesauruses/javascript/ECMAScript 2021/lists.json b/web/thesauruses/langs/javascript/ECMAScript 2021/lists.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2021/lists.json
rename to web/thesauruses/langs/javascript/ECMAScript 2021/lists.json
diff --git a/web/thesauruses/javascript/ECMAScript 2021/operators.json b/web/thesauruses/langs/javascript/ECMAScript 2021/operators.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2021/operators.json
rename to web/thesauruses/langs/javascript/ECMAScript 2021/operators.json
diff --git a/web/thesauruses/javascript/ECMAScript 2021/queues_stacks.json b/web/thesauruses/langs/javascript/ECMAScript 2021/queues_stacks.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2021/queues_stacks.json
rename to web/thesauruses/langs/javascript/ECMAScript 2021/queues_stacks.json
diff --git a/web/thesauruses/javascript/ECMAScript 2021/strings.json b/web/thesauruses/langs/javascript/ECMAScript 2021/strings.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2021/strings.json
rename to web/thesauruses/langs/javascript/ECMAScript 2021/strings.json
diff --git a/web/thesauruses/javascript/ECMAScript 2023/classes.json b/web/thesauruses/langs/javascript/ECMAScript 2023/classes.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2023/classes.json
rename to web/thesauruses/langs/javascript/ECMAScript 2023/classes.json
diff --git a/web/thesauruses/javascript/ECMAScript 2023/control_structures.json b/web/thesauruses/langs/javascript/ECMAScript 2023/control_structures.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2023/control_structures.json
rename to web/thesauruses/langs/javascript/ECMAScript 2023/control_structures.json
diff --git a/web/thesauruses/javascript/ECMAScript 2023/data_types.json b/web/thesauruses/langs/javascript/ECMAScript 2023/data_types.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2023/data_types.json
rename to web/thesauruses/langs/javascript/ECMAScript 2023/data_types.json
diff --git a/web/thesauruses/javascript/ECMAScript 2023/exception_handling.json b/web/thesauruses/langs/javascript/ECMAScript 2023/exception_handling.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2023/exception_handling.json
rename to web/thesauruses/langs/javascript/ECMAScript 2023/exception_handling.json
diff --git a/web/thesauruses/javascript/ECMAScript 2023/functions.json b/web/thesauruses/langs/javascript/ECMAScript 2023/functions.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2023/functions.json
rename to web/thesauruses/langs/javascript/ECMAScript 2023/functions.json
diff --git a/web/thesauruses/javascript/ECMAScript 2023/io.json b/web/thesauruses/langs/javascript/ECMAScript 2023/io.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2023/io.json
rename to web/thesauruses/langs/javascript/ECMAScript 2023/io.json
diff --git a/web/thesauruses/javascript/ECMAScript 2023/lists.json b/web/thesauruses/langs/javascript/ECMAScript 2023/lists.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2023/lists.json
rename to web/thesauruses/langs/javascript/ECMAScript 2023/lists.json
diff --git a/web/thesauruses/javascript/ECMAScript 2023/operators.json b/web/thesauruses/langs/javascript/ECMAScript 2023/operators.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2023/operators.json
rename to web/thesauruses/langs/javascript/ECMAScript 2023/operators.json
diff --git a/web/thesauruses/javascript/ECMAScript 2023/queues_stacks.json b/web/thesauruses/langs/javascript/ECMAScript 2023/queues_stacks.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2023/queues_stacks.json
rename to web/thesauruses/langs/javascript/ECMAScript 2023/queues_stacks.json
diff --git a/web/thesauruses/javascript/ECMAScript 2023/strings.json b/web/thesauruses/langs/javascript/ECMAScript 2023/strings.json
similarity index 100%
rename from web/thesauruses/javascript/ECMAScript 2023/strings.json
rename to web/thesauruses/langs/javascript/ECMAScript 2023/strings.json
diff --git a/web/thesauruses/kotlin/1.5/classes.json b/web/thesauruses/langs/kotlin/1.5/classes.json
similarity index 100%
rename from web/thesauruses/kotlin/1.5/classes.json
rename to web/thesauruses/langs/kotlin/1.5/classes.json
diff --git a/web/thesauruses/kotlin/1.5/control_structures.json b/web/thesauruses/langs/kotlin/1.5/control_structures.json
similarity index 100%
rename from web/thesauruses/kotlin/1.5/control_structures.json
rename to web/thesauruses/langs/kotlin/1.5/control_structures.json
diff --git a/web/thesauruses/kotlin/1.5/data_types.json b/web/thesauruses/langs/kotlin/1.5/data_types.json
similarity index 100%
rename from web/thesauruses/kotlin/1.5/data_types.json
rename to web/thesauruses/langs/kotlin/1.5/data_types.json
diff --git a/web/thesauruses/kotlin/1.5/functions.json b/web/thesauruses/langs/kotlin/1.5/functions.json
similarity index 100%
rename from web/thesauruses/kotlin/1.5/functions.json
rename to web/thesauruses/langs/kotlin/1.5/functions.json
diff --git a/web/thesauruses/kotlin/1.5/io.json b/web/thesauruses/langs/kotlin/1.5/io.json
similarity index 100%
rename from web/thesauruses/kotlin/1.5/io.json
rename to web/thesauruses/langs/kotlin/1.5/io.json
diff --git a/web/thesauruses/kotlin/1.5/lists.json b/web/thesauruses/langs/kotlin/1.5/lists.json
similarity index 100%
rename from web/thesauruses/kotlin/1.5/lists.json
rename to web/thesauruses/langs/kotlin/1.5/lists.json
diff --git a/web/thesauruses/kotlin/1.5/operators.json b/web/thesauruses/langs/kotlin/1.5/operators.json
similarity index 100%
rename from web/thesauruses/kotlin/1.5/operators.json
rename to web/thesauruses/langs/kotlin/1.5/operators.json
diff --git a/web/thesauruses/kotlin/1.5/queues_stacks.json b/web/thesauruses/langs/kotlin/1.5/queues_stacks.json
similarity index 100%
rename from web/thesauruses/kotlin/1.5/queues_stacks.json
rename to web/thesauruses/langs/kotlin/1.5/queues_stacks.json
diff --git a/web/thesauruses/kotlin/1.5/strings.json b/web/thesauruses/langs/kotlin/1.5/strings.json
similarity index 100%
rename from web/thesauruses/kotlin/1.5/strings.json
rename to web/thesauruses/langs/kotlin/1.5/strings.json
diff --git a/web/thesauruses/lua/5/control_structures.json b/web/thesauruses/langs/lua/5/control_structures.json
similarity index 100%
rename from web/thesauruses/lua/5/control_structures.json
rename to web/thesauruses/langs/lua/5/control_structures.json
diff --git a/web/thesauruses/lua/5/data_types.json b/web/thesauruses/langs/lua/5/data_types.json
similarity index 96%
rename from web/thesauruses/lua/5/data_types.json
rename to web/thesauruses/langs/lua/5/data_types.json
index 6dc5a20be..547cd9ceb 100644
--- a/web/thesauruses/lua/5/data_types.json
+++ b/web/thesauruses/langs/lua/5/data_types.json
@@ -1,120 +1,120 @@
-{
-  "meta": {
-    "language": "lua",
-    "language_name": "Lua",
-    "structure": "data_types",
-    "language_version": "5.1"
-  },
-  "concepts": {
-    "boolean": {
-      "name": "Boolean",
-      "not-implemented": true,
-      "comment": "The type boolean has two values, false and true and both nil and false make a condition false."
-    },
-    "signed_integer_8_bit": {
-      "name": "Signed 8-bit integer",
-      "not-implemented": true
-    },
-    "unsigned_integer_8_bit": {
-      "name": "Unsigned 8-bit integer",
-      "not-implemented": true
-    },
-    "signed_integer_16_bit": {
-      "name": "Signed 16-bit integer",
-      "not-implemented": true
-    },
-    "unsigned_integer_16_bit": {
-      "name": "Unsigned 16-bit integer",
-      "not-implemented": true
-    },
-    "signed_integer_32_bit": {
-      "name": "Signed 32-bit integer",
-      "not-implemented": true
-    },
-    "unsigned_integer_32_bit": {
-      "name": "Unsigned 32-bit integer",
-      "not-implemented": true
-    },
-    "signed_integer_64_bit": {
-      "name": "Signed 64-bit integer",
-      "not-implemented": true
-    },
-    "unsigned_integer_64_bit": {
-      "name": "Unsigned 64-bit integer",
-      "not-implemented": true
-    },
-    "signed_integer_as_object": {
-      "name": "Signed object-based Integer",
-      "not-implemented": true,
-      "comment":"Lua does not have a built-in concept of distinct signed, object-based integers with the full range of operations and methods that you might find in languages like C++ or Java."
-    },
-    "unsigned_integer_as_object": {
-      "name": "Unsigned object-based Integer",
-      "not-implemented": true
-    },
-    "signed_float_16_bit": {
-      "name": "Signed 16-bit floating point",
-      "not-implemented": true
-    },
-    "unsigned_float_16_bit": {
-      "name": "Unsigned 16-bit floating point",
-      "not-implemented": true
-    },
-    "signed_float_32_bit": {
-      "name": "Signed 32-bit floating point",
-      "not-implemented": true
-    },
-    "unsigned_float_32_bit": {
-      "name": "Unsigned 32-bit floating point",
-      "not-implemented": true
-    },
-    "signed_float_64_bit": {
-      "name": "Signed 64-bit floating point",
-      "not-implemented": true
-    },
-    "unsigned_float_64_bit": {
-      "name": "Unsigned 64-bit floating point",
-      "not-implemented": true
-    },
-    "signed_float_as_object": {
-      "name": "Signed object-based floating point",
-      "not-implemented": true,
-      "comment":"Same as integer applies here too."
-    },
-    "unsigned_float_as_object": {
-      "name": "Unsigned object-based floating point",
-      "not-implemented": true
-    },
-    "character": {
-      "name": "Character",
-      "not-implemented": true
-    },
-    "string_as_object": {
-      "name": "String as an object",
-      "not-implemented": true,
-      "comment":"In Lua, strings are not treated as objects in the same way that some other programming languages, like Python or JavaScript"
-    },
-    "string_as_array": {
-      "name": "String as an array of characters",
-      "code": 
-      [
-        "local myString = 'Hello, World!'\nlocal firstChar = myString:sub(1, 1) -- Access the first character\nlocal fifthChar = myString:sub(5, 5) -- Access the fifth character\nprint(firstChar) -- Output: 'H'\nprint(fifthChar) -- Output: 'o'"
-      ],
-      "comment":"In Lua, strings are treated as arrays of characters."
-    },
-    "complex_as_object": {
-      "name": "Complex Number as an object",
-      "not-implemented": true,
-      "comment":"Lua does not have built-in support for complex numbers as a distinct data type like some other languages, such as Python."
-
-    },
-    "real_number_part": {
-      "name": "Complex number real part",
-      "not-implemented": true
-    },
-    "imaginary_number_part": {
-      "name": "Complex number imaginary part",
-      "not-implemented": true
-    }
-  }
-}
+{
+  "meta": {
+    "language": "lua",
+    "language_name": "Lua",
+    "structure": "data_types",
+    "language_version": "5.1"
+  },
+  "concepts": {
+    "boolean": {
+      "name": "Boolean",
+      "not-implemented": true,
+      "comment": "The type boolean has two values, false and true and both nil and false make a condition false."
+    },
+    "signed_integer_8_bit": {
+      "name": "Signed 8-bit integer",
+      "not-implemented": true
+    },
+    "unsigned_integer_8_bit": {
+      "name": "Unsigned 8-bit integer",
+      "not-implemented": true
+    },
+    "signed_integer_16_bit": {
+      "name": "Signed 16-bit integer",
+      "not-implemented": true
+    },
+    "unsigned_integer_16_bit": {
+      "name": "Unsigned 16-bit integer",
+      "not-implemented": true
+    },
+    "signed_integer_32_bit": {
+      "name": "Signed 32-bit integer",
+      "not-implemented": true
+    },
+    "unsigned_integer_32_bit": {
+      "name": "Unsigned 32-bit integer",
+      "not-implemented": true
+    },
+    "signed_integer_64_bit": {
+      "name": "Signed 64-bit integer",
+      "not-implemented": true
+    },
+    "unsigned_integer_64_bit": {
+      "name": "Unsigned 64-bit integer",
+      "not-implemented": true
+    },
+    "signed_integer_as_object": {
+      "name": "Signed object-based Integer",
+      "not-implemented": true,
+      "comment":"Lua does not have a built-in concept of distinct signed, object-based integers with the full range of operations and methods that you might find in languages like C++ or Java."
+    },
+    "unsigned_integer_as_object": {
+      "name": "Unsigned object-based Integer",
+      "not-implemented": true
+    },
+    "signed_float_16_bit": {
+      "name": "Signed 16-bit floating point",
+      "not-implemented": true
+    },
+    "unsigned_float_16_bit": {
+      "name": "Unsigned 16-bit floating point",
+      "not-implemented": true
+    },
+    "signed_float_32_bit": {
+      "name": "Signed 32-bit floating point",
+      "not-implemented": true
+    },
+    "unsigned_float_32_bit": {
+      "name": "Unsigned 32-bit floating point",
+      "not-implemented": true
+    },
+    "signed_float_64_bit": {
+      "name": "Signed 64-bit floating point",
+      "not-implemented": true
+    },
+    "unsigned_float_64_bit": {
+      "name": "Unsigned 64-bit floating point",
+      "not-implemented": true
+    },
+    "signed_float_as_object": {
+      "name": "Signed object-based floating point",
+      "not-implemented": true,
+      "comment":"Same as integer applies here too."
+    },
+    "unsigned_float_as_object": {
+      "name": "Unsigned object-based floating point",
+      "not-implemented": true
+    },
+    "character": {
+      "name": "Character",
+      "not-implemented": true
+    },
+    "string_as_object": {
+      "name": "String as an object",
+      "not-implemented": true,
+      "comment":"In Lua, strings are not treated as objects in the same way that some other programming languages, like Python or JavaScript"
+    },
+    "string_as_array": {
+      "name": "String as an array of characters",
+      "code": 
+      [
+        "local myString = 'Hello, World!'\nlocal firstChar = myString:sub(1, 1) -- Access the first character\nlocal fifthChar = myString:sub(5, 5) -- Access the fifth character\nprint(firstChar) -- Output: 'H'\nprint(fifthChar) -- Output: 'o'"
+      ],
+      "comment":"In Lua, strings are treated as arrays of characters."
+    },
+    "complex_as_object": {
+      "name": "Complex Number as an object",
+      "not-implemented": true,
+      "comment":"Lua does not have built-in support for complex numbers as a distinct data type like some other languages, such as Python."
+
+    },
+    "real_number_part": {
+      "name": "Complex number real part",
+      "not-implemented": true
+    },
+    "imaginary_number_part": {
+      "name": "Complex number imaginary part",
+      "not-implemented": true
+    }
+  }
+}
diff --git a/web/thesauruses/lua/5/functions.json b/web/thesauruses/langs/lua/5/functions.json
similarity index 97%
rename from web/thesauruses/lua/5/functions.json
rename to web/thesauruses/langs/lua/5/functions.json
index 7bbabf3c5..8d6d63f3f 100644
--- a/web/thesauruses/lua/5/functions.json
+++ b/web/thesauruses/langs/lua/5/functions.json
@@ -1,106 +1,106 @@
-{
-  "meta": {
-    "language": "lua",
-    "language_name": "Lua",
-    "structure": "functions",
-    "language_version": "5.1"
-  },
-  "concepts": {
-    "void_function_no_parameters": {
-      "name": "Function that does not return a value and takes no parameters",
-      "code": [
-        "function greet()\nend"
-      ]
-    },
-    "void_function_with_parameters": {
-      "name": "Function that does not return a value and that takes 1 or more defined parameters",
-      "code": [
-        "function addNumbers(a, b)\nend"
-      ]
-    },
-    "void_function_with_keyword_parameters": {
-      "name": "Function that does not return a value and that takes 0 or more defined keyword parameters",
-      "not-implemented": "true"
-    },
-    "void_function_variable_parameters": {
-      "name": "Function that does not return a value and function that takes an unknown number of parameters",
-      "code": [
-        "function myFunction(...)\nend"
-      ]
-    },
-    "return_value_function_no_parameters": {
-      "name": "Function that returns a value and takes no parameters",
-      "code": [
-        "function generateRandomNumber()\nreturn true\nend"
-      ]
-    },
-    "return_value_function_with_parameters": {
-      "name": "Function that returns a value and takes 1 or more defined parameters",
-      "code": [
-        "function addNumbers(a, b)\nreturn a,b\nend"
-      ]
-    },
-    "return_value_function_with_keyword_parameters": {
-      "name": "Function that returns a value and takes 0 or more defined keyword parameters",
-      "not-implemented": "true"
-    },
-    "return_value_function_variable_parameters": {
-      "name": "Function that returns a value and takes an unknown number of parameters",
-      "code": [
-        "function sum(...)\nreturn...\nend"
-      ]
-    },
-    "anonymous_function_no_parameters": {
-      "name": "Anonymous function that takes no parameters",
-      "code": [
-        "local myFunction = function()\nend"
-      ]
-    },
-    "anonymous_function_with_parameters": {
-      "name": "Anonymous function that takes 1 or more defined parameters",
-      "code": [
-        "local add = function(a, b)\nend"
-      ]
-    },
-    "anonymous_function_with_keyword_parameters": {
-      "name": "Anonymous function that takes 0 or more defined keyword parameters",
-      "not-implemented": "true"
-    },
-    "anonymous_function_variable_parameters": {
-      "name": "Anonymous function that takes an unknown number of parameters",
-      "code": [
-        "local add = function(...)\nend"
-      ]
-    },
-    "anonymous_function_no_parameters_with_return": {
-      "name": "Anonymous function that takes no parameters and returns a value",
-      "code": [
-        "local myFunction = function()\nreturn true\nend"
-      ]
-    },
-    "anonymous_function_with_parameters_with_return": {
-      "name": "Anonymous function that takes 1 or more defined parameters and returns a value",
-      "code": [
-        "local add = function(a, b)\nreturn a,b\nend"
-      ]
-    },
-    "anonymous_function_with_keyword_parameters_with_return": {
-      "name": "Anonymous function that takes 0 or more defined keyword parameters and returns a value",
-      "not-implemented": "true"
-    },
-    "anonymous_function_variable_parameters_with_return": {
-      "name": "Anonymous function that takes an unknown number of parameters and returns a value",
-      "code": [
-        "local myFunction = function(...)\nreturn...\nend"
-      ]
-    },
-    "call_subroutine": {
-      "name": "Call subroutine",
-      "not-implemented": "true"
-    },
-    "return_from_subroutine": {
-      "name": "Return from subroutine",
-      "not-implemented": "true"
-    }
-  }
-}
+{
+  "meta": {
+    "language": "lua",
+    "language_name": "Lua",
+    "structure": "functions",
+    "language_version": "5.1"
+  },
+  "concepts": {
+    "void_function_no_parameters": {
+      "name": "Function that does not return a value and takes no parameters",
+      "code": [
+        "function greet()\nend"
+      ]
+    },
+    "void_function_with_parameters": {
+      "name": "Function that does not return a value and that takes 1 or more defined parameters",
+      "code": [
+        "function addNumbers(a, b)\nend"
+      ]
+    },
+    "void_function_with_keyword_parameters": {
+      "name": "Function that does not return a value and that takes 0 or more defined keyword parameters",
+      "not-implemented": "true"
+    },
+    "void_function_variable_parameters": {
+      "name": "Function that does not return a value and function that takes an unknown number of parameters",
+      "code": [
+        "function myFunction(...)\nend"
+      ]
+    },
+    "return_value_function_no_parameters": {
+      "name": "Function that returns a value and takes no parameters",
+      "code": [
+        "function generateRandomNumber()\nreturn true\nend"
+      ]
+    },
+    "return_value_function_with_parameters": {
+      "name": "Function that returns a value and takes 1 or more defined parameters",
+      "code": [
+        "function addNumbers(a, b)\nreturn a,b\nend"
+      ]
+    },
+    "return_value_function_with_keyword_parameters": {
+      "name": "Function that returns a value and takes 0 or more defined keyword parameters",
+      "not-implemented": "true"
+    },
+    "return_value_function_variable_parameters": {
+      "name": "Function that returns a value and takes an unknown number of parameters",
+      "code": [
+        "function sum(...)\nreturn...\nend"
+      ]
+    },
+    "anonymous_function_no_parameters": {
+      "name": "Anonymous function that takes no parameters",
+      "code": [
+        "local myFunction = function()\nend"
+      ]
+    },
+    "anonymous_function_with_parameters": {
+      "name": "Anonymous function that takes 1 or more defined parameters",
+      "code": [
+        "local add = function(a, b)\nend"
+      ]
+    },
+    "anonymous_function_with_keyword_parameters": {
+      "name": "Anonymous function that takes 0 or more defined keyword parameters",
+      "not-implemented": "true"
+    },
+    "anonymous_function_variable_parameters": {
+      "name": "Anonymous function that takes an unknown number of parameters",
+      "code": [
+        "local add = function(...)\nend"
+      ]
+    },
+    "anonymous_function_no_parameters_with_return": {
+      "name": "Anonymous function that takes no parameters and returns a value",
+      "code": [
+        "local myFunction = function()\nreturn true\nend"
+      ]
+    },
+    "anonymous_function_with_parameters_with_return": {
+      "name": "Anonymous function that takes 1 or more defined parameters and returns a value",
+      "code": [
+        "local add = function(a, b)\nreturn a,b\nend"
+      ]
+    },
+    "anonymous_function_with_keyword_parameters_with_return": {
+      "name": "Anonymous function that takes 0 or more defined keyword parameters and returns a value",
+      "not-implemented": "true"
+    },
+    "anonymous_function_variable_parameters_with_return": {
+      "name": "Anonymous function that takes an unknown number of parameters and returns a value",
+      "code": [
+        "local myFunction = function(...)\nreturn...\nend"
+      ]
+    },
+    "call_subroutine": {
+      "name": "Call subroutine",
+      "not-implemented": "true"
+    },
+    "return_from_subroutine": {
+      "name": "Return from subroutine",
+      "not-implemented": "true"
+    }
+  }
+}
diff --git a/web/thesauruses/lua/5/operators.json b/web/thesauruses/langs/lua/5/operators.json
similarity index 95%
rename from web/thesauruses/lua/5/operators.json
rename to web/thesauruses/langs/lua/5/operators.json
index eff61799e..c0347f3cd 100644
--- a/web/thesauruses/lua/5/operators.json
+++ b/web/thesauruses/langs/lua/5/operators.json
@@ -1,244 +1,244 @@
-{
-  "meta": {
-    "language": "lua",
-    "language_name": "Lua",
-    "structure": "operators",
-    "language_version": "5.1"
-  },
-  "concepts": {
-    "addition": {
-      "name": "Addition operator",
-      "code": [
-        "a + b"
-      ]
-    },
-    "addition_assignment": {
-      "name": "Addition and assignment operator",
-      "not-implemented": true
-    },
-    "subtraction": {
-      "name": "Subtraction operator",
-      "code": [
-        "a - b"
-      ]
-    },
-    "subtraction_assignment": {
-      "name": "Subtraction and assignment operator",
-      "not-implemented": true
-    },
-    "multiplication": {
-      "name": "Multiplication operator",
-      "code": [
-        "a * b"
-      ]
-    },
-    "multiplication_assignment": {
-      "name": "Multiplication and assignment operator",
-      "not-implemented": true
-    },
-    "division": {
-      "name": "Division operator",
-      "code": [
-        "a / b"
-      ]
-    },
-    "division_assignment": {
-      "name": "Division and assignment operator",
-      "not-implemented": true
-    },
-    "integer_division": {
-      "name": "Integer division operator",
-      "not-implemented": true
-    },
-    "integer_division_assignment": {
-      "name": "Integer division and assignment operator",
-      "not-implemented": true
-    },
-    "modulus": {
-      "name": "Modulus (remainder) operator",
-      "code": [
-        "a % b"
-      ]
-    },
-    "modulus_assignment": {
-      "name": "Modulus and assignment operator",
-      "not-implemented": true
-    },
-    "unary_plus": {
-      "name": "Unary plus operator",
-      "not-implemented": true
-    },
-    "unary_minus": {
-      "name": "Unary minus operator",
-      "not-implemented": true
-    },
-    "increment": {
-      "name": "Increment (add 1) operator",
-      "not-implemented": true
-    },
-    "decrement": {
-      "name": "Decrement (subtract 1) operator",
-      "not-implemented": true
-    },
-    "exponential": {
-      "name": "Exponential operator",
-      "code": [
-        "a ^ b"
-      ]
-    },
-    "factorial": {
-      "name": "Factorial operator",
-      "not-implemented": true
-    },
-    "absolute_value": {
-      "name": "Absolute value operator",
-      "code": [
-        "math.abs(a)"
-      ]
-    },
-    "percentage": {
-      "name": "Percentage operator",
-      "not-implemented": true
-    },
-    "equal_to": {
-      "name": "Equality operator",
-      "code": [
-        "a == b"
-      ]
-    },
-    "not_equal_to": {
-      "name": "Not equal to operator",
-      "code": [
-        "a ~= b"
-      ]
-    },
-    "less_than": {
-      "name": "Less than operator",
-      "code": [
-        "a < b"
-      ]
-    },
-    "less_than_or_equal_to": {
-      "name": "Less than or equal to operator",
-      "code": [
-        "a <= b"
-      ]
-    },
-    "greater_than": {
-      "name": "Greater than operator",
-      "code": [
-        "a > b"
-      ]
-    },
-    "greater_than_or_equal_to": {
-      "name": "Greater than or equal to operator",
-      "code": [
-        "a >= b"
-      ]
-    },
-    "null_coalescing": {
-      "name": "Null coalescing operator",
-      "not-implemented": true
-    },
-    "is": {
-      "name": "Is operator",
-      "not-implemented": true
-    },
-    "is_not": {
-      "name": "Is not operator",
-      "not-implemented": true
-    },
-    "logical_and": {
-      "name": "Logical AND operator",
-      "code": [
-        "a and b"
-      ]
-    },
-    "logical_or": {
-      "name": "Logical OR operator",
-      "code": [
-        "a or b"
-      ]
-    },
-    "logical_not": {
-      "name": "Logical NOT operator",
-      "code": [
-        "not [condition]"
-      ]
-    },
-    "bitwise_and": {
-      "name": "Bitwise AND operator",
-      "code": [
-        "a & b"
-      ]
-    },
-    "bitwise_and_assignment": {
-      "name": "Bitwise AND and assignment operator",
-      "not-implemented": true
-    },
-    "bitwise_or": {
-      "name": "Bitwise OR operator",
-      "code": [
-        "a | b"
-      ]
-    },
-    "bitwise_or_assignment": {
-      "name": "Bitwise OR and assignment operator",
-      "not-implemented": true
-    },
-    "bitwise_not": {
-      "name": "Bitwise NOT operator",
-      "code": [
-        "~a"
-      ]
-    },
-    "not_assignment": {
-      "name": "Bitwise NOT and assignment operator",
-      "not-implemented": true
-    },
-    "bitwise_xor": {
-      "name": "Bitwise XOR operator",
-      "not-implemented": true
-    },
-    "bitwise_xor_assignment": {
-      "name": "Bitwise XOR and assignment operator",
-      "not-implemented": true
-    },
-    "bitwise_xnor": {
-      "name": "Bitwise XNOR operator",
-      "not-implemented": true
-    },
-    "bitwise_xnor_assignment": {
-      "name": "Bitwise XNOR and assignment operator",
-      "not-implemented": true
-    },
-    "left_shift": {
-      "name": "Left shift bitwise operator",
-      "code": [
-        "a << b"
-      ]
-    },
-    "left_shift_assignment": {
-      "name": "Left shift assignment operator",
-      "not-implemented": true
-    },
-    "right_shift": {
-      "name": "Right shift bitwise operator",
-      "code": [
-        "a >> b"
-      ]
-    },
-    "right_shift_assignment": {
-      "name": "Right shift assignment operator",
-      "not-implemented": true
-    },
-    "ternary": {
-      "name": "Ternary operator",
-      "not-implemented": true
-    },
-    "null_forgiving": {
-      "name": "Null forgiving operator",
-      "not-implemented": true
-    }
-  }
+{
+  "meta": {
+    "language": "lua",
+    "language_name": "Lua",
+    "structure": "operators",
+    "language_version": "5.1"
+  },
+  "concepts": {
+    "addition": {
+      "name": "Addition operator",
+      "code": [
+        "a + b"
+      ]
+    },
+    "addition_assignment": {
+      "name": "Addition and assignment operator",
+      "not-implemented": true
+    },
+    "subtraction": {
+      "name": "Subtraction operator",
+      "code": [
+        "a - b"
+      ]
+    },
+    "subtraction_assignment": {
+      "name": "Subtraction and assignment operator",
+      "not-implemented": true
+    },
+    "multiplication": {
+      "name": "Multiplication operator",
+      "code": [
+        "a * b"
+      ]
+    },
+    "multiplication_assignment": {
+      "name": "Multiplication and assignment operator",
+      "not-implemented": true
+    },
+    "division": {
+      "name": "Division operator",
+      "code": [
+        "a / b"
+      ]
+    },
+    "division_assignment": {
+      "name": "Division and assignment operator",
+      "not-implemented": true
+    },
+    "integer_division": {
+      "name": "Integer division operator",
+      "not-implemented": true
+    },
+    "integer_division_assignment": {
+      "name": "Integer division and assignment operator",
+      "not-implemented": true
+    },
+    "modulus": {
+      "name": "Modulus (remainder) operator",
+      "code": [
+        "a % b"
+      ]
+    },
+    "modulus_assignment": {
+      "name": "Modulus and assignment operator",
+      "not-implemented": true
+    },
+    "unary_plus": {
+      "name": "Unary plus operator",
+      "not-implemented": true
+    },
+    "unary_minus": {
+      "name": "Unary minus operator",
+      "not-implemented": true
+    },
+    "increment": {
+      "name": "Increment (add 1) operator",
+      "not-implemented": true
+    },
+    "decrement": {
+      "name": "Decrement (subtract 1) operator",
+      "not-implemented": true
+    },
+    "exponential": {
+      "name": "Exponential operator",
+      "code": [
+        "a ^ b"
+      ]
+    },
+    "factorial": {
+      "name": "Factorial operator",
+      "not-implemented": true
+    },
+    "absolute_value": {
+      "name": "Absolute value operator",
+      "code": [
+        "math.abs(a)"
+      ]
+    },
+    "percentage": {
+      "name": "Percentage operator",
+      "not-implemented": true
+    },
+    "equal_to": {
+      "name": "Equality operator",
+      "code": [
+        "a == b"
+      ]
+    },
+    "not_equal_to": {
+      "name": "Not equal to operator",
+      "code": [
+        "a ~= b"
+      ]
+    },
+    "less_than": {
+      "name": "Less than operator",
+      "code": [
+        "a < b"
+      ]
+    },
+    "less_than_or_equal_to": {
+      "name": "Less than or equal to operator",
+      "code": [
+        "a <= b"
+      ]
+    },
+    "greater_than": {
+      "name": "Greater than operator",
+      "code": [
+        "a > b"
+      ]
+    },
+    "greater_than_or_equal_to": {
+      "name": "Greater than or equal to operator",
+      "code": [
+        "a >= b"
+      ]
+    },
+    "null_coalescing": {
+      "name": "Null coalescing operator",
+      "not-implemented": true
+    },
+    "is": {
+      "name": "Is operator",
+      "not-implemented": true
+    },
+    "is_not": {
+      "name": "Is not operator",
+      "not-implemented": true
+    },
+    "logical_and": {
+      "name": "Logical AND operator",
+      "code": [
+        "a and b"
+      ]
+    },
+    "logical_or": {
+      "name": "Logical OR operator",
+      "code": [
+        "a or b"
+      ]
+    },
+    "logical_not": {
+      "name": "Logical NOT operator",
+      "code": [
+        "not [condition]"
+      ]
+    },
+    "bitwise_and": {
+      "name": "Bitwise AND operator",
+      "code": [
+        "a & b"
+      ]
+    },
+    "bitwise_and_assignment": {
+      "name": "Bitwise AND and assignment operator",
+      "not-implemented": true
+    },
+    "bitwise_or": {
+      "name": "Bitwise OR operator",
+      "code": [
+        "a | b"
+      ]
+    },
+    "bitwise_or_assignment": {
+      "name": "Bitwise OR and assignment operator",
+      "not-implemented": true
+    },
+    "bitwise_not": {
+      "name": "Bitwise NOT operator",
+      "code": [
+        "~a"
+      ]
+    },
+    "not_assignment": {
+      "name": "Bitwise NOT and assignment operator",
+      "not-implemented": true
+    },
+    "bitwise_xor": {
+      "name": "Bitwise XOR operator",
+      "not-implemented": true
+    },
+    "bitwise_xor_assignment": {
+      "name": "Bitwise XOR and assignment operator",
+      "not-implemented": true
+    },
+    "bitwise_xnor": {
+      "name": "Bitwise XNOR operator",
+      "not-implemented": true
+    },
+    "bitwise_xnor_assignment": {
+      "name": "Bitwise XNOR and assignment operator",
+      "not-implemented": true
+    },
+    "left_shift": {
+      "name": "Left shift bitwise operator",
+      "code": [
+        "a << b"
+      ]
+    },
+    "left_shift_assignment": {
+      "name": "Left shift assignment operator",
+      "not-implemented": true
+    },
+    "right_shift": {
+      "name": "Right shift bitwise operator",
+      "code": [
+        "a >> b"
+      ]
+    },
+    "right_shift_assignment": {
+      "name": "Right shift assignment operator",
+      "not-implemented": true
+    },
+    "ternary": {
+      "name": "Ternary operator",
+      "not-implemented": true
+    },
+    "null_forgiving": {
+      "name": "Null forgiving operator",
+      "not-implemented": true
+    }
+  }
 }
\ No newline at end of file
diff --git a/web/thesauruses/lua/5/queues_stacks.json b/web/thesauruses/langs/lua/5/queues_stacks.json
similarity index 96%
rename from web/thesauruses/lua/5/queues_stacks.json
rename to web/thesauruses/langs/lua/5/queues_stacks.json
index 81676de46..3d2167bd6 100644
--- a/web/thesauruses/lua/5/queues_stacks.json
+++ b/web/thesauruses/langs/lua/5/queues_stacks.json
@@ -1,311 +1,311 @@
-{
-  "meta": {
-    "language": "lua",
-    "language_name": "Lua",
-    "structure": "queues_stacks",
-    "language_version": "5.1"
-  },
-  "concepts": {
-    "simple_queue_import_statement": {
-      "name": "Import statement to add simple queue",
-      "not-implemented": "true"
-    },
-    "simple_queue_data_type": {
-      "name": "Queue data type name",
-      "not-implemented": "true",
-      "comment":"Table can be used to implement a queue. "
-    },
-    "simple_queue_create_statement": {
-      "name": "Create a queue",
-      "code": [
-        "local queue = {}"
-      ]
-    },
-    "simple_queue_create_copy_statement": {
-      "name": "Create a queue from existing queue",
-      "not-implemented": "true"
-    },
-    "simple_queue_create_copy_from_list_statement": {
-      "name": "Create a queue from a list of items",
-      "not-implemented": "true"
-    },
-    "simple_queue_destroy_statement": {
-      "name": "Destroy/delete a queue",
-      "code": [
-        "queue = nil"
-      ]
-    },
-    "simple_queue_data_structure": {
-      "name": "Data structure that backs the simple queue",
-      "not-implemented": "true"
-    },
-    "circular_queue_import_statement": {
-      "name": "Import statement to add circular queue",
-      "not-implemented": "true"
-    },
-    "circular_queue_data_type": {
-      "name": "Queue data type name",
-      "not-implemented": "true"
-    },
-    "circular_queue_create_statement": {
-      "name": "Create a queue",
-      "not-implemented": "true"
-    },
-    "circular_queue_create_copy_statement": {
-      "name": "Create a queue from existing queue",
-      "not-implemented": "true"
-    },
-    "circular_queue_create_copy_from_list_statement": {
-      "name": "Create a queue from a list of items",
-      "not-implemented": "true"
-    },
-    "circular_queue_destroy_statement": {
-      "name": "Destroy/delete a queue",
-      "not-implemented": "true"
-    },
-    "circular_queue_data_structure": {
-      "name": "Data structure that backs the simple queue",
-      "not-implemented": "true"
-    },
-    "priority_queue_import_statement": {
-      "name": "Import statement to add priority queue",
-      "not-implemented": "true"
-    },
-    "priority_queue_data_type": {
-      "name": "Queue data type name",
-      "not-implemented": "true"
-    },
-    "priority_queue_create_statement": {
-      "name": "Create a queue",
-      "not-implemented": "true"
-    },
-    "priority_queue_create_copy_statement": {
-      "name": "Create a queue from existing queue",
-      "not-implemented": "true"
-    },
-    "priority_queue_create_copy_from_list_statement": {
-      "name": "Create a queue from a list of items",
-      "not-implemented": "true"
-    },
-    "priority_queue_destroy_statement": {
-      "name": "Destroy/delete a queue",
-      "not-implemented": "true"
-    },
-    "priority_queue_data_structure": {
-      "name": "Data structure that backs the simple queue",
-      "not-implemented": "true"
-    },
-    "double_ended_queue_import_statement": {
-      "name": "Import statement to add double-ended queue",
-      "not-implemented": "true"
-    },
-    "double_ended_queue_data_type": {
-      "name": "Queue data type name",
-      "not-implemented": "true"
-    },
-    "double_ended_queue_create_statement": {
-      "name": "Create a queue",
-      "not-implemented": "true"
-    },
-    "double_ended_queue_create_copy_statement": {
-      "name": "Create a queue from existing queue",
-      "not-implemented": "true"
-    },
-    "double_ended_queue_create_copy_from_list_statement": {
-      "name": "Create a queue from a list",
-      "not-implemented": "true"
-    },
-    "double_ended_queue_destroy_statement": {
-      "name": "Destroy/delete a queue",
-      "not-implemented": "true"
-    },
-    "double_ended_queue_data_structure": {
-      "name": "Data structure that backs the simple queue",
-      "not-implemented": "true"
-    },
-    "stack_import_statement": {
-      "name": "Import statement to add stacks",
-      "not-implemented": "true"
-    },
-    "stack_data_type": {
-      "name": "Stack data type name",
-      "not-implemented": "true",
-      "comment":"Table can be used to implement a stack."
-    },
-    "stack_create_statement": {
-      "name": "Create a stack",
-      "code": [
-        "local stack = {}"
-      ]
-    },
-    "stack_create_copy_statement": {
-      "name": "Create a stack from existing stack",
-      "not-implemented": "true"
-    },
-    "stack_create_copy_from_list_statement": {
-      "name": "Create a stack from a list",
-      "not-implemented": "true"
-    },
-    "stack_destroy_statement": {
-      "name": "Destroy/delete a stack",
-      "code": [
-        "stack = nil"
-      ]
-    },
-    "stack_data_structure": {
-      "name": "Data structure that backs the simple queue",
-      "not-implemented": "true"
-    },
-    "queue_enqueue_an_item": {
-      "name": "Enqueue an item (add to end)",
-      "code": [
-        "table.insert(queue,item_to_add)"
-      ]
-    },
-    "queue_enqueue_priority_item": {
-      "name": "Enqueue a high priority item (add to end of priority queue)",
-      "not-implemented": "true"
-    },
-    "queue_enqueue_from_list": {
-      "name": "Enqueue items from a list into queue (add list to end)",
-      "not-implemented": "true"
-    },
-    "queue_enqueue_priority_from_list": {
-      "name": "Enqueue priority items from a list (add list to end of priority queue)",
-      "not-implemented": "true"
-    },
-    "queue_dequeue_return_an_item": {
-      "name": "Dequeue an item (remove from front, return item)",
-      "code": [
-        "table.remove(queue,item_to_remove)"
-      ]
-    },
-    "queue_dequeue_delete_an_item": {
-      "name": "Dequeue an item (remove from front, don't return)",
-      "not-implemented": "true"
-    },
-    "queue_peek_at_next_item": {
-      "name": "Look/peek at next available element (from front)",
-      "code": [
-        "queue[1]"
-      ],
-      "comment":" Lua uses 1-based indexing, which is different from some other programming languages like C, C++, and Java"
-    },
-    "queue_peek_at_last_item": {
-      "name": "Look/peek at last element (from back)",
-      "code": [
-        "queue[#queue]"
-      ]
-    },
-    "queue_duplicate_next_item": {
-      "name": "Duplicate next item",
-      "not-implemented": "true"
-    },
-    "queue_swap_two_items": {
-      "name": "Swap two items",
-      "not-implemented": "true"
-    },
-    "queue_get_size": {
-      "name": "Get size (number of items) in the queue",
-      "code": [
-        "#queue"
-      ]
-    },
-    "queue_get_capacity": {
-      "name": "Check capacity of queue",
-      "code": [
-        "#queue"
-      ]
-    },
-    "queue_export_to_list": {
-      "name": "Export a list of all queue items",
-      "not-implemented": "true"
-    },
-    "queue_clear_all": {
-      "name": "Clear out all queue items",
-      "code": [
-        "queue = nil"
-      ]
-    },
-    "stack_push_item": {
-      "name": "Push an item (add to top)",
-      "code": [
-        "table.insert(stack,item_to_add)"
-      ]
-    },
-    "stack_pop_return_item": {
-      "name": "Pop an item (remove from top, return item)",
-      "code": [
-        "table.remove(stack,item_to_remove)"
-      ]
-    },
-    "stack_pop_delete_item": {
-      "name": "Pop an item (remove from top, don't return)",
-      "not-implemented": "true"
-    },
-    "stack_peek_at_next_item": {
-      "name": "Look/peek at next element (from top)",
-      "not-implemented": "true"
-    },
-    "stack_peek_at_last_item": {
-      "name": "Look/peek at last element (from bottom)",
-      "code": [
-        "stack[#stack]"
-      ]
-    },
-    "stack_duplicate_next_item": {
-      "name": "Duplicate top item",
-      "not-implemented": "true"
-    },
-    "stack_swap_two_items": {
-      "name": "Swap two items",
-      "not-implemented": "true"
-    },
-    "stack_get_size": {
-      "name": "Get size (number of items) on the stack",
-      "code": [
-        "#stack"
-      ]
-    },
-    "stack_get_capacity": {
-      "name": "Check capacity of stack",
-      "code": [
-        "#stack"
-      ]
-    },
-    "stack_export_to_list": {
-      "name": "Export a list of all stack items",
-      "not-implemented": "true"
-    },
-    "stack_clear_all": {
-      "name": "Clear all stack items",
-      "code": [
-        "stack = nil"
-      ]
-    },
-    "iterate_pointer_data_type": {
-      "name": "Data type of a iterator pointer",
-      "not-implemented": "true"
-    },
-    "iterate_create_pointer": {
-      "name": "Create iterator",
-      "not-implemented": "true"
-    },
-    "iterate_move_to_next_item": {
-      "name": "Move pointer to next item",
-      "not-implemented": "true"
-    },
-    "iterate_move_to_previous_item": {
-      "name": "Move pointer to previous item",
-      "not-implemented": "true"
-    },
-    "iterate_move_to_beginning": {
-      "name": "Move pointer to beginning of queue/stack",
-      "not-implemented": "true"
-    },
-    "iterate_move_to_end": {
-      "name": "Move pointer to end of queue/stack",
-      "not-implemented": "true"
-    }
-  }
-}
+{
+  "meta": {
+    "language": "lua",
+    "language_name": "Lua",
+    "structure": "queues_stacks",
+    "language_version": "5.1"
+  },
+  "concepts": {
+    "simple_queue_import_statement": {
+      "name": "Import statement to add simple queue",
+      "not-implemented": "true"
+    },
+    "simple_queue_data_type": {
+      "name": "Queue data type name",
+      "not-implemented": "true",
+      "comment":"Table can be used to implement a queue. "
+    },
+    "simple_queue_create_statement": {
+      "name": "Create a queue",
+      "code": [
+        "local queue = {}"
+      ]
+    },
+    "simple_queue_create_copy_statement": {
+      "name": "Create a queue from existing queue",
+      "not-implemented": "true"
+    },
+    "simple_queue_create_copy_from_list_statement": {
+      "name": "Create a queue from a list of items",
+      "not-implemented": "true"
+    },
+    "simple_queue_destroy_statement": {
+      "name": "Destroy/delete a queue",
+      "code": [
+        "queue = nil"
+      ]
+    },
+    "simple_queue_data_structure": {
+      "name": "Data structure that backs the simple queue",
+      "not-implemented": "true"
+    },
+    "circular_queue_import_statement": {
+      "name": "Import statement to add circular queue",
+      "not-implemented": "true"
+    },
+    "circular_queue_data_type": {
+      "name": "Queue data type name",
+      "not-implemented": "true"
+    },
+    "circular_queue_create_statement": {
+      "name": "Create a queue",
+      "not-implemented": "true"
+    },
+    "circular_queue_create_copy_statement": {
+      "name": "Create a queue from existing queue",
+      "not-implemented": "true"
+    },
+    "circular_queue_create_copy_from_list_statement": {
+      "name": "Create a queue from a list of items",
+      "not-implemented": "true"
+    },
+    "circular_queue_destroy_statement": {
+      "name": "Destroy/delete a queue",
+      "not-implemented": "true"
+    },
+    "circular_queue_data_structure": {
+      "name": "Data structure that backs the simple queue",
+      "not-implemented": "true"
+    },
+    "priority_queue_import_statement": {
+      "name": "Import statement to add priority queue",
+      "not-implemented": "true"
+    },
+    "priority_queue_data_type": {
+      "name": "Queue data type name",
+      "not-implemented": "true"
+    },
+    "priority_queue_create_statement": {
+      "name": "Create a queue",
+      "not-implemented": "true"
+    },
+    "priority_queue_create_copy_statement": {
+      "name": "Create a queue from existing queue",
+      "not-implemented": "true"
+    },
+    "priority_queue_create_copy_from_list_statement": {
+      "name": "Create a queue from a list of items",
+      "not-implemented": "true"
+    },
+    "priority_queue_destroy_statement": {
+      "name": "Destroy/delete a queue",
+      "not-implemented": "true"
+    },
+    "priority_queue_data_structure": {
+      "name": "Data structure that backs the simple queue",
+      "not-implemented": "true"
+    },
+    "double_ended_queue_import_statement": {
+      "name": "Import statement to add double-ended queue",
+      "not-implemented": "true"
+    },
+    "double_ended_queue_data_type": {
+      "name": "Queue data type name",
+      "not-implemented": "true"
+    },
+    "double_ended_queue_create_statement": {
+      "name": "Create a queue",
+      "not-implemented": "true"
+    },
+    "double_ended_queue_create_copy_statement": {
+      "name": "Create a queue from existing queue",
+      "not-implemented": "true"
+    },
+    "double_ended_queue_create_copy_from_list_statement": {
+      "name": "Create a queue from a list",
+      "not-implemented": "true"
+    },
+    "double_ended_queue_destroy_statement": {
+      "name": "Destroy/delete a queue",
+      "not-implemented": "true"
+    },
+    "double_ended_queue_data_structure": {
+      "name": "Data structure that backs the simple queue",
+      "not-implemented": "true"
+    },
+    "stack_import_statement": {
+      "name": "Import statement to add stacks",
+      "not-implemented": "true"
+    },
+    "stack_data_type": {
+      "name": "Stack data type name",
+      "not-implemented": "true",
+      "comment":"Table can be used to implement a stack."
+    },
+    "stack_create_statement": {
+      "name": "Create a stack",
+      "code": [
+        "local stack = {}"
+      ]
+    },
+    "stack_create_copy_statement": {
+      "name": "Create a stack from existing stack",
+      "not-implemented": "true"
+    },
+    "stack_create_copy_from_list_statement": {
+      "name": "Create a stack from a list",
+      "not-implemented": "true"
+    },
+    "stack_destroy_statement": {
+      "name": "Destroy/delete a stack",
+      "code": [
+        "stack = nil"
+      ]
+    },
+    "stack_data_structure": {
+      "name": "Data structure that backs the simple queue",
+      "not-implemented": "true"
+    },
+    "queue_enqueue_an_item": {
+      "name": "Enqueue an item (add to end)",
+      "code": [
+        "table.insert(queue,item_to_add)"
+      ]
+    },
+    "queue_enqueue_priority_item": {
+      "name": "Enqueue a high priority item (add to end of priority queue)",
+      "not-implemented": "true"
+    },
+    "queue_enqueue_from_list": {
+      "name": "Enqueue items from a list into queue (add list to end)",
+      "not-implemented": "true"
+    },
+    "queue_enqueue_priority_from_list": {
+      "name": "Enqueue priority items from a list (add list to end of priority queue)",
+      "not-implemented": "true"
+    },
+    "queue_dequeue_return_an_item": {
+      "name": "Dequeue an item (remove from front, return item)",
+      "code": [
+        "table.remove(queue,item_to_remove)"
+      ]
+    },
+    "queue_dequeue_delete_an_item": {
+      "name": "Dequeue an item (remove from front, don't return)",
+      "not-implemented": "true"
+    },
+    "queue_peek_at_next_item": {
+      "name": "Look/peek at next available element (from front)",
+      "code": [
+        "queue[1]"
+      ],
+      "comment":" Lua uses 1-based indexing, which is different from some other programming languages like C, C++, and Java"
+    },
+    "queue_peek_at_last_item": {
+      "name": "Look/peek at last element (from back)",
+      "code": [
+        "queue[#queue]"
+      ]
+    },
+    "queue_duplicate_next_item": {
+      "name": "Duplicate next item",
+      "not-implemented": "true"
+    },
+    "queue_swap_two_items": {
+      "name": "Swap two items",
+      "not-implemented": "true"
+    },
+    "queue_get_size": {
+      "name": "Get size (number of items) in the queue",
+      "code": [
+        "#queue"
+      ]
+    },
+    "queue_get_capacity": {
+      "name": "Check capacity of queue",
+      "code": [
+        "#queue"
+      ]
+    },
+    "queue_export_to_list": {
+      "name": "Export a list of all queue items",
+      "not-implemented": "true"
+    },
+    "queue_clear_all": {
+      "name": "Clear out all queue items",
+      "code": [
+        "queue = nil"
+      ]
+    },
+    "stack_push_item": {
+      "name": "Push an item (add to top)",
+      "code": [
+        "table.insert(stack,item_to_add)"
+      ]
+    },
+    "stack_pop_return_item": {
+      "name": "Pop an item (remove from top, return item)",
+      "code": [
+        "table.remove(stack,item_to_remove)"
+      ]
+    },
+    "stack_pop_delete_item": {
+      "name": "Pop an item (remove from top, don't return)",
+      "not-implemented": "true"
+    },
+    "stack_peek_at_next_item": {
+      "name": "Look/peek at next element (from top)",
+      "not-implemented": "true"
+    },
+    "stack_peek_at_last_item": {
+      "name": "Look/peek at last element (from bottom)",
+      "code": [
+        "stack[#stack]"
+      ]
+    },
+    "stack_duplicate_next_item": {
+      "name": "Duplicate top item",
+      "not-implemented": "true"
+    },
+    "stack_swap_two_items": {
+      "name": "Swap two items",
+      "not-implemented": "true"
+    },
+    "stack_get_size": {
+      "name": "Get size (number of items) on the stack",
+      "code": [
+        "#stack"
+      ]
+    },
+    "stack_get_capacity": {
+      "name": "Check capacity of stack",
+      "code": [
+        "#stack"
+      ]
+    },
+    "stack_export_to_list": {
+      "name": "Export a list of all stack items",
+      "not-implemented": "true"
+    },
+    "stack_clear_all": {
+      "name": "Clear all stack items",
+      "code": [
+        "stack = nil"
+      ]
+    },
+    "iterate_pointer_data_type": {
+      "name": "Data type of a iterator pointer",
+      "not-implemented": "true"
+    },
+    "iterate_create_pointer": {
+      "name": "Create iterator",
+      "not-implemented": "true"
+    },
+    "iterate_move_to_next_item": {
+      "name": "Move pointer to next item",
+      "not-implemented": "true"
+    },
+    "iterate_move_to_previous_item": {
+      "name": "Move pointer to previous item",
+      "not-implemented": "true"
+    },
+    "iterate_move_to_beginning": {
+      "name": "Move pointer to beginning of queue/stack",
+      "not-implemented": "true"
+    },
+    "iterate_move_to_end": {
+      "name": "Move pointer to end of queue/stack",
+      "not-implemented": "true"
+    }
+  }
+}
diff --git a/web/thesauruses/lua/5/strings.json b/web/thesauruses/langs/lua/5/strings.json
similarity index 97%
rename from web/thesauruses/lua/5/strings.json
rename to web/thesauruses/langs/lua/5/strings.json
index dff07d1e1..aa04e8191 100644
--- a/web/thesauruses/lua/5/strings.json
+++ b/web/thesauruses/langs/lua/5/strings.json
@@ -1,286 +1,286 @@
-{
-    "meta": {
-      "language": "lua",
-      "language_name": "Lua",
-      "structure": "strings",
-      "language_version": "5.3.6"
-    },
-    "concepts": {
-      "is_primitive_or_not": {
-        "name": "Is this a built-in type in this language?",
-        "code": "Yes"
-      },
-      "import": {
-        "name": "Import the string class",
-        "not-implemented": true,
-        "comment": "Does not require to import as it is in builtins"
-      },
-      "default_string_byte_encoding": {
-        "name": "Default byte encoding (ex: ASCII UTF-8, UTF-16, etc.)",
-        "not-implemented": true
-      },
-      "create_new_string": {
-        "name": "Create new string",
-        "code": "str1 = 'New string Example1' \nstr2 = \"New string Example2\""
-      },
-  
-      "create_multiline_string": {
-        "name": "Create new multi-line string",
-        "code": "[['Multiline string']]"
-      },
-      "assign_new_string": {
-        "name": "Assign string from another string",
-        "code": "a = 'a'\nb = a"
-      },
-      "destroy_string": {
-        "name": "Destroy string",
-        "not-implemented": "true"
-      },
-      "length_of_string": {
-        "name": "Length of string",
-        "code": [
-            "str = 'codethesaur.us'",
-            "str:len()",
-            "string.len(str)"
-        ]
-
-      },
-      "max_length_of_string": {
-        "name": "Maximum length of string",
-        "not-implemented": true
-      },
-      "clear_string": {
-        "name": "Clear/empty string",
-        "code": "a = 'a'\na=''"
-      },
-      "is_empty": {
-        "name": "Is string empty?",
-        "code": [
-            "str = ''",
-            "if (str == nil or str == '') then",
-            "    print('str is empty')",
-            "end"
-        ]
-      },
-      
-      "concatenate_two_strings": {
-        "name": "Concatenate/join two strings",
-        "code":"str1 = 'Hello'\nstr2 = ' World'\nprint(str1..str2)"
-      },
-      "concatenate_many_strings": {
-        "name": "Concatenate/join many strings",
-        "code": [
-                    "str = 'Hello'\nvar2 = ' World '\nvar3 = str..var2\nprint(str..var2..var3)",
-                    "\ntab = {'codethesaur.us',' is',' great',' learning tool!'}\nprint(table.concat(tab))"
-                ],
-        "comment":"We can concat many number of string using '..' oprator"
-      },
-      "is_all_alphabetical": {
-        "name": "Is string all alphabetical characters?",
-        "not-implemented": "true"
-      },
-      "is_all_numerical": {
-        "name": "Is string all numerical characters?",
-        "not-implemented": "true"
-      },
-      "is_all_alphanumeric": {
-        "name": "Is string all alphanumeric characters?",
-        "not-implemented": "true"
-      },
-      "is_decimal": {
-        "name": "Is string a decimal number?",
-        "not-implemented": "true"
-      },
-      "is_all_whitespaces": {
-        "name": "Is string all whitespace characters?",
-        "not-implemented": "true"
-      },
-      "is_all_uppercase": {
-        "name": "Is string all uppercase characters?",
-        "not-implemented": "true"
-      },
-      "is_all_lowercase": {
-        "name": "Is string all lowercase characters?",
-        "not-implemented": "true"
-      },
-      "is_in_titlecase": {
-        "name": "Is string formatted in title case?",
-        "not-implemented": "true"
-      },
-      "does_substring_exist": {
-        "name": "Does a substring exist in a string?",
-        "code":"str = 'Hello'\ni,i2 = string.find(str,'lo')\nprint(i,i2)",
-        "comment":"first variable stores index+1 of first string character and second variable stores index of last character If sub-string or occurrence is not found then it returns 'nill'"
-      },
-      "find_start_index_of_substring": {
-        "name": "Find index of where a substring starts",
-        "code": "str = 'Hello'\nstart,_ = string.find(str,'lo')\nprint(start)",
-        "comment":"If we do not need of index of end character of sub-string then we can use '_'(underscore) instead assigning to a variable" 
-      },
-      "find_start_index_of_additional_substring": {
-        "name": "Find index of an additional substring (or starting at another index)",
-        "code": "str = 'Hello Hello'\ni = string.find(str,'ello')\ni2 = string.find(str,'ello',i+1)\nprint(i,i2)"
-      },
-      "find_start_index_of_substring_from_end": {
-        "name": "Find substring index starting at end",
-        "not-implemented": true
-      },
-      "count_occurrences_of_substring": {
-        "name": "Find number of occurences of a substring",
-        "not-implemented": true
-      },
-      "get_leftmost_characters": {
-        "name": "Get a specified number of characters from the left",
-        "code": "str = 'Hello'\nlen = string.len(str)\ni = string.sub(str,len,len)\nprint(i)"
-      },
-      "get_rightmost_characters": {
-        "name": "Get a specified number of characters from the right",
-        "code": "str = 'Hello'\ni = string.sub(str,1,1)\nprint(i)"
-      },
-      "get_substring_from_start_and_end_index": {
-        "name": "Return a substring from a string based on starting and ending indices",
-        "not-implemented": true
-      },
-      "get_substring_from_start_index_and_length": {
-        "name": "Return a substring from a string based on starting index and size of substring",
-        "code": "str = 'Hello'\nlen = string.len(str)\ni = string.sub(str,1,len)\nprint(i)"
-      },
-      "convert_to_uppercase": {
-        "name": "Convert string to all uppercase",
-        "code": "str = 'Hello'\nVAR = string.upper(str)\nprint(str)",
-        "comment":"'string.upper' function does not convert to uppercase in original string rather than it return a new uppercased string which we have to store in variable"
-      },
-      "convert_to_lowercase": {
-        "name": "Convert string to all lowercase",
-        "code": "str = 'Hello'\nVAR = string.lower(str)\nprint(str)",
-        "comment":"'string.lower' function does not convert to lowercase in original string rather than it return a new lowercased string which we have to store in variable"
-      },
-      "convert_to_title_case": {
-        "name": "Convert string to title case",
-        "not-implemented": true
-      },
-      "capitalize_string": {
-        "name": "Capitalize first letter of a string",
-        "not-implemented": true
-      },
-      "remove_whitespace": {
-        "name": "Remove all whitespaces from string",
-        "not-implemented": true
-      },
-      "replace_substring": {
-        "name": "Replace a substring with another string",
-        "code": "str = 'Welcome to lua'\nvar = string.gsub(str,'lua','codethesaurus')\nprint(str)"
-      },
-      "replace_all_substring": {
-        "name": "Replace all substring matches with another string",
-        "code": "str = 'Welcome to lua,lua is great.'\nvar = string.gsub(str,'lua','codethesaurus')\nprint(str)"
-      },
-      "split_at_index": {
-        "name": "Split string into a list of strings at a given index",
-        "not-implemented": true
-      },
-      "split_at_newlines": {
-        "name": "Split string into a list of strings at every new line character",
-        "not-implemented": true
-      },
-      "split_at_substring": {
-        "name": "Split string by locating all substrings",
-        "not-implemented": true
-      },
-      "merge_lists_into_string": {
-        "name": "Merge a list of strings into one string",
-        "code": "list = {'codethesaur ','is ','great learning ','tool'}\nstr = table.concat(list)\nprint(str)"
-      },
-      "encode_html_entities": {
-        "name": "Encode HTML entities in a string (ex: \u2122 to &trade;)",
-        "not-implemented": true
-      },
-      "decode_html_entities": {
-        "name": "Decode HTML entitles into characters",
-        "not-implemented": true
-      },
-      "encode_url_percent": {
-        "name": "Encode URL percent encoding into string (ex: ' ' to %20)",
-        "not-implemented": true
-      },
-      "decode_url_percent": {
-        "name": "Decode URL percent encoding",
-        "not-implemented": true
-      },
-      "encode_to_base64": {
-        "name": "Encode string into Base64 format",
-        "not-implemented": true
-      },
-      "decode_from_base64": {
-        "name": "Decode string from Base64 format",
-        "not-implemented": true
-      },
-      "format_string_function": {
-        "name": "Function to format a string",
-        "code": "tool = 'codethesaurus'\nformated = string.format('The great learning tool %s',tool)\nprint(formated)"
-      },
-      "parameter_format_in_order": {
-        "name": "Parameter used in format function if they're used in order",
-        "code": "string.format(formatstring, ...)"
-      },
-      "parameter_format_numerical": {
-        "name": "Parameter used in format function if they're numerically numbered",
-        "not-implemented": true
-      },
-      "parameter_format_by_name": {
-        "name": "Paramater used in format function if they're named variables",
-        "not-implemented": true
-      },
-      "format_as_integer": {
-        "name": "Format parameter as an integer",
-        "code": "int   = 12\nprint(string.format('This is integer: %d',int))",
-        "comment":"If we take value of variable as string(EX: int = '12') instead integer/number, It will work too!"
-      },
-      "format_as_decimal": {
-        "name": "Format parameter as a decimal number",
-        "not-implemented": true
-      },
-      "format_as_fixed_decimal": {
-        "name": "Format parameter as a fixed-point decimal number",
-        "code": "num = 12.53232\nprint(string.format('%0.2f',num))",
-        "comment":"Output: 12.53\n%0.[N]f [where N is how many decimal you want after (.)point]"
-      },
-      "format_as_currency": {
-        "name": "Format parameter as a currency number",
-        "not-implemented": true
-      },
-      "format_as_percentage": {
-        "name": "Format parameter as a percentage number",
-        "not-implemented": true
-      },
-      "format_number_with_separators": {
-        "name": "Format number with thousand separators",
-        "not-implemented": true
-      },
-      "format_number_with_positive_negative_sign": {
-        "name": "Format number with positive/negative signs",
-        "code": "num = 12\nprint(string.format('%+d',num))"
-      },
-      "format_number_in_scientific_notation_little_e": {
-        "name": "Format number with scientific notation with 'e'",
-        "code": "num = 12645893253232\nprint(string.format('%e',num))"
-      },
-      "format_number_in_scientific_notation_big_e": {
-        "name": "Format number with scientific notation with 'E'",
-        "code": "num = 12645893253232\nprint(string.format('%E',num))"
-      },
-      "format_number_in_binary": {
-        "name": "Format number into binary",
-        "not-implemented": true
-      },
-      "format_number_in_octal": {
-        "name": "Format number into octal",
-        "code": "num = 8\nprint(string.format('%o',num))"
-      },
-      "format_number_in_hexadecimal": {
-        "name": "Format number into hexadecimal",
-        "code": "num = 10\nprint(string.format('%x',num))",
-        "comment":"%x for lowercase letters.\n%X upper letters."
-      }
-    }
-  }
+{
+    "meta": {
+      "language": "lua",
+      "language_name": "Lua",
+      "structure": "strings",
+      "language_version": "5.3.6"
+    },
+    "concepts": {
+      "is_primitive_or_not": {
+        "name": "Is this a built-in type in this language?",
+        "code": "Yes"
+      },
+      "import": {
+        "name": "Import the string class",
+        "not-implemented": true,
+        "comment": "Does not require to import as it is in builtins"
+      },
+      "default_string_byte_encoding": {
+        "name": "Default byte encoding (ex: ASCII UTF-8, UTF-16, etc.)",
+        "not-implemented": true
+      },
+      "create_new_string": {
+        "name": "Create new string",
+        "code": "str1 = 'New string Example1' \nstr2 = \"New string Example2\""
+      },
+  
+      "create_multiline_string": {
+        "name": "Create new multi-line string",
+        "code": "[['Multiline string']]"
+      },
+      "assign_new_string": {
+        "name": "Assign string from another string",
+        "code": "a = 'a'\nb = a"
+      },
+      "destroy_string": {
+        "name": "Destroy string",
+        "not-implemented": "true"
+      },
+      "length_of_string": {
+        "name": "Length of string",
+        "code": [
+            "str = 'codethesaur.us'",
+            "str:len()",
+            "string.len(str)"
+        ]
+
+      },
+      "max_length_of_string": {
+        "name": "Maximum length of string",
+        "not-implemented": true
+      },
+      "clear_string": {
+        "name": "Clear/empty string",
+        "code": "a = 'a'\na=''"
+      },
+      "is_empty": {
+        "name": "Is string empty?",
+        "code": [
+            "str = ''",
+            "if (str == nil or str == '') then",
+            "    print('str is empty')",
+            "end"
+        ]
+      },
+      
+      "concatenate_two_strings": {
+        "name": "Concatenate/join two strings",
+        "code":"str1 = 'Hello'\nstr2 = ' World'\nprint(str1..str2)"
+      },
+      "concatenate_many_strings": {
+        "name": "Concatenate/join many strings",
+        "code": [
+                    "str = 'Hello'\nvar2 = ' World '\nvar3 = str..var2\nprint(str..var2..var3)",
+                    "\ntab = {'codethesaur.us',' is',' great',' learning tool!'}\nprint(table.concat(tab))"
+                ],
+        "comment":"We can concat many number of string using '..' oprator"
+      },
+      "is_all_alphabetical": {
+        "name": "Is string all alphabetical characters?",
+        "not-implemented": "true"
+      },
+      "is_all_numerical": {
+        "name": "Is string all numerical characters?",
+        "not-implemented": "true"
+      },
+      "is_all_alphanumeric": {
+        "name": "Is string all alphanumeric characters?",
+        "not-implemented": "true"
+      },
+      "is_decimal": {
+        "name": "Is string a decimal number?",
+        "not-implemented": "true"
+      },
+      "is_all_whitespaces": {
+        "name": "Is string all whitespace characters?",
+        "not-implemented": "true"
+      },
+      "is_all_uppercase": {
+        "name": "Is string all uppercase characters?",
+        "not-implemented": "true"
+      },
+      "is_all_lowercase": {
+        "name": "Is string all lowercase characters?",
+        "not-implemented": "true"
+      },
+      "is_in_titlecase": {
+        "name": "Is string formatted in title case?",
+        "not-implemented": "true"
+      },
+      "does_substring_exist": {
+        "name": "Does a substring exist in a string?",
+        "code":"str = 'Hello'\ni,i2 = string.find(str,'lo')\nprint(i,i2)",
+        "comment":"first variable stores index+1 of first string character and second variable stores index of last character If sub-string or occurrence is not found then it returns 'nill'"
+      },
+      "find_start_index_of_substring": {
+        "name": "Find index of where a substring starts",
+        "code": "str = 'Hello'\nstart,_ = string.find(str,'lo')\nprint(start)",
+        "comment":"If we do not need of index of end character of sub-string then we can use '_'(underscore) instead assigning to a variable" 
+      },
+      "find_start_index_of_additional_substring": {
+        "name": "Find index of an additional substring (or starting at another index)",
+        "code": "str = 'Hello Hello'\ni = string.find(str,'ello')\ni2 = string.find(str,'ello',i+1)\nprint(i,i2)"
+      },
+      "find_start_index_of_substring_from_end": {
+        "name": "Find substring index starting at end",
+        "not-implemented": true
+      },
+      "count_occurrences_of_substring": {
+        "name": "Find number of occurences of a substring",
+        "not-implemented": true
+      },
+      "get_leftmost_characters": {
+        "name": "Get a specified number of characters from the left",
+        "code": "str = 'Hello'\nlen = string.len(str)\ni = string.sub(str,len,len)\nprint(i)"
+      },
+      "get_rightmost_characters": {
+        "name": "Get a specified number of characters from the right",
+        "code": "str = 'Hello'\ni = string.sub(str,1,1)\nprint(i)"
+      },
+      "get_substring_from_start_and_end_index": {
+        "name": "Return a substring from a string based on starting and ending indices",
+        "not-implemented": true
+      },
+      "get_substring_from_start_index_and_length": {
+        "name": "Return a substring from a string based on starting index and size of substring",
+        "code": "str = 'Hello'\nlen = string.len(str)\ni = string.sub(str,1,len)\nprint(i)"
+      },
+      "convert_to_uppercase": {
+        "name": "Convert string to all uppercase",
+        "code": "str = 'Hello'\nVAR = string.upper(str)\nprint(str)",
+        "comment":"'string.upper' function does not convert to uppercase in original string rather than it return a new uppercased string which we have to store in variable"
+      },
+      "convert_to_lowercase": {
+        "name": "Convert string to all lowercase",
+        "code": "str = 'Hello'\nVAR = string.lower(str)\nprint(str)",
+        "comment":"'string.lower' function does not convert to lowercase in original string rather than it return a new lowercased string which we have to store in variable"
+      },
+      "convert_to_title_case": {
+        "name": "Convert string to title case",
+        "not-implemented": true
+      },
+      "capitalize_string": {
+        "name": "Capitalize first letter of a string",
+        "not-implemented": true
+      },
+      "remove_whitespace": {
+        "name": "Remove all whitespaces from string",
+        "not-implemented": true
+      },
+      "replace_substring": {
+        "name": "Replace a substring with another string",
+        "code": "str = 'Welcome to lua'\nvar = string.gsub(str,'lua','codethesaurus')\nprint(str)"
+      },
+      "replace_all_substring": {
+        "name": "Replace all substring matches with another string",
+        "code": "str = 'Welcome to lua,lua is great.'\nvar = string.gsub(str,'lua','codethesaurus')\nprint(str)"
+      },
+      "split_at_index": {
+        "name": "Split string into a list of strings at a given index",
+        "not-implemented": true
+      },
+      "split_at_newlines": {
+        "name": "Split string into a list of strings at every new line character",
+        "not-implemented": true
+      },
+      "split_at_substring": {
+        "name": "Split string by locating all substrings",
+        "not-implemented": true
+      },
+      "merge_lists_into_string": {
+        "name": "Merge a list of strings into one string",
+        "code": "list = {'codethesaur ','is ','great learning ','tool'}\nstr = table.concat(list)\nprint(str)"
+      },
+      "encode_html_entities": {
+        "name": "Encode HTML entities in a string (ex: \u2122 to &trade;)",
+        "not-implemented": true
+      },
+      "decode_html_entities": {
+        "name": "Decode HTML entitles into characters",
+        "not-implemented": true
+      },
+      "encode_url_percent": {
+        "name": "Encode URL percent encoding into string (ex: ' ' to %20)",
+        "not-implemented": true
+      },
+      "decode_url_percent": {
+        "name": "Decode URL percent encoding",
+        "not-implemented": true
+      },
+      "encode_to_base64": {
+        "name": "Encode string into Base64 format",
+        "not-implemented": true
+      },
+      "decode_from_base64": {
+        "name": "Decode string from Base64 format",
+        "not-implemented": true
+      },
+      "format_string_function": {
+        "name": "Function to format a string",
+        "code": "tool = 'codethesaurus'\nformated = string.format('The great learning tool %s',tool)\nprint(formated)"
+      },
+      "parameter_format_in_order": {
+        "name": "Parameter used in format function if they're used in order",
+        "code": "string.format(formatstring, ...)"
+      },
+      "parameter_format_numerical": {
+        "name": "Parameter used in format function if they're numerically numbered",
+        "not-implemented": true
+      },
+      "parameter_format_by_name": {
+        "name": "Paramater used in format function if they're named variables",
+        "not-implemented": true
+      },
+      "format_as_integer": {
+        "name": "Format parameter as an integer",
+        "code": "int   = 12\nprint(string.format('This is integer: %d',int))",
+        "comment":"If we take value of variable as string(EX: int = '12') instead integer/number, It will work too!"
+      },
+      "format_as_decimal": {
+        "name": "Format parameter as a decimal number",
+        "not-implemented": true
+      },
+      "format_as_fixed_decimal": {
+        "name": "Format parameter as a fixed-point decimal number",
+        "code": "num = 12.53232\nprint(string.format('%0.2f',num))",
+        "comment":"Output: 12.53\n%0.[N]f [where N is how many decimal you want after (.)point]"
+      },
+      "format_as_currency": {
+        "name": "Format parameter as a currency number",
+        "not-implemented": true
+      },
+      "format_as_percentage": {
+        "name": "Format parameter as a percentage number",
+        "not-implemented": true
+      },
+      "format_number_with_separators": {
+        "name": "Format number with thousand separators",
+        "not-implemented": true
+      },
+      "format_number_with_positive_negative_sign": {
+        "name": "Format number with positive/negative signs",
+        "code": "num = 12\nprint(string.format('%+d',num))"
+      },
+      "format_number_in_scientific_notation_little_e": {
+        "name": "Format number with scientific notation with 'e'",
+        "code": "num = 12645893253232\nprint(string.format('%e',num))"
+      },
+      "format_number_in_scientific_notation_big_e": {
+        "name": "Format number with scientific notation with 'E'",
+        "code": "num = 12645893253232\nprint(string.format('%E',num))"
+      },
+      "format_number_in_binary": {
+        "name": "Format number into binary",
+        "not-implemented": true
+      },
+      "format_number_in_octal": {
+        "name": "Format number into octal",
+        "code": "num = 8\nprint(string.format('%o',num))"
+      },
+      "format_number_in_hexadecimal": {
+        "name": "Format number into hexadecimal",
+        "code": "num = 10\nprint(string.format('%x',num))",
+        "comment":"%x for lowercase letters.\n%X upper letters."
+      }
+    }
+  }
diff --git a/web/thesauruses/nim/1/classes.json b/web/thesauruses/langs/nim/1/classes.json
similarity index 100%
rename from web/thesauruses/nim/1/classes.json
rename to web/thesauruses/langs/nim/1/classes.json
diff --git a/web/thesauruses/nim/1/control_structures.json b/web/thesauruses/langs/nim/1/control_structures.json
similarity index 100%
rename from web/thesauruses/nim/1/control_structures.json
rename to web/thesauruses/langs/nim/1/control_structures.json
diff --git a/web/thesauruses/nim/1/data_types.json b/web/thesauruses/langs/nim/1/data_types.json
similarity index 100%
rename from web/thesauruses/nim/1/data_types.json
rename to web/thesauruses/langs/nim/1/data_types.json
diff --git a/web/thesauruses/nim/1/exception_handling.json b/web/thesauruses/langs/nim/1/exception_handling.json
similarity index 100%
rename from web/thesauruses/nim/1/exception_handling.json
rename to web/thesauruses/langs/nim/1/exception_handling.json
diff --git a/web/thesauruses/nim/1/functions.json b/web/thesauruses/langs/nim/1/functions.json
similarity index 100%
rename from web/thesauruses/nim/1/functions.json
rename to web/thesauruses/langs/nim/1/functions.json
diff --git a/web/thesauruses/nim/1/lists.json b/web/thesauruses/langs/nim/1/lists.json
similarity index 100%
rename from web/thesauruses/nim/1/lists.json
rename to web/thesauruses/langs/nim/1/lists.json
diff --git a/web/thesauruses/nim/1/operators.json b/web/thesauruses/langs/nim/1/operators.json
similarity index 100%
rename from web/thesauruses/nim/1/operators.json
rename to web/thesauruses/langs/nim/1/operators.json
diff --git a/web/thesauruses/objectivec/2/control_structures.json b/web/thesauruses/langs/objectivec/2/control_structures.json
similarity index 100%
rename from web/thesauruses/objectivec/2/control_structures.json
rename to web/thesauruses/langs/objectivec/2/control_structures.json
diff --git a/web/thesauruses/objectivec/2/data_types.json b/web/thesauruses/langs/objectivec/2/data_types.json
similarity index 100%
rename from web/thesauruses/objectivec/2/data_types.json
rename to web/thesauruses/langs/objectivec/2/data_types.json
diff --git a/web/thesauruses/objectivec/2/functions.json b/web/thesauruses/langs/objectivec/2/functions.json
similarity index 100%
rename from web/thesauruses/objectivec/2/functions.json
rename to web/thesauruses/langs/objectivec/2/functions.json
diff --git a/web/thesauruses/objectivec/2/lists.json b/web/thesauruses/langs/objectivec/2/lists.json
similarity index 100%
rename from web/thesauruses/objectivec/2/lists.json
rename to web/thesauruses/langs/objectivec/2/lists.json
diff --git a/web/thesauruses/objectivec/2/operators.json b/web/thesauruses/langs/objectivec/2/operators.json
similarity index 100%
rename from web/thesauruses/objectivec/2/operators.json
rename to web/thesauruses/langs/objectivec/2/operators.json
diff --git a/web/thesauruses/objectivec/2/queues_stacks.json b/web/thesauruses/langs/objectivec/2/queues_stacks.json
similarity index 100%
rename from web/thesauruses/objectivec/2/queues_stacks.json
rename to web/thesauruses/langs/objectivec/2/queues_stacks.json
diff --git a/web/thesauruses/perl/5/control_structures.json b/web/thesauruses/langs/perl/5/control_structures.json
similarity index 100%
rename from web/thesauruses/perl/5/control_structures.json
rename to web/thesauruses/langs/perl/5/control_structures.json
diff --git a/web/thesauruses/perl/5/data_types.json b/web/thesauruses/langs/perl/5/data_types.json
similarity index 100%
rename from web/thesauruses/perl/5/data_types.json
rename to web/thesauruses/langs/perl/5/data_types.json
diff --git a/web/thesauruses/perl/5/operators.json b/web/thesauruses/langs/perl/5/operators.json
similarity index 100%
rename from web/thesauruses/perl/5/operators.json
rename to web/thesauruses/langs/perl/5/operators.json
diff --git a/web/thesauruses/php/7/classes.json b/web/thesauruses/langs/php/7/classes.json
similarity index 100%
rename from web/thesauruses/php/7/classes.json
rename to web/thesauruses/langs/php/7/classes.json
diff --git a/web/thesauruses/php/7/control_structures.json b/web/thesauruses/langs/php/7/control_structures.json
similarity index 100%
rename from web/thesauruses/php/7/control_structures.json
rename to web/thesauruses/langs/php/7/control_structures.json
diff --git a/web/thesauruses/php/7/data_types.json b/web/thesauruses/langs/php/7/data_types.json
similarity index 100%
rename from web/thesauruses/php/7/data_types.json
rename to web/thesauruses/langs/php/7/data_types.json
diff --git a/web/thesauruses/php/7/exception_handling.json b/web/thesauruses/langs/php/7/exception_handling.json
similarity index 100%
rename from web/thesauruses/php/7/exception_handling.json
rename to web/thesauruses/langs/php/7/exception_handling.json
diff --git a/web/thesauruses/php/7/functions.json b/web/thesauruses/langs/php/7/functions.json
similarity index 100%
rename from web/thesauruses/php/7/functions.json
rename to web/thesauruses/langs/php/7/functions.json
diff --git a/web/thesauruses/php/7/lists.json b/web/thesauruses/langs/php/7/lists.json
similarity index 100%
rename from web/thesauruses/php/7/lists.json
rename to web/thesauruses/langs/php/7/lists.json
diff --git a/web/thesauruses/php/7/operators.json b/web/thesauruses/langs/php/7/operators.json
similarity index 100%
rename from web/thesauruses/php/7/operators.json
rename to web/thesauruses/langs/php/7/operators.json
diff --git a/web/thesauruses/php/8/classes.json b/web/thesauruses/langs/php/8/classes.json
similarity index 100%
rename from web/thesauruses/php/8/classes.json
rename to web/thesauruses/langs/php/8/classes.json
diff --git a/web/thesauruses/php/8/control_structures.json b/web/thesauruses/langs/php/8/control_structures.json
similarity index 100%
rename from web/thesauruses/php/8/control_structures.json
rename to web/thesauruses/langs/php/8/control_structures.json
diff --git a/web/thesauruses/php/8/data_types.json b/web/thesauruses/langs/php/8/data_types.json
similarity index 100%
rename from web/thesauruses/php/8/data_types.json
rename to web/thesauruses/langs/php/8/data_types.json
diff --git a/web/thesauruses/php/8/exception_handling.json b/web/thesauruses/langs/php/8/exception_handling.json
similarity index 100%
rename from web/thesauruses/php/8/exception_handling.json
rename to web/thesauruses/langs/php/8/exception_handling.json
diff --git a/web/thesauruses/php/8/functions.json b/web/thesauruses/langs/php/8/functions.json
similarity index 100%
rename from web/thesauruses/php/8/functions.json
rename to web/thesauruses/langs/php/8/functions.json
diff --git a/web/thesauruses/php/8/lists.json b/web/thesauruses/langs/php/8/lists.json
similarity index 100%
rename from web/thesauruses/php/8/lists.json
rename to web/thesauruses/langs/php/8/lists.json
diff --git a/web/thesauruses/php/8/operators.json b/web/thesauruses/langs/php/8/operators.json
similarity index 100%
rename from web/thesauruses/php/8/operators.json
rename to web/thesauruses/langs/php/8/operators.json
diff --git a/web/thesauruses/php/8/queues_stacks.json b/web/thesauruses/langs/php/8/queues_stacks.json
similarity index 100%
rename from web/thesauruses/php/8/queues_stacks.json
rename to web/thesauruses/langs/php/8/queues_stacks.json
diff --git a/web/thesauruses/powershell/7/classes.json b/web/thesauruses/langs/powershell/7/classes.json
similarity index 100%
rename from web/thesauruses/powershell/7/classes.json
rename to web/thesauruses/langs/powershell/7/classes.json
diff --git a/web/thesauruses/powershell/7/control_structures.json b/web/thesauruses/langs/powershell/7/control_structures.json
similarity index 100%
rename from web/thesauruses/powershell/7/control_structures.json
rename to web/thesauruses/langs/powershell/7/control_structures.json
diff --git a/web/thesauruses/powershell/7/data_types.json b/web/thesauruses/langs/powershell/7/data_types.json
similarity index 100%
rename from web/thesauruses/powershell/7/data_types.json
rename to web/thesauruses/langs/powershell/7/data_types.json
diff --git a/web/thesauruses/python/3/classes.json b/web/thesauruses/langs/python/3/classes.json
similarity index 100%
rename from web/thesauruses/python/3/classes.json
rename to web/thesauruses/langs/python/3/classes.json
diff --git a/web/thesauruses/python/3/control_structures.json b/web/thesauruses/langs/python/3/control_structures.json
similarity index 100%
rename from web/thesauruses/python/3/control_structures.json
rename to web/thesauruses/langs/python/3/control_structures.json
diff --git a/web/thesauruses/python/3/data_types.json b/web/thesauruses/langs/python/3/data_types.json
similarity index 100%
rename from web/thesauruses/python/3/data_types.json
rename to web/thesauruses/langs/python/3/data_types.json
diff --git a/web/thesauruses/python/3/exception_handling.json b/web/thesauruses/langs/python/3/exception_handling.json
similarity index 100%
rename from web/thesauruses/python/3/exception_handling.json
rename to web/thesauruses/langs/python/3/exception_handling.json
diff --git a/web/thesauruses/python/3/functions.json b/web/thesauruses/langs/python/3/functions.json
similarity index 100%
rename from web/thesauruses/python/3/functions.json
rename to web/thesauruses/langs/python/3/functions.json
diff --git a/web/thesauruses/python/3/io.json b/web/thesauruses/langs/python/3/io.json
similarity index 100%
rename from web/thesauruses/python/3/io.json
rename to web/thesauruses/langs/python/3/io.json
diff --git a/web/thesauruses/python/3/lists.json b/web/thesauruses/langs/python/3/lists.json
similarity index 100%
rename from web/thesauruses/python/3/lists.json
rename to web/thesauruses/langs/python/3/lists.json
diff --git a/web/thesauruses/python/3/operators.json b/web/thesauruses/langs/python/3/operators.json
similarity index 100%
rename from web/thesauruses/python/3/operators.json
rename to web/thesauruses/langs/python/3/operators.json
diff --git a/web/thesauruses/python/3/queues_stacks.json b/web/thesauruses/langs/python/3/queues_stacks.json
similarity index 100%
rename from web/thesauruses/python/3/queues_stacks.json
rename to web/thesauruses/langs/python/3/queues_stacks.json
diff --git a/web/thesauruses/python/3/strings.json b/web/thesauruses/langs/python/3/strings.json
similarity index 100%
rename from web/thesauruses/python/3/strings.json
rename to web/thesauruses/langs/python/3/strings.json
diff --git a/web/thesauruses/r/4/classes.json b/web/thesauruses/langs/r/4/classes.json
similarity index 100%
rename from web/thesauruses/r/4/classes.json
rename to web/thesauruses/langs/r/4/classes.json
diff --git a/web/thesauruses/r/4/data_types.json b/web/thesauruses/langs/r/4/data_types.json
similarity index 100%
rename from web/thesauruses/r/4/data_types.json
rename to web/thesauruses/langs/r/4/data_types.json
diff --git a/web/thesauruses/r/4/io.json b/web/thesauruses/langs/r/4/io.json
similarity index 100%
rename from web/thesauruses/r/4/io.json
rename to web/thesauruses/langs/r/4/io.json
diff --git a/web/thesauruses/r/4/lists.json b/web/thesauruses/langs/r/4/lists.json
similarity index 100%
rename from web/thesauruses/r/4/lists.json
rename to web/thesauruses/langs/r/4/lists.json
diff --git a/web/thesauruses/r/4/operators.json b/web/thesauruses/langs/r/4/operators.json
similarity index 100%
rename from web/thesauruses/r/4/operators.json
rename to web/thesauruses/langs/r/4/operators.json
diff --git a/web/thesauruses/ruby/3/classes.json b/web/thesauruses/langs/ruby/3/classes.json
similarity index 100%
rename from web/thesauruses/ruby/3/classes.json
rename to web/thesauruses/langs/ruby/3/classes.json
diff --git a/web/thesauruses/ruby/3/control_structures.json b/web/thesauruses/langs/ruby/3/control_structures.json
similarity index 100%
rename from web/thesauruses/ruby/3/control_structures.json
rename to web/thesauruses/langs/ruby/3/control_structures.json
diff --git a/web/thesauruses/ruby/3/data_types.json b/web/thesauruses/langs/ruby/3/data_types.json
similarity index 100%
rename from web/thesauruses/ruby/3/data_types.json
rename to web/thesauruses/langs/ruby/3/data_types.json
diff --git a/web/thesauruses/ruby/3/exception_handling.json b/web/thesauruses/langs/ruby/3/exception_handling.json
similarity index 100%
rename from web/thesauruses/ruby/3/exception_handling.json
rename to web/thesauruses/langs/ruby/3/exception_handling.json
diff --git a/web/thesauruses/ruby/3/functions.json b/web/thesauruses/langs/ruby/3/functions.json
similarity index 100%
rename from web/thesauruses/ruby/3/functions.json
rename to web/thesauruses/langs/ruby/3/functions.json
diff --git a/web/thesauruses/ruby/3/lists.json b/web/thesauruses/langs/ruby/3/lists.json
similarity index 100%
rename from web/thesauruses/ruby/3/lists.json
rename to web/thesauruses/langs/ruby/3/lists.json
diff --git a/web/thesauruses/ruby/3/strings.json b/web/thesauruses/langs/ruby/3/strings.json
similarity index 100%
rename from web/thesauruses/ruby/3/strings.json
rename to web/thesauruses/langs/ruby/3/strings.json
diff --git a/web/thesauruses/rust/1/control_structures.json b/web/thesauruses/langs/rust/1/control_structures.json
similarity index 100%
rename from web/thesauruses/rust/1/control_structures.json
rename to web/thesauruses/langs/rust/1/control_structures.json
diff --git a/web/thesauruses/rust/1/data_types.json b/web/thesauruses/langs/rust/1/data_types.json
similarity index 100%
rename from web/thesauruses/rust/1/data_types.json
rename to web/thesauruses/langs/rust/1/data_types.json
diff --git a/web/thesauruses/rust/1/functions.json b/web/thesauruses/langs/rust/1/functions.json
similarity index 100%
rename from web/thesauruses/rust/1/functions.json
rename to web/thesauruses/langs/rust/1/functions.json
diff --git a/web/thesauruses/rust/1/operators.json b/web/thesauruses/langs/rust/1/operators.json
similarity index 100%
rename from web/thesauruses/rust/1/operators.json
rename to web/thesauruses/langs/rust/1/operators.json
diff --git a/web/thesauruses/rust/1/queues_stacks.json b/web/thesauruses/langs/rust/1/queues_stacks.json
similarity index 100%
rename from web/thesauruses/rust/1/queues_stacks.json
rename to web/thesauruses/langs/rust/1/queues_stacks.json
diff --git a/web/thesauruses/rust/1/strings.json b/web/thesauruses/langs/rust/1/strings.json
similarity index 100%
rename from web/thesauruses/rust/1/strings.json
rename to web/thesauruses/langs/rust/1/strings.json
diff --git a/web/thesauruses/scala/2/control_structures.json b/web/thesauruses/langs/scala/2/control_structures.json
similarity index 100%
rename from web/thesauruses/scala/2/control_structures.json
rename to web/thesauruses/langs/scala/2/control_structures.json
diff --git a/web/thesauruses/scala/2/data_types.json b/web/thesauruses/langs/scala/2/data_types.json
similarity index 100%
rename from web/thesauruses/scala/2/data_types.json
rename to web/thesauruses/langs/scala/2/data_types.json
diff --git a/web/thesauruses/scala/2/functions.json b/web/thesauruses/langs/scala/2/functions.json
similarity index 100%
rename from web/thesauruses/scala/2/functions.json
rename to web/thesauruses/langs/scala/2/functions.json
diff --git a/web/thesauruses/scala/2/operators.json b/web/thesauruses/langs/scala/2/operators.json
similarity index 100%
rename from web/thesauruses/scala/2/operators.json
rename to web/thesauruses/langs/scala/2/operators.json
diff --git a/web/thesauruses/swift/5/classes.json b/web/thesauruses/langs/swift/5/classes.json
similarity index 100%
rename from web/thesauruses/swift/5/classes.json
rename to web/thesauruses/langs/swift/5/classes.json
diff --git a/web/thesauruses/swift/5/control_structures.json b/web/thesauruses/langs/swift/5/control_structures.json
similarity index 100%
rename from web/thesauruses/swift/5/control_structures.json
rename to web/thesauruses/langs/swift/5/control_structures.json
diff --git a/web/thesauruses/swift/5/data_types.json b/web/thesauruses/langs/swift/5/data_types.json
similarity index 100%
rename from web/thesauruses/swift/5/data_types.json
rename to web/thesauruses/langs/swift/5/data_types.json
diff --git a/web/thesauruses/swift/5/functions.json b/web/thesauruses/langs/swift/5/functions.json
similarity index 100%
rename from web/thesauruses/swift/5/functions.json
rename to web/thesauruses/langs/swift/5/functions.json
diff --git a/web/thesauruses/swift/5/lists.json b/web/thesauruses/langs/swift/5/lists.json
similarity index 100%
rename from web/thesauruses/swift/5/lists.json
rename to web/thesauruses/langs/swift/5/lists.json
diff --git a/web/thesauruses/swift/5/operators.json b/web/thesauruses/langs/swift/5/operators.json
similarity index 100%
rename from web/thesauruses/swift/5/operators.json
rename to web/thesauruses/langs/swift/5/operators.json
diff --git a/web/thesauruses/swift/5/strings.json b/web/thesauruses/langs/swift/5/strings.json
similarity index 100%
rename from web/thesauruses/swift/5/strings.json
rename to web/thesauruses/langs/swift/5/strings.json
diff --git a/web/thesauruses/typescript/4/classes.json b/web/thesauruses/langs/typescript/4/classes.json
similarity index 100%
rename from web/thesauruses/typescript/4/classes.json
rename to web/thesauruses/langs/typescript/4/classes.json
diff --git a/web/thesauruses/typescript/4/control_structures.json b/web/thesauruses/langs/typescript/4/control_structures.json
similarity index 100%
rename from web/thesauruses/typescript/4/control_structures.json
rename to web/thesauruses/langs/typescript/4/control_structures.json
diff --git a/web/thesauruses/typescript/4/data_types.json b/web/thesauruses/langs/typescript/4/data_types.json
similarity index 100%
rename from web/thesauruses/typescript/4/data_types.json
rename to web/thesauruses/langs/typescript/4/data_types.json
diff --git a/web/thesauruses/typescript/4/exception_handling.json b/web/thesauruses/langs/typescript/4/exception_handling.json
similarity index 100%
rename from web/thesauruses/typescript/4/exception_handling.json
rename to web/thesauruses/langs/typescript/4/exception_handling.json
diff --git a/web/thesauruses/typescript/4/functions.json b/web/thesauruses/langs/typescript/4/functions.json
similarity index 100%
rename from web/thesauruses/typescript/4/functions.json
rename to web/thesauruses/langs/typescript/4/functions.json
diff --git a/web/thesauruses/typescript/4/lists.json b/web/thesauruses/langs/typescript/4/lists.json
similarity index 100%
rename from web/thesauruses/typescript/4/lists.json
rename to web/thesauruses/langs/typescript/4/lists.json
diff --git a/web/thesauruses/typescript/4/operators.json b/web/thesauruses/langs/typescript/4/operators.json
similarity index 100%
rename from web/thesauruses/typescript/4/operators.json
rename to web/thesauruses/langs/typescript/4/operators.json
diff --git a/web/thesauruses/typescript/4/queues_stacks.json b/web/thesauruses/langs/typescript/4/queues_stacks.json
similarity index 100%
rename from web/thesauruses/typescript/4/queues_stacks.json
rename to web/thesauruses/langs/typescript/4/queues_stacks.json
diff --git a/web/thesauruses/typescript/4/strings.json b/web/thesauruses/langs/typescript/4/strings.json
similarity index 100%
rename from web/thesauruses/typescript/4/strings.json
rename to web/thesauruses/langs/typescript/4/strings.json
diff --git a/web/thesauruses/vbnet/16/classes.json b/web/thesauruses/langs/vbnet/16/classes.json
similarity index 100%
rename from web/thesauruses/vbnet/16/classes.json
rename to web/thesauruses/langs/vbnet/16/classes.json
diff --git a/web/thesauruses/vbnet/16/control_structures.json b/web/thesauruses/langs/vbnet/16/control_structures.json
similarity index 100%
rename from web/thesauruses/vbnet/16/control_structures.json
rename to web/thesauruses/langs/vbnet/16/control_structures.json
diff --git a/web/thesauruses/vbnet/16/data_types.json b/web/thesauruses/langs/vbnet/16/data_types.json
similarity index 100%
rename from web/thesauruses/vbnet/16/data_types.json
rename to web/thesauruses/langs/vbnet/16/data_types.json
diff --git a/web/thesauruses/vbnet/16/functions.json b/web/thesauruses/langs/vbnet/16/functions.json
similarity index 100%
rename from web/thesauruses/vbnet/16/functions.json
rename to web/thesauruses/langs/vbnet/16/functions.json
diff --git a/web/thesauruses/vbnet/16/lists.json b/web/thesauruses/langs/vbnet/16/lists.json
similarity index 100%
rename from web/thesauruses/vbnet/16/lists.json
rename to web/thesauruses/langs/vbnet/16/lists.json
diff --git a/web/thesauruses/vbnet/16/operators.json b/web/thesauruses/langs/vbnet/16/operators.json
similarity index 100%
rename from web/thesauruses/vbnet/16/operators.json
rename to web/thesauruses/langs/vbnet/16/operators.json
diff --git a/web/thesauruses/vbnet/16/strings.json b/web/thesauruses/langs/vbnet/16/strings.json
similarity index 100%
rename from web/thesauruses/vbnet/16/strings.json
rename to web/thesauruses/langs/vbnet/16/strings.json

From a9b8bc962244e17a5b8bb57e25d35b5310493a6b Mon Sep 17 00:00:00 2001
From: Sarah Withee <2601974+geekygirlsarah@users.noreply.github.com>
Date: Thu, 22 Jan 2026 15:14:56 -0500
Subject: [PATCH 03/15] Add initial alterations to make a SQL/NoSQL section
 happen, some sample entries too

---
 .../commands/validatelanginfofiles.py         |  39 +++-
 .../commands/validatemetainfofile.py          |  57 ++++--
 ..._rename_language_to_entry_in_lookupdata.py |  23 +++
 web/models.py                                 |  33 +++-
 web/static/js/checkAvailableStructs.js        |  86 +++++----
 web/templates/error_missing_structure.html    |   4 +-
 web/templates/index.html                      |  49 ++---
 web/tests/test_categories.py                  | 122 ++++++++++++
 web/tests/test_db_models.py                   |   8 +-
 web/tests/test_models.py                      |  14 +-
 web/tests/test_views.py                       |  59 +++---
 web/thesauruses/_meta/deletions.json          |  12 ++
 web/thesauruses/_meta/filtering.json          |  12 ++
 web/thesauruses/_meta/inserts.json            |  12 ++
 web/thesauruses/_meta/queries.json            |  12 ++
 .../databases/mongodb/6/queries.json          |  16 ++
 .../databases/mysql/8/queries.json            |  16 ++
 .../databases/postgresql/15/queries.json      |  16 ++
 web/thesauruses/meta_info.json                |  42 +++--
 web/views.py                                  | 174 +++++++++++-------
 20 files changed, 598 insertions(+), 208 deletions(-)
 create mode 100644 web/migrations/0005_rename_language_to_entry_in_lookupdata.py
 create mode 100644 web/tests/test_categories.py
 create mode 100644 web/thesauruses/_meta/deletions.json
 create mode 100644 web/thesauruses/_meta/filtering.json
 create mode 100644 web/thesauruses/_meta/inserts.json
 create mode 100644 web/thesauruses/_meta/queries.json
 create mode 100644 web/thesauruses/databases/mongodb/6/queries.json
 create mode 100644 web/thesauruses/databases/mysql/8/queries.json
 create mode 100644 web/thesauruses/databases/postgresql/15/queries.json

diff --git a/web/management/commands/validatelanginfofiles.py b/web/management/commands/validatelanginfofiles.py
index fb6cb326a..b3083da99 100644
--- a/web/management/commands/validatelanginfofiles.py
+++ b/web/management/commands/validatelanginfofiles.py
@@ -3,6 +3,8 @@
 
 from django.core.management.base import BaseCommand, CommandError
 
+from web.models import ThesaurusMetaInfo
+
 
 class Command(BaseCommand):
     help = "Reads all language JSON files to ensure they're constructed correctly"
@@ -12,18 +14,24 @@ def __init__(self, *args, **kwargs):
         self.error_count = 0
         self.warning_count = 0
         self.thesauruses_path = Path("web/thesauruses")
+        self.metainfo = None
 
     def handle(self, *args, **options):
-        for lang_dir in self.thesauruses_path.iterdir():
-            if not lang_dir.is_dir() or lang_dir.name == "_meta":
+        self.metainfo = ThesaurusMetaInfo()
+        for category_dir in self.thesauruses_path.iterdir():
+            if not category_dir.is_dir() or category_dir.name == "_meta":
                 continue
-
-            for version_dir in lang_dir.iterdir():
-                if not version_dir.is_dir():
+            
+            for lang_dir in category_dir.iterdir():
+                if not lang_dir.is_dir():
                     continue
 
-                for structure_file in version_dir.glob("*.json"):
-                    self.validate_language_file(structure_file)
+                for version_dir in lang_dir.iterdir():
+                    if not version_dir.is_dir():
+                        continue
+
+                    for structure_file in version_dir.glob("*.json"):
+                        self.validate_language_file(structure_file)
 
         if self.warning_count > 0:
             self.stdout.write(self.style.WARNING(f"{self.warning_count} warnings found."))
@@ -55,12 +63,13 @@ def validate_language_file(self, file_path):
 
         self.check_meta_section(data, relative_path)
         self.check_concepts(data, relative_path)
+        self.check_category_structure_consistency(data, relative_path)
 
     def check_meta_section(self, data, relative_path):
         meta = data.get("meta", {})
-        # relative_path is something like "python/3/data_types.json"
-        # parts[0] is the language directory name
-        lang_dir = relative_path.parts[0]
+        # relative_path is something like "langs/python/3/data_types.json"
+        # parts[1] is the language directory name
+        lang_dir = relative_path.parts[1]
 
         language = meta.get("language")
         language_version = meta.get("language_version")
@@ -130,3 +139,13 @@ def check_concepts(self, data, relative_path):
             for key in item_data:
                 if key not in allowed_keys:
                     self.report_warning(f"`{relative_path}`, ID: `{concept_id}` has a line `{key}` that's unknown")
+
+    def check_category_structure_consistency(self, data, relative_path):
+        """Check if the structure is allowed for the category it is in"""
+        # relative_path is like "langs/python/3/data_types.json"
+        category = relative_path.parts[0]
+        structure_name = relative_path.name.split('.')[0]
+
+        category_structures = self.metainfo.category_structures.get(category, {})
+        if structure_name not in category_structures:
+            self.report_error(f"`{relative_path}` is in category `{category}`, but `{structure_name}` is not a valid structure for this category in `meta_info.json`")
diff --git a/web/management/commands/validatemetainfofile.py b/web/management/commands/validatemetainfofile.py
index 71ceebde8..9a9b81fb8 100644
--- a/web/management/commands/validatemetainfofile.py
+++ b/web/management/commands/validatemetainfofile.py
@@ -18,6 +18,7 @@ def __init__(self, *args, **kwargs):
     def handle(self, *args, **options):
         self.metainfo = ThesaurusMetaInfo()
         
+        self.check_category_directories()
         self.check_thesaurus_directories()
         self.check_meta_info_consistency()
         self.check_meta_files_consistency()
@@ -31,34 +32,60 @@ def report_error(self, message):
         self.stderr.write(self.style.ERROR(f"[Error] {message}"))
         self.error_count += 1
 
+    def check_category_directories(self):
+        """Check all categories in meta_info.json have corresponding directories and vice versa"""
+        # Check if all directories in web/thesauruses are accounted for
+        for category_dir in self.thesauruses_path.iterdir():
+            if not category_dir.is_dir() or category_dir.name == "_meta":
+                continue
+            if category_dir.name not in self.metainfo.categories:
+                self.report_error(f"Directory `{category_dir}` exists but `{category_dir.name}` is not listed as a category in `meta_info.json`")
+        
+        # Check if all categories in meta_info.json have directories
+        for category_key in self.metainfo.categories:
+            path = self.thesauruses_path / category_key
+            if not path.is_dir():
+                self.report_error(f"Category `{category_key}` is listed in `meta_info.json` but directory `{path}` was not found")
+
     def check_thesaurus_directories(self):
         """Look through thesaurus directories, see if any files don't match"""
         meta_files = {f.name for f in self.meta_path.iterdir() if f.is_file()}
 
-        for lang_dir in self.thesauruses_path.iterdir():
-            if not lang_dir.is_dir() or lang_dir.name == "_meta":
+        for category_dir in self.thesauruses_path.iterdir():
+            if not category_dir.is_dir() or category_dir.name == "_meta":
                 continue
 
-            lang = lang_dir.name
-            if lang not in self.metainfo.languages:
-                self.report_error(f"`{lang_dir}` exists but {lang} is not listed as a language in `meta_info.json`")
-
-            for version_dir in lang_dir.iterdir():
-                if version_dir.is_file():
-                    self.report_error(f"`{version_dir}` is a file but a directory for a version was expected")
+            for lang_dir in category_dir.iterdir():
+                if not lang_dir.is_dir():
                     continue
 
-                for structure_file in version_dir.iterdir():
-                    if structure_file.name not in meta_files:
-                        self.report_error(f"`{structure_file}` is not a valid concept filename")
+                lang = lang_dir.name
+                if lang not in self.metainfo.languages:
+                    self.report_error(f"`{lang_dir}` exists but {lang} is not listed as a language in `meta_info.json`")
+
+                for version_dir in lang_dir.iterdir():
+                    if version_dir.is_file():
+                        self.report_error(f"`{version_dir}` is a file but a directory for a version was expected")
+                        continue
+
+                    for structure_file in version_dir.iterdir():
+                        if structure_file.name not in meta_files:
+                            self.report_error(f"`{structure_file}` is not a valid concept filename")
 
     def check_meta_info_consistency(self):
         """Check all language directories exist for languages listed in meta_info.json"""
         for meta_lang in self.metainfo.languages:
-            path = self.thesauruses_path / meta_lang
-            if not path.is_dir():
+            found = False
+            for category_dir in self.thesauruses_path.iterdir():
+                if not category_dir.is_dir() or category_dir.name == "_meta":
+                    continue
+                path = category_dir / meta_lang
+                if path.is_dir():
+                    found = True
+                    break
+            if not found:
                 lang_name = self.metainfo.languages[meta_lang]
-                self.report_error(f"{lang_name} is listed as a language in `meta_info.json` but the directory `{path}` doesn't exist")
+                self.report_error(f"{lang_name} is listed as a language in `meta_info.json` but no directory for it was found in any category")
 
     def check_meta_files_consistency(self):
         """Check structures in _meta match those in ThesaurusMetaInfo"""
diff --git a/web/migrations/0005_rename_language_to_entry_in_lookupdata.py b/web/migrations/0005_rename_language_to_entry_in_lookupdata.py
new file mode 100644
index 000000000..767c8e279
--- /dev/null
+++ b/web/migrations/0005_rename_language_to_entry_in_lookupdata.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.27 on 2026-01-22 19:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('web', '0004_missinglookup'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='lookupdata',
+            old_name='language1',
+            new_name='entry1',
+        ),
+        migrations.RenameField(
+            model_name='lookupdata',
+            old_name='language2',
+            new_name='entry2',
+        ),
+    ]
diff --git a/web/models.py b/web/models.py
index 06caddc72..d7bdd36b6 100644
--- a/web/models.py
+++ b/web/models.py
@@ -58,7 +58,19 @@ def __init__(self, key, name):
         self.name = name
         self.concepts = None
         self.version = None
-        self.language_dir = os.path.join("web", "thesauruses", self.key)
+        self.language_dir = None
+        for category in os.listdir(os.path.join("web", "thesauruses")):
+            if category == "_meta" or not os.path.isdir(os.path.join("web", "thesauruses", category)):
+                continue
+            potential_dir = os.path.join("web", "thesauruses", category, self.key)
+            if os.path.exists(potential_dir):
+                self.language_dir = potential_dir
+                break
+        
+        if self.language_dir is None:
+            # Fallback for when it doesn't exist yet (e.g. during template generation)
+            # Defaulting to 'langs' if not found, but this might need refinement
+            self.language_dir = os.path.join("web", "thesauruses", "langs", self.key)
         self.version = None
 
 
@@ -282,16 +294,29 @@ def __init__(self):
         if ThesaurusMetaInfo._cached_structures is not None:
             self.structures = ThesaurusMetaInfo._cached_structures
             self.languages = ThesaurusMetaInfo._cached_languages
+            self.categories = getattr(ThesaurusMetaInfo, "_cached_categories", {})
+            self.category_structures = getattr(ThesaurusMetaInfo, "_cached_category_structures", {})
             return
 
         meta_info_file_path = os.path.join(
             "web", "thesauruses", "meta_info.json")
         with open(meta_info_file_path, 'r', encoding='UTF-8') as meta_file:
             meta_info_json = json.load(meta_file)
-        self.structures = meta_info_json["structures"]
+        
+        self.categories = meta_info_json.get("categories", {})
         self.languages = meta_info_json["languages"]
+        
+        # Flatten structures for backward compatibility where needed, 
+        # but keep track of category-specific ones
+        self.category_structures = meta_info_json["structures"]
+        self.structures = {}
+        for cat_structs in self.category_structures.values():
+            self.structures.update(cat_structs)
+
         ThesaurusMetaInfo._cached_structures = self.structures
         ThesaurusMetaInfo._cached_languages = self.languages
+        ThesaurusMetaInfo._cached_categories = self.categories
+        ThesaurusMetaInfo._cached_category_structures = self.category_structures
         
 
     def entry_name(self, entry_key):
@@ -378,9 +403,9 @@ class SiteVisit(models.Model):
 class LookupData(models.Model):
     id = models.BigAutoField(primary_key=True)
     date_time = models.DateTimeField(auto_now_add=True)
-    language1 = models.CharField(max_length=50)
+    entry1 = models.CharField(max_length=50)
     version1 = models.CharField(max_length=20, default='')
-    language2 = models.CharField(max_length=50)
+    entry2 = models.CharField(max_length=50)
     version2 = models.CharField(max_length=20, default='')
     structure = models.CharField(max_length=50)
     site_visit = models.ForeignKey(SiteVisit, on_delete=models.CASCADE)
diff --git a/web/static/js/checkAvailableStructs.js b/web/static/js/checkAvailableStructs.js
index dda475ecb..c3d579db8 100644
--- a/web/static/js/checkAvailableStructs.js
+++ b/web/static/js/checkAvailableStructs.js
@@ -1,17 +1,28 @@
 function main() {
-    const refConc = document.getElementById('reference-concept');
-    const refLang = document.getElementById('lang');
-    const compConc = document.getElementById('concept');
-    const compLang1 = document.getElementById('lang1');
-    const compLang2 = document.getElementById('lang2');
-  
-    // need to make sure the initial concept and language/version
-    // combinations are ones that are available
-    setCombination(refConc, refLang);
-    setCombination(compConc, compLang1, compLang2);
+    const refConcs = document.querySelectorAll('.reference-concept-select');
+    const compConcs = document.querySelectorAll('.concept-select');
 
-    refConc.addEventListener('change', () => setCombination(refConc, refLang));
-    compConc.addEventListener('change', () => setCombination(compConc, compLang1, compLang2));
+    refConcs.forEach(refConc => {
+        const category = refConc.dataset.category;
+        const refEntry = document.getElementById(`entry-${category}`);
+        if (refEntry) {
+            setCombination(refConc, refEntry);
+            refConc.addEventListener('change', () => setCombination(refConc, refEntry));
+            refEntry.addEventListener('change', () => setCombination(refConc, refEntry));
+        }
+    });
+
+    compConcs.forEach(compConc => {
+        const category = compConc.dataset.category;
+        const compEntry1 = document.getElementById(`entry1-${category}`);
+        const compEntry2 = document.getElementById(`entry2-${category}`);
+        if (compEntry1 && compEntry2) {
+            setCombination(compConc, compEntry1, compEntry2);
+            compConc.addEventListener('change', () => setCombination(compConc, compEntry1, compEntry2));
+            compEntry1.addEventListener('change', () => setCombination(compConc, compEntry1, compEntry2));
+            compEntry2.addEventListener('change', () => setCombination(compConc, compEntry1, compEntry2));
+        }
+    });
 }
 
 function getSelectText(selectElem) {
@@ -22,42 +33,41 @@ function getSelectValue(selectElem) {
     return selectElem.options[selectElem.selectedIndex].value;
 }
 
-function setCombination(conc, lang1, lang2=null) {
-    const lang1Options = lang1.querySelectorAll('option');
-    const lang1ClassList = Array.from(lang1.querySelector(`option[value='${getSelectValue(lang1)}']`).classList);
-    let lang1IsSet = lang1ClassList.includes(getSelectValue(conc));
+function setCombination(conc, entry1, entry2=null) {
+    const concValue = getSelectValue(conc);
+    const entry1Options = entry1.querySelectorAll('option');
+    const entry1SelectedOption = entry1.querySelector(`option[value='${getSelectValue(entry1).replace(/'/g, "\\'")}']`);
+    const entry1ClassList = entry1SelectedOption ? Array.from(entry1SelectedOption.classList) : [];
+    let entry1IsSet = entry1ClassList.includes(concValue);
 
-    for (let i of lang1Options) {
+    for (let i of entry1Options) {
         const classList = Array.from(i.classList);
-        if (classList.includes(getSelectValue(conc))) {
-            if (i.disabled) {
-                i.disabled = false;
+        if (classList.includes(concValue)) {
+            i.disabled = false;
+            if (!entry1IsSet) {
+                entry1.value = i.value;
+                entry1IsSet = true;
             }
-            if (!lang1IsSet) {
-                lang1.value = i.value;
-                lang1IsSet = true;
-            }
-        } else if (!i.disabled) {
+        } else {
             i.disabled = true;
         }
     }
 
-    if (lang2 !== null) { 
-        const lang2Options = lang2.querySelectorAll('option');
-        const lang2ClassList = Array.from(lang2.querySelector(`option[value='${getSelectValue(lang2)}']`).classList)
-        let lang2IsSet = lang2ClassList.includes(getSelectValue(conc));
+    if (entry2 !== null) { 
+        const entry2Options = entry2.querySelectorAll('option');
+        const entry2SelectedOption = entry2.querySelector(`option[value='${getSelectValue(entry2).replace(/'/g, "\\'")}']`);
+        const entry2ClassList = entry2SelectedOption ? Array.from(entry2SelectedOption.classList) : [];
+        let entry2IsSet = entry2ClassList.includes(concValue);
 
-        for (let i of lang2Options) {
+        for (let i of entry2Options) {
             const classList = Array.from(i.classList);
-            if (classList.includes(getSelectValue(conc))) {
-                if (i.disabled) {
-                    i.disabled = false;
-                }
-                if (!lang2IsSet && i.value !== getSelectValue(lang1)) {
-                    lang2.value = i.value;
-                    lang2IsSet = true;
+            if (classList.includes(concValue)) {
+                i.disabled = false;
+                if (!entry2IsSet && i.value !== getSelectValue(entry1)) {
+                    entry2.value = i.value;
+                    entry2IsSet = true;
                 }
-            } else if (!i.disabled) {
+            } else {
                 i.disabled = true;
             }
         }
diff --git a/web/templates/error_missing_structure.html b/web/templates/error_missing_structure.html
index d6c41373f..81ca3aa39 100644
--- a/web/templates/error_missing_structure.html
+++ b/web/templates/error_missing_structure.html
@@ -6,11 +6,11 @@
   <div class="bg-light p-5 rounded">
     <h1>Oops!</h1>
     <p class="lead">
-      There is no entry about <strong>{{name}}</strong> for <strong>{{lang_name}}</strong> version <strong>{{version}}</strong> yet.
+      There is no entry about <strong>{{name}}</strong> for <strong>{{entry_name}}</strong> version <strong>{{version}}</strong> yet.
       <br /><br />
       Would you like to add it? Check out our <a href='https://docs.codethesaur.us/contributing/'>contribution guidelines</a>.
       <br />
-      Then, when you're ready, you can start by adding a thesaurus file on <a href='https://github.com/codethesaurus/codethesaur.us/new/main/web/thesauruses/{{lang}}/{{version}}/{{key}}.json?filename={{key}}.json'>github</a>.
+      Then, when you're ready, you can start by adding a thesaurus file on <a href='https://github.com/codethesaurus/codethesaur.us/new/main/web/thesauruses/{{entry}}/{{version}}/{{key}}.json?filename={{key}}.json'>github</a>.
       <details><summary>Template for `{{key}}.json`</summary><textarea>{{template}}</textarea></details>
     </p>
     <a class="btn btn-lg btn-primary" href="/" role="button">Go to the Home Page &raquo;</a>
diff --git a/web/templates/index.html b/web/templates/index.html
index fd6e415d5..f4cf766f2 100644
--- a/web/templates/index.html
+++ b/web/templates/index.html
@@ -13,42 +13,48 @@ <h1 class="jumbotron-heading">The Polyglot Developer Reference</h1>
 
 <div class="album py-5 bg-light">
     <div class="container">
-        <div class="card-deck row">
+        {% for category in languages %}
+        <div class="row">
+            <div class="col-12">
+                <h2 class="category-header pb-3">{{ category.label }}</h2>
+            </div>
+        </div>
+        <div class="card-deck row mb-5">
             <div class="col-md-6 mb-4">
                 <div class="card">
                     <form method="get" action="/compare">
                         <div class="card-block">
                             <h2 class="card-header p-3">
-                                Learn a Language
+                                Compare {{ category.label }}
                             </h2>
                             <div class="card-body p-3">
                                 <h3 class="card-subtitle pb-3">
-                                    Compare concepts side-by-side with a language you know and one you don't.
+                                    Compare concepts side-by-side between different {{ category.label|lower }}.
                                 </h3>
 
                                 <div class="card-text">
-                                    <label class="text-muted py-2" for="concept"> Choose a language concept:</label>
-                                    <select class="form-select" id="concept" name="concept">
-                                        {% for k, v in structures.items %}
+                                    <label class="text-muted py-2" for="concept-{{ category.key }}"> Choose a concept:</label>
+                                    <select class="form-select concept-select" id="concept-{{ category.key }}" name="concept" data-category="{{ category.key }}">
+                                        {% for k, v in category.structures.items %}
                                         <option value="{{ k }}">{{ v }}</option>
                                         {% endfor %}
                                     </select>
 
                                 </div>
                                 <div class="card-text">
-                                    <label class="text-muted py-2" for="lang1">Pick a language you know:</label>
-                                    <select class="form-select" id="lang1" name="lang">
-                                        {% for k, lang in languages.items %}
+                                    <label class="text-muted py-2" for="entry1-{{ category.key }}">Pick one you know:</label>
+                                    <select class="form-select entry1-select" id="entry1-{{ category.key }}" name="entry" data-category="{{ category.key }}">
+                                        {% for k, lang in category.entries.items %}
                                         {% for v in lang %}
                                         <option class="{{v.availStructs|join:" "}}" value="{{ k }};{{ v.version }}">{{ v.name }} (version {{v.version}})</option>
                                         {% endfor %}
                                         {% endfor %}
                                     </select>
-                                    <label class="text-muted py-2" for="lang2">Pick a language you
+                                    <label class="text-muted py-2" for="entry2-{{ category.key }}">Pick one you
                                         <strong>don't</strong>
                                         know:</label>
-                                    <select class="form-select" id="lang2" name="lang">
-                                        {% for k, lang in languages.items %}
+                                    <select class="form-select entry2-select" id="entry2-{{ category.key }}" name="entry" data-category="{{ category.key }}">
+                                        {% for k, lang in category.entries.items %}
                                         {% for v in lang %}
                                         <option class="{{v.availStructs|join:" "}}" value="{{ k }};{{ v.version }}">{{ v.name }} (version {{v.version}})</option>
                                         {% endfor %}
@@ -58,7 +64,7 @@ <h3 class="card-subtitle pb-3">
                             </div>
                             <div class="card-footer">
                                 <button type="submit" class="btn bg-blue text-white btn-lg my-3"
-                                    aria-label="Go compare languages">
+                                    aria-label="Go compare {{ category.label|lower }}">
                                     <span class="d-inline">Go <i class="fa fa-arrow-right ml-2"
                                         ></i></span></button>
                             </div>
@@ -75,19 +81,17 @@ <h2 class="card-header p-3">
                             </h2>
                             <div class="card-body p-3">
                                 <h3 class="card-subtitle pb-3">
-                                    A quick and easy way to remind yourself how to do something.
-
-                                    Still under construction.
+                                    A quick and easy way to remind yourself how to do something in a specific {{ category.key|slice:":-1" }}.
                                 </h3>
-                                <label class="text-muted py-2" for="reference-concept">Choose a language concept:</label>
-                                <select class="form-select" id="reference-concept" name="concept">
-                                    {% for k, v in structures.items %}
+                                <label class="text-muted py-2" for="reference-concept-{{ category.key }}">Choose a concept:</label>
+                                <select class="form-select reference-concept-select" id="reference-concept-{{ category.key }}" name="concept" data-category="{{ category.key }}">
+                                    {% for k, v in category.structures.items %}
                                     <option value="{{ k }}">{{ v }}</option>
                                     {% endfor %}
                                 </select>
-                                <label class="text-muted py-2" for="lang">Pick a language:</label>
-                                <select class="form-select" id="lang" name="lang">
-                                    {% for k, lang in languages.items %}
+                                <label class="text-muted py-2" for="entry-{{ category.key }}">Pick one:</label>
+                                <select class="form-select entry-select" id="entry-{{ category.key }}" name="entry" data-category="{{ category.key }}">
+                                    {% for k, lang in category.entries.items %}
                                     {% for v in lang %}
                                     <option class="{{v.availStructs|join:" "}}" value="{{ k }};{{ v.version }}">{{ v.name }} (version {{v.version}})</option>
                                     {% endfor %}
@@ -104,6 +108,7 @@ <h3 class="card-subtitle pb-3">
                 </div>
             </div>
         </div>
+        {% endfor %}
     </div>
     <div id="contribution-alert" class="container">
         <div class="alert alert-info" role="alert">
diff --git a/web/tests/test_categories.py b/web/tests/test_categories.py
new file mode 100644
index 000000000..b709ae038
--- /dev/null
+++ b/web/tests/test_categories.py
@@ -0,0 +1,122 @@
+"""Tests for category-based features"""
+import json
+import os
+from http import HTTPStatus
+from django.test import TestCase
+from django.urls import reverse
+from web.models import ThesaurusEntry, ThesaurusMetaInfo, MetaStructure
+
+class TestCategories(TestCase):
+    """TestCase for category-based logic and views"""
+
+    def setUp(self):
+        self.metainfo = ThesaurusMetaInfo()
+
+    def test_metainfo_categories_loaded(self):
+        """Test that categories are correctly loaded from meta_info.json"""
+        self.assertIn('langs', self.metainfo.categories)
+        self.assertIn('databases', self.metainfo.categories)
+        self.assertEqual(self.metainfo.categories['langs'], 'Programming Languages')
+        self.assertEqual(self.metainfo.categories['databases'], 'Databases')
+
+    def test_metainfo_category_structures_loaded(self):
+        """Test that category-specific structures are correctly loaded"""
+        self.assertIn('langs', self.metainfo.category_structures)
+        self.assertIn('databases', self.metainfo.category_structures)
+        
+        # Check some known structures
+        self.assertIn('data_types', self.metainfo.category_structures['langs'])
+        self.assertIn('queries', self.metainfo.category_structures['databases'])
+        
+        # Check that they are correctly partitioned (ideally)
+        # Though the current implementation flattens them into self.structures for backward compatibility
+        self.assertIn('data_types', self.metainfo.structures)
+        self.assertIn('queries', self.metainfo.structures)
+
+    def test_entry_category_location(self):
+        """Test that ThesaurusEntry correctly finds its directory based on category"""
+        # Test a language (langs category)
+        python_entry = ThesaurusEntry('python', 'Python')
+        self.assertIn(os.path.join('web', 'thesauruses', 'langs', 'python'), python_entry.language_dir)
+        
+        # Test a database (databases category)
+        mysql_entry = ThesaurusEntry('mysql', 'MySQL')
+        self.assertIn(os.path.join('web', 'thesauruses', 'databases', 'mysql'), mysql_entry.language_dir)
+
+    def test_index_view_groups_by_category(self):
+        """Test that index view groups entries by category in the context"""
+        url = reverse('index')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        
+        languages_context = response.context['languages']
+        # languages_context should be a list of dicts, each with 'key', 'label', 'entries', 'structures'
+        
+        categories_found = [c['key'] for c in languages_context]
+        self.assertIn('langs', categories_found)
+        self.assertIn('databases', categories_found)
+        
+        langs_cat = next(c for c in languages_context if c['key'] == 'langs')
+        self.assertIn('python', langs_cat['entries'])
+        self.assertIn('data_types', langs_cat['structures'])
+        
+        db_cat = next(c for c in languages_context if c['key'] == 'databases')
+        self.assertIn('mysql', db_cat['entries'])
+        self.assertIn('queries', db_cat['structures'])
+        # Ensure 'data_types' is NOT in databases category if not defined there
+        self.assertNotIn('data_types', db_cat['structures'])
+
+    def test_compare_databases(self):
+        """Test comparing two database entries"""
+        # MySQL and PostgreSQL should both have 'queries'
+        url = reverse('index') + '?concept=queries&entry=mysql%3B8&entry=postgresql%3B15'
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertTemplateUsed(response, 'concepts.html')
+        
+        # Check that we have the database-specific titles/data
+        self.assertContains(response, 'Comparing MySQL (8) and PostgreSQL (15)')
+        self.assertContains(response, 'Queries')
+
+    def test_invalid_structure_for_category_returns_error(self):
+        """
+        Test that requesting a structure not belonging to the entry's category 
+        might result in a MissingStructureError (404).
+        Actually, load_entries just tries to load the file. 
+        If it's not there, it raises MissingStructureError.
+        """
+        # mysql does not have 'data_types.json' in its directory (I removed them in previous issue)
+        url = reverse('index') + '?concept=data_types&entry=mysql%3B8'
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
+        self.assertTemplateUsed(response, 'error_missing_structure.html')
+
+    def test_api_reference_databases(self):
+        """Test API reference for a database structure"""
+        url = reverse('api.reference', kwargs={
+            'structure_key': 'queries',
+            'lang': 'mysql',
+            'version': '8'
+        })
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        data = json.loads(response.content)
+        self.assertEqual(data['meta']['language'], 'mysql')
+        self.assertEqual(data['meta']['structure'], 'queries')
+
+    def test_api_compare_databases(self):
+        """Test API comparison for databases"""
+        url = reverse('api.compare', kwargs={
+            'structure_key': 'queries',
+            'lang1': 'mysql',
+            'version1': '8',
+            'lang2': 'postgresql',
+            'version2': '15'
+        })
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        data = json.loads(response.content)
+        self.assertEqual(data['meta']['entry_1'], 'mysql')
+        self.assertEqual(data['meta']['entry_2'], 'postgresql')
+        self.assertIn('concepts1', data)
+        self.assertIn('concepts2', data)
diff --git a/web/tests/test_db_models.py b/web/tests/test_db_models.py
index ae75184aa..e14073752 100644
--- a/web/tests/test_db_models.py
+++ b/web/tests/test_db_models.py
@@ -21,17 +21,17 @@ def test_lookup_data_creation(self):
             referer="http://google.com"
         )
         lookup = LookupData.objects.create(
-            language1="python",
+            entry1="python",
             version1="3",
-            language2="javascript",
+            entry2="javascript",
             version2="es6",
             structure="data_types",
             site_visit=visit
         )
         self.assertIsNotNone(lookup.id)
-        self.assertEqual(lookup.language1, "python")
+        self.assertEqual(lookup.entry1, "python")
         self.assertEqual(lookup.version1, "3")
-        self.assertEqual(lookup.language2, "javascript")
+        self.assertEqual(lookup.entry2, "javascript")
         self.assertEqual(lookup.version2, "es6")
         self.assertEqual(lookup.structure, "data_types")
         self.assertEqual(lookup.site_visit, visit)
diff --git a/web/tests/test_models.py b/web/tests/test_models.py
index cd7acbd86..fdb159044 100644
--- a/web/tests/test_models.py
+++ b/web/tests/test_models.py
@@ -14,7 +14,10 @@ def setUp(self):
         self.metainfo = ThesaurusMetaInfo()
         with open("web/thesauruses/meta_info.json", 'r') as meta_file:
             meta_data = json.load(meta_file)
-        self.structures = meta_data["structures"]
+        self.category_structures = meta_data["structures"]
+        self.structures = {}
+        for cat_structs in self.category_structures.values():
+            self.structures.update(cat_structs)
         self.languages = meta_data["languages"]
 
         self.sample = dict()
@@ -146,10 +149,10 @@ def test_language_get_concept_code(self):
 
     def test_language_versions(self):
         """test ThesaurusEntry#versions"""
-        language = ThesaurusEntry("python", "Python")
+        language = ThesaurusEntry("mysql", "MySQL")
         versions = language.versions()
         self.assertGreater(len(versions), 0)
-        self.assertIn("3", versions)
+        self.assertIn("8", versions)
 
     def test_language_load_filled_concepts(self):
         """test ThesaurusEntry#load_filled_concepts"""
@@ -192,6 +195,9 @@ def test_metainfo_load_entries_missing_structure(self):
         """test ThesaurusMetaInfo#load_entries with missing structure"""
         from web.models import MissingStructureError
         structure = self.metainfo.structure("data_types")
-        with self.assertRaises(MissingStructureError):
+        with self.assertRaises(MissingStructureError) as cm:
             # python 3 definitely has data_types, but let's try something that doesn't exist
             self.metainfo.load_entries([("python", "non_existent_version")], structure)
+        
+        self.assertEqual(cm.exception.entry_key, "python")
+        self.assertEqual(cm.exception.entry_version, "non_existent_version")
diff --git a/web/tests/test_views.py b/web/tests/test_views.py
index 324e2aec8..b3bcba1bb 100644
--- a/web/tests/test_views.py
+++ b/web/tests/test_views.py
@@ -85,7 +85,7 @@ def test_invalid_page_gives_404_error(self):
     def test_compare_concepts_view_both_valid_languages(self):
         """test if compare with 2 valid languages uses the correct templates"""
         url = reverse('index') + \
-              '?concept=data_types&lang=python%3B3&lang=java%3B17'
+              '?concept=data_types&entry=python%3B3&entry=java%3B17'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.OK)
@@ -94,7 +94,7 @@ def test_compare_concepts_view_both_valid_languages(self):
 
     def test_compare_concepts_view_both_invalid_languages(self):
         """test if compare with invalid languages uses the correct templates"""
-        url = reverse('index') + '?concept=data_types&lang=cupcake&lang=donut'
+        url = reverse('index') + '?concept=data_types&entry=cupcake&entry=donut'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -106,7 +106,7 @@ def test_compare_concepts_view_one_valid_one_invalid_language(self):
         """
         test if compare with one invalid language uses the correct templates
         """
-        url = reverse('index') + '?concept=data_types&lang=python&lang=donut'
+        url = reverse('index') + '?concept=data_types&entry=python&entry=donut'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -116,7 +116,7 @@ def test_compare_concepts_view_one_valid_one_invalid_language(self):
 
     def test_compare_concepts_view_invalid_concept(self):
         """test if compare with an invalid concept uses the correct templates"""
-        url = reverse('index') + '?concept=boop&lang=python&lang=haskell'
+        url = reverse('index') + '?concept=boop&entry=python&entry=haskell'
 
         response = self.client.get(url)
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -126,7 +126,7 @@ def test_compare_concepts_view_invalid_concept(self):
 
     def test_single_concepts_view_valid_language(self):
         """test if reference with a valid language uses the correct templates"""
-        url = reverse('index') + '?concept=data_types&lang=python%3B3'
+        url = reverse('index') + '?concept=data_types&entry=python%3B3'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.OK)
@@ -137,7 +137,7 @@ def test_single_concepts_view_invalid_languages(self):
         """
         test if reference with an invalid language uses the correct templates
         """
-        url = reverse('index') + '?concept=data_types&lang=cupcake'
+        url = reverse('index') + '?concept=data_types&entry=cupcake'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -149,7 +149,7 @@ def test_single_concepts_view_invalid_concept(self):
         """
         test if reference with an invalid concept uses the correct templates
         """
-        url = reverse('index') + '?concept=boop&lang=python'
+        url = reverse('index') + '?concept=boop&entry=python'
 
         response = self.client.get(url)
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -160,7 +160,7 @@ def test_single_concepts_view_invalid_concept(self):
     def test_compare_concepts_view_both_valid_friendly_languages(self):
         """test if compare with 2 valid languages uses the correct templates"""
         url = reverse('index') + \
-              '?concept=data_types&lang=Python%3B3&lang=Java%3B17'
+              '?concept=data_types&entry=Python%3B3&entry=Java%3B17'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -169,7 +169,7 @@ def test_compare_concepts_view_both_valid_friendly_languages(self):
 
     def test_compare_concepts_view_both_invalid_friendly_languages(self):
         """test if compare with invalid languages uses the correct templates"""
-        url = reverse('index') + '?concept=data_types&lang=Cupcake&lang=Donut'
+        url = reverse('index') + '?concept=data_types&entry=Cupcake&entry=Donut'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -181,7 +181,7 @@ def test_compare_concepts_view_one_valid_one_invalid_friendly_language(self):
         """
         test if compare with one invalid language uses the correct templates
         """
-        url = reverse('index') + '?concept=data_types&lang=Python&lang=donut'
+        url = reverse('index') + '?concept=data_types&entry=Python&entry=donut'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -189,7 +189,7 @@ def test_compare_concepts_view_one_valid_one_invalid_friendly_language(self):
         self.assertTemplateUsed(response, 'base.html')
         self.assertTemplateUsed(response, 'errormisc.html')
 
-        url = reverse('index') + '?concept=data_types&lang=python&lang=Donut'
+        url = reverse('index') + '?concept=data_types&entry=python&entry=Donut'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -199,7 +199,7 @@ def test_compare_concepts_view_one_valid_one_invalid_friendly_language(self):
 
     def test_compare_concepts_view_invalid_friendly_concept(self):
         """test if compare with an invalid concept uses the correct templates"""
-        url = reverse('index') + '?concept=Boop&lang=python&lang=haskell'
+        url = reverse('index') + '?concept=Boop&entry=python&entry=haskell'
 
         response = self.client.get(url)
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -209,7 +209,7 @@ def test_compare_concepts_view_invalid_friendly_concept(self):
 
     def test_single_concepts_view_valid_friendly_language(self):
         """test if reference with a valid language uses the correct templates"""
-        url = reverse('index') + '?concept=Data Types&lang=python%3B3'
+        url = reverse('index') + '?concept=Data Types&entry=python%3B3'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -220,7 +220,7 @@ def test_single_concepts_view_invalid_friendly_language(self):
         """
         test if reference with an invalid language uses the correct templates
         """
-        url = reverse('index') + '?concept=data_types&lang=Cupcake'
+        url = reverse('index') + '?concept=data_types&entry=Cupcake'
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -232,7 +232,7 @@ def test_single_concepts_view_invalid_friendly_concept(self):
         """
         test if reference with an invalid concept uses the correct templates
         """
-        url = reverse('index') + '?concept=Boop&lang=python'
+        url = reverse('index') + '?concept=Boop&entry=python'
 
         response = self.client.get(url)
         self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
@@ -299,13 +299,18 @@ def test_api_compare_valid(self):
 
     def test_concepts_view_valid_params(self):
         """Test concepts view with valid parameters that should return 200"""
-        url = reverse('index') + '?concept=data_types&lang=python%3B3&lang=javascript%3BECMAScript%202023'
+        url = reverse('index') + '?concept=data_types&entry=python%3B3&entry=javascript%3BECMAScript%202023'
         response = self.client.get(url)
         self.assertEqual(response.status_code, HTTPStatus.OK)
         self.assertTemplateUsed(response, 'concepts.html')
 
     def test_concepts_view_legacy_params(self):
-        """Test concepts view with legacy lang1/lang2 parameters"""
+        """Test concepts view with legacy lang/lang1/lang2 parameters"""
+        url = reverse('compare') + '?concept=data_types&lang=python%3B3'
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertTemplateUsed(response, 'concepts.html')
+
         url = reverse('compare') + '?concept=data_types&lang1=python%3B3&lang2=javascript%3BECMAScript%202023'
         response = self.client.get(url)
         self.assertEqual(response.status_code, HTTPStatus.OK)
@@ -314,22 +319,22 @@ def test_concepts_view_legacy_params(self):
     def test_concepts_view_logging(self):
         """test if the concepts view correctly logs to the database"""
         # test single language
-        url = reverse('index') + '?concept=data_types&lang=python%3B3'
+        url = reverse('index') + '?concept=data_types&entry=python%3B3'
         self.client.get(url)
         lookup = LookupData.objects.last()
-        self.assertEqual(lookup.language1, 'python')
+        self.assertEqual(lookup.entry1, 'python')
         self.assertEqual(lookup.version1, '3')
-        self.assertEqual(lookup.language2, '')
+        self.assertEqual(lookup.entry2, '')
         self.assertEqual(lookup.version2, '')
         self.assertEqual(lookup.structure, 'data_types')
 
         # test two languages
-        url = reverse('index') + '?concept=data_types&lang=python%3B3&lang=javascript%3BECMAScript%202023'
+        url = reverse('index') + '?concept=data_types&entry=python%3B3&entry=javascript%3BECMAScript%202023'
         self.client.get(url)
         lookup = LookupData.objects.last()
-        self.assertEqual(lookup.language1, 'python')
+        self.assertEqual(lookup.entry1, 'python')
         self.assertEqual(lookup.version1, '3')
-        self.assertEqual(lookup.language2, 'javascript')
+        self.assertEqual(lookup.entry2, 'javascript')
         self.assertEqual(lookup.version2, 'ECMAScript 2023')
         self.assertEqual(lookup.structure, 'data_types')
 
@@ -343,9 +348,9 @@ def test_api_logging(self):
         })
         self.client.get(url)
         lookup = LookupData.objects.last()
-        self.assertEqual(lookup.language1, 'python')
+        self.assertEqual(lookup.entry1, 'python')
         self.assertEqual(lookup.version1, '3')
-        self.assertEqual(lookup.language2, '')
+        self.assertEqual(lookup.entry2, '')
         self.assertEqual(lookup.version2, '')
         self.assertEqual(lookup.structure, 'data_types')
 
@@ -359,9 +364,9 @@ def test_api_logging(self):
         })
         self.client.get(url)
         lookup = LookupData.objects.last()
-        self.assertEqual(lookup.language1, 'python')
+        self.assertEqual(lookup.entry1, 'python')
         self.assertEqual(lookup.version1, '3')
-        self.assertEqual(lookup.language2, 'javascript')
+        self.assertEqual(lookup.entry2, 'javascript')
         self.assertEqual(lookup.version2, 'ECMAScript 2009')
         self.assertEqual(lookup.structure, 'data_types')
 
diff --git a/web/thesauruses/_meta/deletions.json b/web/thesauruses/_meta/deletions.json
new file mode 100644
index 000000000..430353e7d
--- /dev/null
+++ b/web/thesauruses/_meta/deletions.json
@@ -0,0 +1,12 @@
+{
+  "meta": {
+    "structure": "deletions",
+    "structure_name": "Deletions"
+  },
+  "categories": {
+    "Deleting Data": {
+      "delete_all": "Delete All Records",
+      "delete_where": "Delete with WHERE clause"
+    }
+  }
+}
diff --git a/web/thesauruses/_meta/filtering.json b/web/thesauruses/_meta/filtering.json
new file mode 100644
index 000000000..d20e336a3
--- /dev/null
+++ b/web/thesauruses/_meta/filtering.json
@@ -0,0 +1,12 @@
+{
+  "meta": {
+    "structure": "filtering",
+    "structure_name": "Filtering"
+  },
+  "categories": {
+    "Filtering Data": {
+      "where_clause": "WHERE Clause",
+      "limit_results": "Limit Results"
+    }
+  }
+}
diff --git a/web/thesauruses/_meta/inserts.json b/web/thesauruses/_meta/inserts.json
new file mode 100644
index 000000000..7caa31e42
--- /dev/null
+++ b/web/thesauruses/_meta/inserts.json
@@ -0,0 +1,12 @@
+{
+  "meta": {
+    "structure": "inserts",
+    "structure_name": "Inserts"
+  },
+  "categories": {
+    "Inserting Data": {
+      "insert_single": "Insert Single Record",
+      "insert_multiple": "Insert Multiple Records"
+    }
+  }
+}
diff --git a/web/thesauruses/_meta/queries.json b/web/thesauruses/_meta/queries.json
new file mode 100644
index 000000000..3ea452f26
--- /dev/null
+++ b/web/thesauruses/_meta/queries.json
@@ -0,0 +1,12 @@
+{
+  "meta": {
+    "structure": "queries",
+    "structure_name": "Queries"
+  },
+  "categories": {
+    "Basic Queries": {
+      "select_all": "Select All",
+      "select_columns": "Select Specific Columns"
+    }
+  }
+}
diff --git a/web/thesauruses/databases/mongodb/6/queries.json b/web/thesauruses/databases/mongodb/6/queries.json
new file mode 100644
index 000000000..464b1d31b
--- /dev/null
+++ b/web/thesauruses/databases/mongodb/6/queries.json
@@ -0,0 +1,16 @@
+{
+  "meta": {
+    "language": "mongodb",
+    "language_name": "MongoDB",
+    "structure": "queries",
+    "language_version": "6"
+  },
+  "concepts": {
+    "select_all": {
+      "code": "db.collection.find({});"
+    },
+    "select_columns": {
+      "code": "db.collection.find({}, { column1: 1, column2: 1 });"
+    }
+  }
+}
diff --git a/web/thesauruses/databases/mysql/8/queries.json b/web/thesauruses/databases/mysql/8/queries.json
new file mode 100644
index 000000000..d5de88ece
--- /dev/null
+++ b/web/thesauruses/databases/mysql/8/queries.json
@@ -0,0 +1,16 @@
+{
+  "meta": {
+    "language": "mysql",
+    "language_name": "MySQL",
+    "structure": "queries",
+    "language_version": "8"
+  },
+  "concepts": {
+    "select_all": {
+      "code": "SELECT * FROM table_name;"
+    },
+    "select_columns": {
+      "code": "SELECT column1, column2 FROM table_name;"
+    }
+  }
+}
diff --git a/web/thesauruses/databases/postgresql/15/queries.json b/web/thesauruses/databases/postgresql/15/queries.json
new file mode 100644
index 000000000..4f0302506
--- /dev/null
+++ b/web/thesauruses/databases/postgresql/15/queries.json
@@ -0,0 +1,16 @@
+{
+  "meta": {
+    "language": "postgresql",
+    "language_name": "PostgreSQL",
+    "structure": "queries",
+    "language_version": "15"
+  },
+  "concepts": {
+    "select_all": {
+      "code": "SELECT * FROM table_name;"
+    },
+    "select_columns": {
+      "code": "SELECT column1, column2 FROM table_name;"
+    }
+  }
+}
diff --git a/web/thesauruses/meta_info.json b/web/thesauruses/meta_info.json
index 72cbafb29..d4a3f45d0 100644
--- a/web/thesauruses/meta_info.json
+++ b/web/thesauruses/meta_info.json
@@ -1,4 +1,8 @@
 {
+  "categories": {
+    "langs": "Programming Languages",
+    "databases": "Databases"
+  },
   "languages": {
     "ada": "Ada",
     "bash": "Bash",
@@ -25,20 +29,32 @@
     "scala": "Scala",
     "swift": "Swift",
     "typescript": "TypeScript",
-    "vbnet": "Visual Basic"
+    "vbnet": "Visual Basic",
+    "sqlserver": "Microsoft SQL Server",
+    "mongodb": "MongoDB",
+    "mysql": "MySQL",
+    "postgresql": "PostgreSQL"
   },
   "structures": {
-    "classes": "Classes",
-    "control_structures": "Control Structures",
-    "data_types": "Data Types",
-    "exception_handling": "Exception Handling",
-    "functions": "Functions, Methods, and Subroutines",
-    "io": "Input and Output",
-    "language_basics": "Basics of A Programming Language",
-    "lists": "Lists, Arrays, and Hashed Lists",
-    "operators": "Logical and Mathematical/Arithmetic Operators",
-    "queues_stacks": "Queues and Stacks",
-    "rules_facts": "Rules and Facts",
-    "strings": "Strings"
+    "langs": {
+      "language_basics": "Basics of A Programming Language",
+      "classes": "Classes",
+      "control_structures": "Control Structures",
+      "data_types": "Data Types",
+      "exception_handling": "Exception Handling",
+      "functions": "Functions, Methods, and Subroutines",
+      "io": "Input and Output",
+      "lists": "Arrays and Hashed Lists",
+      "operators": "Logical and Mathematical/Arithmetic Operators",
+      "queues_stacks": "Queues and Stacks",
+      "rules_facts": "Rules and Facts",
+      "strings": "Strings"
+    },
+    "databases": {
+      "deletions": "Deletions",
+      "filtering": "Filtering",
+      "inserts": "Inserts",
+      "queries": "Queries"
+    }
   }
 }
diff --git a/web/views.py b/web/views.py
index 373bafb06..bb620d422 100644
--- a/web/views.py
+++ b/web/views.py
@@ -58,14 +58,14 @@ def store_url_info(request):
         return None
 
 
-def store_lookup_info(request, visit, language1, version1, language2, version2, structure):
+def store_lookup_info(request, visit, entry1, version1, entry2, version2, structure):
     if not visit:
         return
     try:
         info = LookupData(
-            language1=language1,
+            entry1=entry1,
             version1=version1,
-            language2=language2,
+            entry2=entry2,
             version2=version2,
             structure=structure,
             site_visit=visit
@@ -102,41 +102,76 @@ def index(request):
     """
 
     store_url_info(request)
-    if "lang" in request.GET and "concept" in request.GET:
+    if "entry" in request.GET and "concept" in request.GET:
         return concepts(request)
 
     meta_info = ThesaurusMetaInfo()
+    thesauruses_dir = os.path.join(BASE_DIR, 'web', 'thesauruses')
+    meta_dir = os.path.join(thesauruses_dir, '_meta')
+    meta_concepts = os.listdir(meta_dir)
 
     meta_data_entries = dict()
     for key in meta_info.languages:
         entry = meta_info.entry(key)
-        meta_data_entries[key] = [{
+        # Find which category this entry belongs to
+        category_name = "Other"
+        for cat_key, cat_label in meta_info.categories.items():
+            if os.path.exists(os.path.join(thesauruses_dir, cat_key, key)):
+                category_name = cat_label
+                break
+        
+        meta_data_entries[key] = {
             "name": entry.name,
-            "version": version,
-            "availStructs": []
-        } for version in entry.versions()]
+            "category": category_name,
+            "versions": [{
+                "name": entry.name,
+                "version": version,
+                "availStructs": []
+            } for version in entry.versions()]
+        }
 
-    random_entries = random.sample(list(meta_data_entries.values()), k=3)
+    random_entries = random.sample(list(meta_data_entries.values()), k=min(3, len(meta_data_entries)))
 
-    thesauruses_dir = os.path.join(BASE_DIR, 'web', 'thesauruses')
-    meta_dir = os.path.join(thesauruses_dir, '_meta')
-    meta_concepts = os.listdir(meta_dir)
-    for entry_dir in os.listdir(thesauruses_dir):
-        if 'meta' in entry_dir:
+    for category in os.listdir(thesauruses_dir):
+        category_path = os.path.join(thesauruses_dir, category)
+        if category == '_meta' or not os.path.isdir(category_path):
             continue
-        for ver in os.listdir(os.path.join(thesauruses_dir, entry_dir)):
-            for concept_json in meta_concepts:
-                concept_name = concept_json.split('.')[0]
-                if os.path.isdir(os.path.join(thesauruses_dir, entry_dir, ver)):
-                    if concept_json in os.listdir(os.path.join(thesauruses_dir, entry_dir, ver)):
-                        for i in meta_data_entries[entry_dir]:
-                            if i['version'] == ver:
-                                i['availStructs'].append(concept_name)
-                                break
+        for entry_dir in os.listdir(category_path):
+            entry_path = os.path.join(category_path, entry_dir)
+            if not os.path.isdir(entry_path):
+                continue
+            for ver in os.listdir(entry_path):
+                ver_path = os.path.join(entry_path, ver)
+                if not os.path.isdir(ver_path):
+                    continue
+                for concept_json in meta_concepts:
+                    concept_name = concept_json.split('.')[0]
+                    if concept_json in os.listdir(ver_path):
+                        if entry_dir in meta_data_entries:
+                            for i in meta_data_entries[entry_dir]['versions']:
+                                if i['version'] == ver:
+                                    i['availStructs'].append(concept_name)
+                                    break
+
+    # Group meta_data_entries by category for the template
+    grouped_entries = []
+    for cat_key, cat_label in meta_info.categories.items():
+        category_data = {
+            "key": cat_key,
+            "label": cat_label,
+            "entries": {},
+            "structures": meta_info.category_structures.get(cat_key, {})
+        }
+        for key, data in meta_data_entries.items():
+            if data['category'] == cat_label:
+                category_data["entries"][key] = data['versions']
+        
+        if category_data["entries"]:
+            grouped_entries.append(category_data)
 
     content = {
         'title': 'Welcome',
-        'languages': meta_data_entries,
+        'languages': grouped_entries,
         'structures': meta_info.structures,
         'randomLanguages': random_entries,
         'description': 'Code Thesaurus: A polyglot developer reference tool'
@@ -159,16 +194,16 @@ def statistics(request):
     # Most popular languages (considering both language1 and language2)
     # We need to aggregate counts for each language across both fields.
     # A simple way is to get counts for each and then merge them in Python.
-    lang1_counts = LookupData.objects.values('language1').annotate(count=Count('language1'))
-    lang2_counts = LookupData.objects.exclude(language2='').values('language2').annotate(count=Count('language2'))
+    entry1_counts = LookupData.objects.values('entry1').annotate(count=Count('entry1'))
+    entry2_counts = LookupData.objects.exclude(entry2='').values('entry2').annotate(count=Count('entry2'))
 
     combined_counts = {}
-    for item in lang1_counts:
-        lang = item['language1']
-        combined_counts[lang] = combined_counts.get(lang, 0) + item['count']
-    for item in lang2_counts:
-        lang = item['language2']
-        combined_counts[lang] = combined_counts.get(lang, 0) + item['count']
+    for item in entry1_counts:
+        entry = item['entry1']
+        combined_counts[entry] = combined_counts.get(entry, 0) + item['count']
+    for item in entry2_counts:
+        entry = item['entry2']
+        combined_counts[entry] = combined_counts.get(entry, 0) + item['count']
 
     sorted_langs = sorted(combined_counts.items(), key=lambda x: x[1], reverse=True)
     popular_languages = []
@@ -192,24 +227,24 @@ def statistics(request):
     # Most popular comparisons
     # Using a technique to ensure (lang1, lang2) is treated the same as (lang2, lang1) if we wanted to,
     # but let's keep it simple and just look at pairs as they are.
-    comparison_counts = LookupData.objects.exclude(language2='').values('language1', 'language2').annotate(count=Count('id')).order_by('-count')[:10]
+    comparison_counts = LookupData.objects.exclude(entry2='').values('entry1', 'entry2').annotate(count=Count('id')).order_by('-count')[:10]
     popular_comparisons = []
     for item in comparison_counts:
         try:
-            name1 = meta_info.entry_name(item['language1'])
+            name1 = meta_info.entry_name(item['entry1'])
         except (KeyError, MissingEntryError):
-            name1 = item['language1']
+            name1 = item['entry1']
         try:
-            name2 = meta_info.entry_name(item['language2'])
+            name2 = meta_info.entry_name(item['entry2'])
         except (KeyError, MissingEntryError):
-            name2 = item['language2']
+            name2 = item['entry2']
         popular_comparisons.append({'lang1': name1, 'lang2': name2, 'count': item['count']})
 
     total_visits = SiteVisit.objects.count()
     total_lookups = LookupData.objects.count()
 
     # Unique language comparisons
-    unique_comparisons_count = LookupData.objects.exclude(language2='').values('language1', 'language2').distinct().count()
+    unique_comparisons_count = LookupData.objects.exclude(entry2='').values('entry1', 'entry2').distinct().count()
 
     # Unique concept categories (structures) looked up
     unique_structures_count = LookupData.objects.values('structure').distinct().count()
@@ -218,12 +253,12 @@ def statistics(request):
     concept_lang_counts = {}
     for entry in LookupData.objects.all():
         # Count for language 1
-        key1 = (entry.language1, entry.structure)
-        concept_lang_counts[key1] = concept_lang_counts.get(key1, 0) + 1
+        key1 = (entry.entry1, entry.structure)
+        concept_lang_counts[key1] = concept_lang_counts[key1] + 1 if key1 in concept_lang_counts else 1
         # Count for language 2 if it exists
-        if entry.language2:
-            key2 = (entry.language2, entry.structure)
-            concept_lang_counts[key2] = concept_lang_counts.get(key2, 0) + 1
+        if entry.entry2:
+            key2 = (entry.entry2, entry.structure)
+            concept_lang_counts[key2] = concept_lang_counts[key2] + 1 if key2 in concept_lang_counts else 1
     
     sorted_concept_langs = sorted(concept_lang_counts.items(), key=lambda x: x[1], reverse=True)
     popular_concept_langs = []
@@ -248,13 +283,13 @@ def statistics(request):
     recent_lookups = []
     for item in recent_lookups_query:
         try:
-            name1 = meta_info.entry_name(item.language1)
+            name1 = meta_info.entry_name(item.entry1)
         except (KeyError, MissingEntryError):
-            name1 = item.language1
+            name1 = item.entry1
         try:
-            name2 = meta_info.entry_name(item.language2) if item.language2 else None
+            name2 = meta_info.entry_name(item.entry2) if item.entry2 else None
         except (KeyError, MissingEntryError):
-            name2 = item.language2
+            name2 = item.entry2
         
         try:
             struct_name = meta_info.structure_name(item.structure)
@@ -344,7 +379,7 @@ def concepts(request):
     """
     visit = store_url_info(request)
 
-    language_strings, structure_key, errors = clean_concepts_parameters(request.GET)
+    entry_strings, structure_key, errors = clean_concepts_parameters(request.GET)
     if errors:
         return render_errors(request, errors)
 
@@ -356,13 +391,13 @@ def concepts(request):
                 Double-check your URL and try again."])
 
     try:
-        entries = meta_info.load_entries(language_strings, meta_structure)
+        entries = meta_info.load_entries(entry_strings, meta_structure)
     except MissingStructureError as missing_structure:
         store_missing_info(
             visit,
             'structure',
             missing_structure.structure.key,
-            missing_structure.language_key
+            missing_structure.entry_key
         )
         return HttpResponseNotFound(render(
             request,
@@ -370,13 +405,13 @@ def concepts(request):
             {
                 "key": missing_structure.structure.key,
                 "name": missing_structure.structure.name,
-                "lang": missing_structure.language_key,
-                "lang_name": missing_structure.language_name,
-                "version": missing_structure.language_version,
+                "entry": missing_structure.entry_key,
+                "entry_name": missing_structure.entry_name,
+                "version": missing_structure.entry_version,
                 "template": generate_entry_template(
-                    missing_structure.language_key,
+                    missing_structure.entry_key,
                     missing_structure.structure.key,
-                    missing_structure.language_version
+                    missing_structure.entry_version
                 )
             }
         ))
@@ -434,12 +469,11 @@ def concepts(request):
 def render_concepts(request, entries, structure, all_categories):
     """Renders the `structure` page for all `entries`"""
 
-    entry_name_versions = [f"{l.name} ({l.version})" for l in entries]
+    entry_name_versions = [f"{l.name} (version {l.version})" for l in entries]
     if len(entries) == 1:
         title = f"Reference for {entry_name_versions[0]}"
     else:
-        title = f"Comparing {', '.join(entry_name_versions[:-1])}\
-                and {entry_name_versions[-1]}"
+        title = f"Comparing {', '.join(entry_name_versions[:-1])} and {entry_name_versions[-1]}"
 
 
     response = {
@@ -615,28 +649,30 @@ def render_errors(request, errors):
 def clean_concepts_parameters(parameters):
     """Verify and clean up the parameters for concepts view"""
 
-    language_strings = list(parameters.getlist('lang'))
+    entry_strings = list(parameters.getlist('entry'))
     # legacy parameter names
+    if "lang" in parameters:
+        entry_strings.append(parameters['lang'])
     if "lang1" in parameters:
-        language_strings.append(parameters['lang1'])
+        entry_strings.append(parameters['lang1'])
     if "lang2" in parameters:
-        language_strings.append(parameters['lang2'])
+        entry_strings.append(parameters['lang2'])
 
-    language_keys_versions = []
-    for lang in language_strings:
-        key_version = escape(strip_tags(lang)).split(";")
+    entry_keys_versions = []
+    for entry_str in entry_strings:
+        key_version = escape(strip_tags(entry_str)).split(";")
         try:
-            language_keys_versions.append((key_version[0], key_version[1]))
+            entry_keys_versions.append((key_version[0], key_version[1]))
         except IndexError:
-            language_keys_versions.append((key_version[0], None))
+            entry_keys_versions.append((key_version[0], None))
     structure_key = escape(strip_tags(parameters.get('concept', '')))
 
     errors = []
     if not structure_key:
         errors.append("The URL didn't specify a structure/concept to look up.")
-    if not language_keys_versions:
-        errors.append("The URL didn't specify any languages to look up.")
-    return language_keys_versions, structure_key, errors
+    if not entry_keys_versions:
+        errors.append("The URL didn't specify any entries to look up.")
+    return entry_keys_versions, structure_key, errors
 
 
 # API functions

From 3f90defa7b4a70b7d9ff53d37b71673392be7678 Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Wed, 1 Jul 2026 15:45:14 -0400
Subject: [PATCH 04/15] Add CodeQL and security checkers, optimize other CI/CD

---
 .github/workflows/check-docker-build.yml      |  7 +++
 .github/workflows/codeql.yml                  | 56 ++++++++++++++++++
 .github/workflows/json-validate.yml           |  2 +
 .github/workflows/run-unit-tests.yml          | 12 ++++
 .github/workflows/security.yml                | 59 +++++++++++++++++++
 ...guage-info-files.yml => validate-data.yml} | 22 +++++--
 .github/workflows/validate-meta-info-file.yml | 35 -----------
 Dockerfile                                    | 33 +++++++++--
 docker-entrypoint.sh                          | 15 +++++
 9 files changed, 196 insertions(+), 45 deletions(-)
 create mode 100644 .github/workflows/codeql.yml
 create mode 100644 .github/workflows/security.yml
 rename .github/workflows/{validate-language-info-files.yml => validate-data.yml} (56%)
 delete mode 100644 .github/workflows/validate-meta-info-file.yml
 create mode 100644 docker-entrypoint.sh

diff --git a/.github/workflows/check-docker-build.yml b/.github/workflows/check-docker-build.yml
index 46590c0c7..6e85b2146 100644
--- a/.github/workflows/check-docker-build.yml
+++ b/.github/workflows/check-docker-build.yml
@@ -2,6 +2,13 @@ name: Check Docker Build
 
 on:
   pull_request:
+    paths:
+      - 'Dockerfile'
+      - 'docker-compose.yml'
+      - 'docker-entrypoint.sh'
+      - 'requirements.txt'
+      - 'Procfile'
+      - '.github/workflows/check-docker-build.yml'
 
 jobs:
   check:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..a42fbc552
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,56 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+    paths:
+      - '**.py'
+      - 'requirements.txt'
+      - '.github/workflows/codeql.yml'
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+    paths:
+      - '**.py'
+      - 'requirements.txt'
+      - '.github/workflows/codeql.yml'
+  schedule:
+    - cron: '45 4 * * *' # Daily at 04:45 UTC
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL packets: https://aka.ms/codeql-package-config
+        # queries: security-extended,security-and-quality
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/json-validate.yml b/.github/workflows/json-validate.yml
index df32f8399..91f85ce65 100644
--- a/.github/workflows/json-validate.yml
+++ b/.github/workflows/json-validate.yml
@@ -5,6 +5,8 @@ on:
     paths:
       - '**.json'
   pull_request:
+    paths:
+      - '**.json'
 
 jobs:
   check:
diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml
index 46b4da23c..fe2203378 100644
--- a/.github/workflows/run-unit-tests.yml
+++ b/.github/workflows/run-unit-tests.yml
@@ -4,9 +4,21 @@ on:
   push:
     branches:
       - main
+    paths:
+      - 'web/**'
+      - 'codethesaurus/**'
+      - 'requirements.txt'
+      - 'manage.py'
+      - '.github/workflows/run-unit-tests.yml'
   pull_request:
     branches:
       - main
+    paths:
+      - 'web/**'
+      - 'codethesaurus/**'
+      - 'requirements.txt'
+      - 'manage.py'
+      - '.github/workflows/run-unit-tests.yml'
 
 jobs:
   run:
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
new file mode 100644
index 000000000..57c1dc882
--- /dev/null
+++ b/.github/workflows/security.yml
@@ -0,0 +1,59 @@
+name: Security Scans
+
+on:
+  push:
+    branches: [ "main" ]
+    paths:
+      - '**.py'
+      - 'requirements.txt'
+      - '.github/workflows/security.yml'
+  pull_request:
+    branches: [ "main" ]
+    paths:
+      - '**.py'
+      - 'requirements.txt'
+      - '.github/workflows/security.yml'
+  schedule:
+    - cron: '30 4 * * *' # Daily at 04:30 UTC
+
+jobs:
+  bandit:
+    name: Bandit (SAST)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+
+      - name: Install Bandit
+        run: pip install bandit
+
+      - name: Run Bandit
+        # -r: recursive, -ll: medium severity or higher, -x: exclude directories
+        run: bandit -r . -ll -x ./venv,./web/tests,./staticfiles
+
+  dependency-check:
+    name: Dependency Scan
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.13'
+
+      - name: Install dependencies
+        run: |
+          pip install pip-audit safety
+
+      - name: Run pip-audit
+        run: pip-audit -r requirements.txt
+
+      - name: Run Safety
+        run: safety check -r requirements.txt --full-report || echo "Safety found some issues or failed (likely due to missing API key for latest DB)"
diff --git a/.github/workflows/validate-language-info-files.yml b/.github/workflows/validate-data.yml
similarity index 56%
rename from .github/workflows/validate-language-info-files.yml
rename to .github/workflows/validate-data.yml
index 2ff777a76..50ddb5143 100644
--- a/.github/workflows/validate-language-info-files.yml
+++ b/.github/workflows/validate-data.yml
@@ -1,19 +1,28 @@
-name: Validate ThesaurusEntry Info Files
+name: Validate Thesaurus Data
 
 on:
   push:
     branches:
       - main
+    paths:
+      - 'web/thesauruses/**'
+      - 'requirements.txt'
+      - 'manage.py'
+      - '.github/workflows/validate-data.yml'
   pull_request:
     branches:
       - main
+    paths:
+      - 'web/thesauruses/**'
+      - 'requirements.txt'
+      - 'manage.py'
+      - '.github/workflows/validate-data.yml'
 
 jobs:
-  run:
-    name: Validate ThesaurusEntry Info Files
+  validate:
+    name: Validate Data Files
     runs-on: ubuntu-latest
     steps:
-
       - name: Checkout the branch
         uses: actions/checkout@v4
 
@@ -31,5 +40,8 @@ jobs:
       - name: Create SQLite local database
         run: python manage.py migrate
 
-      - name: Run validate command
+      - name: Validate Meta Info File
+        run: python manage.py validatemetainfofile
+
+      - name: Validate Language Info Files
         run: python manage.py validatelanginfofiles
diff --git a/.github/workflows/validate-meta-info-file.yml b/.github/workflows/validate-meta-info-file.yml
deleted file mode 100644
index 0a1a80c13..000000000
--- a/.github/workflows/validate-meta-info-file.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Validate Meta Info File
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  run:
-    name: Validate Meta Info File
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout the branch
-        uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.11.4
-          cache: 'pip'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-
-      - name: Create SQLite local database
-        run: python manage.py migrate
-
-      - name: Run validate command
-        run: python manage.py validatemetainfofile
diff --git a/Dockerfile b/Dockerfile
index fac3ce741..df6d3fdb2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,37 @@
 FROM python:3.12-slim
-ENV PYTHONBUFFERED=1
+
+# Set environment variables
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1
+
 WORKDIR /code
+
+# Install system dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
     libpq-dev \
     gcc \
     && rm -rf /var/lib/apt/lists/*
+
+# Install Python dependencies
 COPY requirements.txt /code/
 RUN pip install --no-cache-dir -r requirements.txt
-COPY . .
+
+# Copy the entrypoint script and make it executable
+COPY docker-entrypoint.sh /code/
+RUN chmod +x /code/docker-entrypoint.sh
+
+# Create a non-root user and give them ownership of the code directory
+RUN useradd -m django && chown -R django:django /code
+USER django
+
+# Copy the rest of the application code
+COPY --chown=django:django . .
+
+# Expose the port the app runs on
 EXPOSE 8000
-CMD python manage.py migrate && \
-    python manage.py collectstatic --clear --no-input && \
-    python manage.py runserver 0.0.0.0:8000
+
+# Set the entrypoint script
+ENTRYPOINT ["/code/docker-entrypoint.sh"]
+
+# Default command to run the application
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100644
index 000000000..06238ce17
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+# Run migrations if needed
+echo "Applying database migrations..."
+python manage.py migrate --noinput
+
+# Collect static files if needed (usually for production, but good to have)
+if [ "$SYSTEM_ENV" = "PRODUCTION" ] || [ "$SYSTEM_ENV" = "STAGING" ]; then
+    echo "Collecting static files..."
+    python manage.py collectstatic --noinput --clear
+fi
+
+exec "$@"

From fa2f6d0fe6cb13f59bc150f3a08ffadac691977f Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Sun, 13 Sep 2026 12:35:39 -0400
Subject: [PATCH 05/15] Add comprehensive test coverage for commands,
 generators, middleware, models, and views

---
 web/tests/test_commands.py     | 56 ++++++++++++++++++++++++++++
 web/tests/test_generators.py   | 39 +++++++++++++++++++
 web/tests/test_middleware.py   | 26 +++++++++++++
 web/tests/test_models_extra.py | 55 +++++++++++++++++++++++++++
 web/tests/test_views_extra.py  | 68 ++++++++++++++++++++++++++++++++++
 5 files changed, 244 insertions(+)
 create mode 100644 web/tests/test_commands.py
 create mode 100644 web/tests/test_generators.py
 create mode 100644 web/tests/test_middleware.py
 create mode 100644 web/tests/test_models_extra.py
 create mode 100644 web/tests/test_views_extra.py

diff --git a/web/tests/test_commands.py b/web/tests/test_commands.py
new file mode 100644
index 000000000..2754163db
--- /dev/null
+++ b/web/tests/test_commands.py
@@ -0,0 +1,56 @@
+import os
+import shutil
+from io import StringIO
+from django.core.management import call_command
+from django.test import TestCase
+
+class TestCommands(TestCase):
+    def test_validatemetainfofile_command(self):
+        out = StringIO()
+        call_command('validatemetainfofile', stdout=out)
+        self.assertIn('No errors found in meta_info.json.', out.getvalue())
+
+    def test_validatelanginfofiles_command(self):
+        out = StringIO()
+        # This might take a while as it validates all files
+        call_command('validatelanginfofiles', stdout=out)
+        # It should at least finish without error and say something positive
+        # Depending on the output of that command
+        self.assertIn('no issues found', out.getvalue().lower())
+
+    def test_generate_template_command(self):
+        out = StringIO()
+        test_lang = 'test_lang'
+        test_version = '1.0'
+        test_structure = 'data_types'
+        
+        # Ensure cleanup
+        test_lang_dir = os.path.join('web', 'thesauruses', test_lang)
+        if os.path.exists(test_lang_dir):
+            shutil.rmtree(test_lang_dir)
+            
+        try:
+            call_command(
+                'generate_template', 
+                test_lang, 
+                test_structure, 
+                language_version=test_version, 
+                stdout=out
+            )
+            
+            self.assertIn('Created template file', out.getvalue())
+            
+            # Verify file exists
+            expected_file = os.path.join('web', 'thesauruses', test_lang, '1', f'{test_structure}.json')
+            self.assertTrue(os.path.exists(expected_file))
+            
+        finally:
+            # Cleanup
+            if os.path.exists(test_lang_dir):
+                shutil.rmtree(test_lang_dir)
+
+    def test_generate_missing_templates_command(self):
+        # This one uses os.system('python manage.py ...') which is hard to test with call_command
+        # and it might try to generate MANY files.
+        # Maybe skip for now or mock os.system
+        pass
diff --git a/web/tests/test_generators.py b/web/tests/test_generators.py
new file mode 100644
index 000000000..29c5d61c1
--- /dev/null
+++ b/web/tests/test_generators.py
@@ -0,0 +1,39 @@
+import json
+from django.test import TestCase
+from web.thesaurus_template_generators import generate_entry_template, generate_meta_template
+
+class TestGenerators(TestCase):
+    def test_generate_entry_template_valid(self):
+        # Using python and data_types which should exist
+        template_str = generate_entry_template('python', 'data_types')
+        template = json.loads(template_str)
+        
+        self.assertEqual(template['meta']['language'], 'python')
+        self.assertEqual(template['meta']['structure'], 'data_types')
+        self.assertIn('concepts', template)
+        # Should have some concepts
+        self.assertTrue(len(template['concepts']) > 0)
+        
+        # Check a specific concept
+        # We need to know at least one concept key from data_types
+        # From meta_info.json/langs/data_types.json
+        self.assertIn('boolean', template['concepts'])
+        self.assertEqual(template['concepts']['boolean']['name'], 'Boolean')
+
+    def test_generate_entry_template_with_version(self):
+        template_str = generate_entry_template('python', 'data_types', version='3')
+        template = json.loads(template_str)
+        self.assertEqual(template['meta']['language_version'], '3')
+
+    def test_generate_entry_template_invalid_structure(self):
+        with self.assertRaises(ValueError):
+            generate_entry_template('python', 'non_existent_structure')
+
+    def test_generate_meta_template(self):
+        template_str = generate_meta_template('new_structure', 'New Structure Name')
+        template = json.loads(template_str)
+        
+        self.assertEqual(template['meta']['structure'], 'new_structure')
+        self.assertEqual(template['meta']['structure_name'], 'New Structure Name')
+        self.assertIn('categories', template)
+        self.assertIn('First Category Name', template['categories'])
diff --git a/web/tests/test_middleware.py b/web/tests/test_middleware.py
new file mode 100644
index 000000000..180b30857
--- /dev/null
+++ b/web/tests/test_middleware.py
@@ -0,0 +1,26 @@
+from django.test import TestCase, RequestFactory
+from django.db.utils import OperationalError
+from django.http import HttpResponse
+from web.middleware import DatabaseDownMiddleware
+from unittest.mock import Mock
+
+class TestDatabaseDownMiddleware(TestCase):
+    def setUp(self):
+        self.factory = RequestFactory()
+
+    def test_middleware_passes_through_normal_response(self):
+        get_response = Mock(return_value=HttpResponse("OK"))
+        middleware = DatabaseDownMiddleware(get_response)
+        request = self.factory.get('/')
+        response = middleware(request)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, b"OK")
+
+    def test_middleware_catches_operational_error(self):
+        get_response = Mock(side_effect=OperationalError("Database is down"))
+        middleware = DatabaseDownMiddleware(get_response)
+        request = self.factory.get('/')
+        response = middleware(request)
+        self.assertEqual(response.status_code, 500)
+        # Check if the error500.html template was used
+        self.assertContains(response, "We’ll be back soon!", status_code=500)
diff --git a/web/tests/test_models_extra.py b/web/tests/test_models_extra.py
new file mode 100644
index 000000000..517431e12
--- /dev/null
+++ b/web/tests/test_models_extra.py
@@ -0,0 +1,55 @@
+from django.test import TestCase
+from web.models import ThesaurusEntry
+
+class TestModelsExtra(TestCase):
+    def setUp(self):
+        self.entry = ThesaurusEntry("test_lang", "Test Language")
+        self.entry.concepts = {
+            "complete": {
+                "code": "print(1)",
+                "comment": "print one"
+            },
+            "code_only": {
+                "code": "print(2)"
+            },
+            "comment_only": {
+                "comment": "comment only"
+            },
+            "not_impl": {
+                "not-implemented": True
+            },
+            "not_impl_with_comment": {
+                "not-implemented": True,
+                "comment": "not implemented yet"
+            },
+            "empty": {
+                "code": ""
+            }
+        }
+
+    def test_is_concept_complete(self):
+        # complete: code + comment
+        self.assertTrue(self.entry.is_concept_complete("complete"))
+        # code_only: it has code, so it's "complete" per implementation (either code OR comment)
+        self.assertTrue(self.entry.is_concept_complete("code_only"))
+        # comment_only: it has comment, so it's "complete"
+        self.assertTrue(self.entry.is_concept_complete("comment_only"))
+        # empty: no code, no comment
+        self.assertFalse(self.entry.is_concept_complete("empty"))
+        # not_impl: explicitly marked as not-implemented, so it's "complete" knowledge
+        self.assertTrue(self.entry.is_concept_complete("not_impl"))
+
+    def test_has_any_implemented_in_category(self):
+        # complete is implemented
+        self.assertTrue(self.entry.has_any_implemented_in_category(["complete", "not_impl"]))
+        # both not_impl and not_impl_with_comment are not-implemented
+        self.assertFalse(self.entry.has_any_implemented_in_category(["not_impl", "not_impl_with_comment"]))
+
+    def test_is_category_incomplete(self):
+        # A category is incomplete if any of its implemented concepts is NOT complete (no code AND no comment)
+        # "empty" has no code and no comment, so it's incomplete
+        self.assertTrue(self.entry.is_category_incomplete(["complete", "empty"]))
+        # "complete" and "not_impl" are both considered "complete" or don't contribute to incompleteness
+        self.assertFalse(self.entry.is_category_incomplete(["complete", "not_impl"]))
+        # Unknown concept also makes it incomplete
+        self.assertTrue(self.entry.is_category_incomplete(["unknown_concept"]))
diff --git a/web/tests/test_views_extra.py b/web/tests/test_views_extra.py
new file mode 100644
index 000000000..0231e97ab
--- /dev/null
+++ b/web/tests/test_views_extra.py
@@ -0,0 +1,68 @@
+from django.test import TestCase
+from django.urls import reverse
+from http import HTTPStatus
+
+class TestViewsExtra(TestCase):
+    def test_concepts_invalid_structure(self):
+        url = reverse('index') + '?concept=invalid_struct&entry=python%3B3'
+        response = self.client.get(url)
+        # Should show errors
+        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
+        self.assertContains(response, "structure/concept isn", status_code=HTTPStatus.NOT_FOUND)
+
+    def test_concepts_invalid_entry(self):
+        url = reverse('index') + '?concept=data_types&entry=invalid_lang%3B1'
+        response = self.client.get(url)
+        # Should show errors
+        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
+        self.assertContains(response, "entry", status_code=HTTPStatus.NOT_FOUND)
+        self.assertContains(response, "isn", status_code=HTTPStatus.NOT_FOUND)
+        self.assertContains(response, "valid", status_code=HTTPStatus.NOT_FOUND)
+
+    def test_concepts_missing_version_file(self):
+        # python exists, but let's try a version that doesn't have data_types.json
+        # Note: If it doesn't exist at all, it might be a MissingEntryError if not in meta_info.json
+        # but if it is in meta_info but file is missing, it's MissingStructureError.
+        # Python 2 is likely in meta_info but might not have all files.
+        url = reverse('index') + '?concept=queries&entry=python%3B3'
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
+        self.assertTemplateUsed(response, "error_missing_structure.html")
+
+    def test_single_entry_reference(self):
+        url = reverse('index') + '?concept=data_types&entry=python%3B3'
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertContains(response, 'Reference for Python (version 3)')
+
+    def test_api_reference_invalid(self):
+        url = reverse('api.reference', kwargs={
+            'structure_key': 'invalid_struct',
+            'lang': 'python',
+            'version': '3'
+        })
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
+
+    def test_api_compare_invalid_lang(self):
+        url = reverse('api.compare', kwargs={
+            'structure_key': 'data_types',
+            'lang1': 'python',
+            'version1': '3',
+            'lang2': 'invalid_lang',
+            'version2': '1'
+        })
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
+
+    def test_statistics_view(self):
+        url = reverse('statistics')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertTemplateUsed(response, 'statistics.html')
+
+    def test_about_view(self):
+        url = reverse('about')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertTemplateUsed(response, 'about.html')

From a5f75018b50cff2c7689f9338520c75b526b5c4b Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Sun, 13 Sep 2026 12:35:55 -0400
Subject: [PATCH 06/15] Refactor template generation, update error handling,
 and clean up meta info configuration

---
 .gitignore                                   | 1 +
 web/management/commands/generate_template.py | 4 ++--
 web/tests/test_categories.py                 | 2 +-
 web/thesauruses/meta_info.json               | 1 -
 web/views.py                                 | 6 ++----
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index a4e8fc8b2..cf32682c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ __pycache__
 public_html/
 staticfiles/
 *.sqlite3
+/.junie
\ No newline at end of file
diff --git a/web/management/commands/generate_template.py b/web/management/commands/generate_template.py
index 23a94d245..6ad989dc0 100644
--- a/web/management/commands/generate_template.py
+++ b/web/management/commands/generate_template.py
@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 
-from web.thesaurus_template_generators import generate_language_template
+from web.thesaurus_template_generators import generate_entry_template
 from web.models import ThesaurusMetaInfo
 from packaging.version import parse as parse_version
 
@@ -28,7 +28,7 @@ def handle(self, *args, **options):
 
     def generate_file(self, language, structure, language_version):
         try:
-            template = generate_language_template(
+            template = generate_entry_template(
                 language,
                 structure,
                 language_version
diff --git a/web/tests/test_categories.py b/web/tests/test_categories.py
index b709ae038..546e4a934 100644
--- a/web/tests/test_categories.py
+++ b/web/tests/test_categories.py
@@ -75,7 +75,7 @@ def test_compare_databases(self):
         self.assertTemplateUsed(response, 'concepts.html')
         
         # Check that we have the database-specific titles/data
-        self.assertContains(response, 'Comparing MySQL (8) and PostgreSQL (15)')
+        self.assertContains(response, 'Comparing MySQL (version 8) and PostgreSQL (version 15)')
         self.assertContains(response, 'Queries')
 
     def test_invalid_structure_for_category_returns_error(self):
diff --git a/web/thesauruses/meta_info.json b/web/thesauruses/meta_info.json
index d4a3f45d0..a43cc1b4c 100644
--- a/web/thesauruses/meta_info.json
+++ b/web/thesauruses/meta_info.json
@@ -30,7 +30,6 @@
     "swift": "Swift",
     "typescript": "TypeScript",
     "vbnet": "Visual Basic",
-    "sqlserver": "Microsoft SQL Server",
     "mongodb": "MongoDB",
     "mysql": "MySQL",
     "postgresql": "PostgreSQL"
diff --git a/web/views.py b/web/views.py
index bb620d422..222ff1d74 100644
--- a/web/views.py
+++ b/web/views.py
@@ -387,8 +387,7 @@ def concepts(request):
     try:
         meta_structure = meta_info.structure(structure_key)
     except KeyError:
-        return render_errors(request, ["The structure/concept isn't valid. \
-                Double-check your URL and try again."])
+        return render_errors(request, ["The structure/concept isn't valid. Double-check your URL and try again."])
 
     try:
         entries = meta_info.load_entries(entry_strings, meta_structure)
@@ -417,8 +416,7 @@ def concepts(request):
         ))
     except MissingEntryError as missing_entry:
         store_missing_info(visit, 'language', missing_entry.key)
-        errors.append(f"The entry \"{missing_entry.key}\" isn't valid. \
-                        Double-check your URL and try again.")
+        errors.append(f"The entry \"{missing_entry.key}\" isn't valid. Double-check your URL and try again.")
 
     if errors:
         return render_errors(request, errors)

From c8863dcef5d18c814066a7fd8a2104f24b04e037 Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Sun, 13 Sep 2026 12:59:37 -0400
Subject: [PATCH 07/15] Add `AGENTS.md` for anyone that wants to use AI on this
 project

---
 AGENTS.md | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 AGENTS.md

diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 000000000..730200d5a
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,137 @@
+# Code Thesaurus — Agent Guidelines
+
+These guidelines help coding agents (like Junie, Copilot, OpenCode, etc.) understand the project, its structure, and how to contribute effectively.
+
+## Critical Rules
+
+- **Always follow Test-Driven Development (TDD):** When implementing a new feature or fixing a bug, YOU MUST first provide the test case that reproduces the issue or defines the new behavior. Only then provide the implementation. Tests live in `web/tests/`.
+- **Respect read-only mode:** Do not modify files unless explicitly asked.
+- **Follow existing style:** Match the project's use of PEP 8, pylint, and `isort --profile black`.
+- **No interactive commands:** All terminal commands must be non-interactive.
+- **Don't make large assumptions:** If something is unclear, ask before making assumptions.
+- **Thesaurus data is sacred:** When editing JSON files under `web/thesauruses/`, always validate them with the management commands below before finishing.
+
+## Project Overview
+
+Code Thesaurus is a polyglot developer reference tool. It compares a programming-language feature (e.g. "Data Types", "Functions", "Control Structures") side-by-side across one or two languages or databases, or displays a single-language "reference sheet." It's aimed at new and experienced programmers alike, so content must be beginner-friendly and technically correct.
+
+Most of the site is driven by JSON data files — the Django app mostly reads them and renders comparison/reference pages; the relational database only stores visit/lookup analytics.
+
+### Key Technologies
+- Python 3.11 (per `runtime.txt` and CI; project requires pinned `requirements.txt`)
+- Django 4.2 (project package `codethesaurus/`, single app `web/`)
+- Bootstrap 5 (CDN) + Font Awesome (CDN) for the frontend
+- Pygments (syntax highlighting), django-markdownify (Markdown rendering)
+- jsonmerge / jsonschema (thesaurus data handling and validation)
+- SQLite for local dev, PostgreSQL in production (Heroku via `django-on-heroku`)
+- Gunicorn (production), WhiteNoise (static files)
+
+## Repository Structure
+
+- `AGENTS.md` — This file (project guidance for agents)
+- `codethesaurus/` — Django project settings, root URLs, and custom error handlers (400/403/404/500)
+- `web/` — The single Django app:
+  - `models.py` — Non-DB classes that parse the thesaurus JSON (`MetaStructure`, `ThesaurusEntry`, `ThesaurusMetaInfo`) plus analytics DB models (`SiteVisit`, `LookupData`, `MissingLookup`)
+  - `views.py` — `index`, `about`, `statistics`, `concepts` (comparison/reference pages), `api_reference`, `api_compare`, custom error handlers, and helpers that log visits/lookups/missing items
+  - `urls.py` — Routes for the above (see **API** below)
+  - `middleware.py` — `DatabaseDownMiddleware`: catches DB `OperationalError` and renders `error500.html`
+  - `thesaurus_template_generators.py` — `generate_entry_template()` / `generate_meta_template()` for scaffolding starter JSON
+  - `templatetags/templatetags.py` — `concept_card` inclusion tag
+  - `templates/` — Django templates (`base.html`, `index.html`, `concepts.html`, `concept_card.html`, `statistics.html`, `about.html`, error pages, `robots.txt`)
+  - `static/` — CSS (`app.css`, `pygments_colorful.css`), JS (`checkAvailableStructs.js`, `contributors.js`), images
+  - `management/commands/` — `generate_template`, `generate_missing_templates`, `validatemetainfofile`, `validatelanginfofiles`
+  - `tests/` — Django unit/integration tests
+- `web/thesauruses/` — **The core data repository** (see **Data Model Summary**)
+- `docs/` — A separate, nested MkDocs repository (docs.codethesaur.us); not part of the main git repo
+- `.github/workflows/` — CI/CD (see **Pre-merge Checks**)
+- Deployment files: `Dockerfile`, `docker-compose.yml`, `docker-entrypoint.sh`, `Procfile` (Heroku), `runtime.txt`, `static.json`
+
+### API
+- `GET /api/<structure>/<lang>/<version>/` — JSON reference for one language
+- `GET /api/<structure>/<lang1>/<version1>/<lang2>/<version2>/` — JSON comparison of two languages
+
+## Local Development
+
+| Task | Command |
+|------|---------|
+| Install dependencies | `pip install -r requirements.txt` |
+| Apply migrations (creates `db.sqlite3` with analytics tables) | `python manage.py migrate` |
+| Create superuser (admin only) | `python manage.py createsuperuser` |
+| Run dev server | `python manage.py runserver` |
+| Run the whole site with Docker | `docker-compose up` (serves at `http://localhost:8000`) |
+| Run all tests | `python manage.py test` |
+| Validate meta info | `python manage.py validatemetainfofile` |
+| Validate language info files | `python manage.py validatelanginfofiles` |
+| Generate a starter language structure file | `python manage.py generate_template` |
+| Generate missing structure templates | `python manage.py generate_missing_templates` |
+
+**Note:** The site mostly works without DB data — the database only stores visit/lookup statistics and admin data, so you typically only need `migrate` + `runserver` to develop against thesaurus data.
+
+## Data Model Summary
+
+The thesaurus is a file-based (JSON) data model, not a relational one. All entry points understand it through `ThesaurusMetaInfo` → `MetaStructure` → `ThesaurusEntry` in `web/models.py`.
+
+- **`meta_info.json`** — The root registry: `categories` (currently `langs` and `databases`), `languages` (key → display name for every supported language/database), and `structures` (per-category map of structure key → display name). Editing it requires running `validatemetainfofile`.
+- **`_meta/<structure>.json`** — One file per concept area (e.g. `data_types.json`). Defines `meta` (`structure`, `structure_name`) and `categories`, where each category maps concept IDs → human-friendly concept names. These concept IDs must match across all language files.
+- **`langs/<lang>/<version>/<structure>.json`** — One file per language/version/structure (26 languages: ada, bash, c, cpp, csharp, clips, clojure, go, haskell, java, javascript, kotlin, lua, nim, objectivec, perl, php, powershell, python, r, ruby, rust, scala, swift, typescript, vbnet). Each has a `meta` block (`language`, `language_version`, `language_name`, `structure`) and a `concepts` block keyed by the concept IDs from `_meta/`.
+- **`databases/<db>/<version>/<structure>.json`** — Same pattern for databases (mongodb, mysql, postgresql) using the database structures (`deletions`, `filtering`, `inserts`, `queries`).
+
+**Concept field rules** (validated by `validatelanginfofiles`):
+- Each concept is one of: `code`, `code` + `comment`, `not-implemented`, or `not-implemented` + `comment`. Other combinations are invalid.
+- `code` — the code snippet; a string or an array of strings (arrays are preferred for multiple ways to do something; use the `comment` to differentiate when to pick which).
+- `comment` (singular) — explanatory notes. Never `comments`. Backticks (`` `code` ``) may be used to reference code within comments.
+- `"not-implemented": true` (hyphenated) — for concepts that don't exist in that language/version. Never `not_implemented`. **Do not** write an algorithm to emulate a missing feature — mark it not-implemented instead.
+- Do **not** include a `categories` section in language files; that is handled by the `_meta` files.
+- Code blocks must be technically compilable/runnable if copied — no placeholder prose inside code. Keep explanatory text in `comment`.
+
+**Analytics DB models** (`web/models.py`):
+- **SiteVisit** — one row per page view (URL, user agent, referer).
+- **LookupData** — one row per comparison/reference lookup, linked to a `SiteVisit` (`entry1`/`entry2` = the pair, or the single language for references).
+- **MissingLookup** — records requested languages/structures/concepts that don't exist yet, so maintainers can see gaps. The `/statistics/` page aggregates all three.
+
+## Coding Standards
+
+- **PEP 8**: Follow standard Python style.
+- **Path handling**: Use `pathlib.Path` for file-system path manipulation, not `os.path` (though `os.path` remains in legacy code — don't extend the pattern).
+- **Management commands**: Use `self.stdout.write()` / `self.stderr.write()` with `self.style` (e.g. `self.style.SUCCESS`, `self.style.ERROR`) instead of `print()`.
+- **Logic structure**: Break complex or monolithic methods into smaller, focused, descriptive private methods.
+- **Models/helpers**: Reuse the helper methods in `web/models.py` (`ThesaurusMetaInfo`, `ThesaurusEntry` — e.g. `is_concept_complete`, `is_category_incomplete`, `has_any_implemented_in_category`) to keep view logic clean, rather than re-implementing JSON traversal.
+- **Linting/formatting**: `pylint` and `isort` are pinned in `requirements.txt`. Keep code clean under both.
+- **Naming conventions**: Language/entry keys are lowercase (`python`, `javascript`); JSON files are snake_case (`control_structures.json`).
+- **Frontend**: UI changes go in `web/templates/` and `web/static/`. Follow existing CSS patterns in `web/static/css/`. Keep pages responsive and accessible; avoid inline styles; use Bootstrap for consistency.
+- **Documentation**: Update the external docs (docs.codethesaur.us, built from the nested `docs/` MkDocs repo) for significant changes to core logic or data structures. Use docstrings for complex logic in `views.py` or management commands.
+
+## Testing Strategy and Contribution
+
+- **Location**: Tests live in `web/tests/` (`test_urls.py`, `test_views.py`, `test_views_extra.py`, `test_models.py`, `test_models_extra.py`, `test_db_models.py`, `test_categories.py`, `test_generators.py`, `test_templatetags.py`, `test_templates.py`, `test_commands.py`, `test_middleware.py`).
+- **TDD Requirement**: When fixing bugs, add a reproducer test before applying the fix.
+- **Data changes**: JSON edits under `web/thesauruses/**` require the two validation commands to pass (`validatemetainfofile` after `meta_info.json`/`_meta/` changes, `validatelanginfofiles` after language file changes). Add/update validation coverage in `test_commands.py` when the validators change.
+- **Scope**: Include model parsing logic, views, templates, URL routing, and management commands.
+- **Keep changes minimal** and avoid large refactors in feature tasks. Make small, targeted changes rather than building for hypothetical future needs. Do not rename files without a valid technical reason.
+- **Pull requests**: Follow `.github/PULL_REQUEST_TEMPLATE.md` — note any AI bots used and complete the checklist. The project participates in Hacktoberfest; see `CONTRIBUTING.md` for the issue-claiming workflow.
+
+### Adding a new language or database
+1. Create a directory under `web/thesauruses/` with the language/database key.
+2. Create a version subdirectory (e.g. `3` for Python 3).
+3. Add JSON files matching the `_meta` structures — use `python manage.py generate_template` to scaffold.
+4. Only implement what actually exists in the language; otherwise use `"not-implemented": true`.
+5. Register the language in `meta_info.json` (`languages`) and validate with both validation commands.
+
+## Pre-merge Checks (CI must pass)
+
+- All tests: `python manage.py test` (after `python manage.py migrate`)
+- Thesaurus data validation: `python manage.py validatemetainfofile` + `python manage.py validatelanginfofiles`
+- All JSON files must be valid (checked by the `json-validate` workflow using a JSON syntax checker)
+- Security scan: `bandit -r . -ll -x ./venv,./web/tests,./staticfiles`
+- Dependency scans: `pip-audit -r requirements.txt` and `safety check -r requirements.txt` (run by the `security` workflow)
+- CodeQL Python analysis (run by the `codeql` workflow)
+- Docker build check: `docker compose build` (run by the `check-docker-build` workflow when Docker/deps change)
+
+## Agent-Specific Tips (Junie, Copilot, OpenCode, etc.)
+
+- Search the codebase to infer structure; `web/models.py`, `web/views.py`, and `web/thesaurus_template_generators.py` contain the important reusable code. Reuse those whenever possible.
+- Before editing thesaurus data, read the relevant `web/thesauruses/_meta/<structure>.json` file to ensure new data matches the expected keys and categories.
+- If a request is about adding new language/concept data, it's almost always a JSON edit + validation, not a code change — read the `docs/` project-architecture and thesaurus-editing pages (docs.codethesaur.us) for the current conventions.
+- Don't introduce a build step for frontend JS/CSS; the frontend is server-rendered Django templates with hand-rolled static assets.
+- The `docs/` directory is a separate git repo (MkDocs); don't commit documentation changes inside the main repo's history.
+- Never edit `db.sqlite3` data as a substitute for thesaurus data, and don't rely on it being populated in CI — tests must not depend on it.
\ No newline at end of file

From af35009c1f5f4ba8ee3ac7fe9088d196d9e53196 Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Sun, 13 Sep 2026 13:19:45 -0400
Subject: [PATCH 08/15] Add guidelines for AI tool usage in contributions

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index d7f700329..91a540eb9 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,16 @@ Check out our [Installation/Running Locally](https://docs.codethesaur.us/install
 
 Check out the [Contributing Guide](https://docs.codethesaur.us/contributing/) to learn more about how you can help add more language data, fix bugs, or add features!
 
+## Use of AI tools
+
+We're happy for you to use AI tools to help you contribute — a lot of our contributors do, and they can be a great way to speed up work or learn something new. But AI-generated changes have to meet the same bar as any other contribution:
+
+- **Follow the project's conventions and docs** — the structure, naming, and style, including the thesaurus data rules. Code examples must genuinely work in that language; don't let an AI invent syntax or fake a feature that should be marked `"not-implemented": true`.
+- **Follow the PR template** — including the "AI bots used" section, telling us what you used and how. (Please actually review the changes before submitting.)
+- **Be tested** — run the unit tests and the data-validation commands, and make sure the GitHub Actions checks pass.
+
+Low-effort AI pull requests — unchecked dumps of generated code that ignore the conventions, skip the template, or aren't tested — will be closed or marked as spam. If we misjudge one of yours, reach out and we'll take another look.
+
 ## Is this project available for Hacktoberfest contributions?
 
 Yes! The Code Thesaurus code and documentation projects are both enabled for Hacktoberfest contributions.

From ee54154ad6b449501b98b1f6cee992746ac60ff7 Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Wed, 16 Sep 2026 19:57:24 -0400
Subject: [PATCH 09/15] Enhance CI/CD workflows: add Dependabot configuration,
 improve job concurrency, and pin action versions for stability

---
 .github/dependabot.yml                    |  8 +++++
 .github/workflows/check-docker-build.yml  |  9 +++++-
 .github/workflows/codeql.yml              | 19 ++++++------
 .github/workflows/issue-auto-unassign.yml |  7 ++++-
 .github/workflows/json-validate.yml       | 24 ++++++++++++---
 .github/workflows/run-unit-tests.yml      | 11 +++++--
 .github/workflows/security.yml            | 36 ++++++++++++++++-------
 .github/workflows/validate-data.yml       | 11 +++++--
 8 files changed, 94 insertions(+), 31 deletions(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..ba05c5147
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+  # Keep GitHub Actions (including SHA pins) up to date.
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
\ No newline at end of file
diff --git a/.github/workflows/check-docker-build.yml b/.github/workflows/check-docker-build.yml
index 6e85b2146..410d81254 100644
--- a/.github/workflows/check-docker-build.yml
+++ b/.github/workflows/check-docker-build.yml
@@ -10,11 +10,18 @@ on:
       - 'Procfile'
       - '.github/workflows/check-docker-build.yml'
 
+permissions:
+  contents: read
+
+concurrency:
+  group: docker-build-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check:
     name: Check Docker Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Docker Compose Build
         run: docker compose build
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a42fbc552..a21fa7d1a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -17,6 +17,10 @@ on:
   schedule:
     - cron: '45 4 * * *' # Daily at 04:45 UTC
 
+concurrency:
+  group: codeql-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze
@@ -33,24 +37,19 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        
-        # Details on CodeQL packets: https://aka.ms/codeql-package-config
-        # queries: security-extended,security-and-quality
+        queries: security-extended
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/issue-auto-unassign.yml b/.github/workflows/issue-auto-unassign.yml
index 040cd97cd..47aede255 100644
--- a/.github/workflows/issue-auto-unassign.yml
+++ b/.github/workflows/issue-auto-unassign.yml
@@ -1,16 +1,21 @@
+name: Auto-Unassign Inactive Issues
+
 on:
   schedule:
     # * is a special character in YAML so you have to quote this string
     - cron:  '0 0/12 * * *'
   workflow_dispatch: # Enable manual runs of the bot
 
+permissions:
+  issues: write
+
 jobs:
   unassign_issues:
     runs-on: ubuntu-latest
     name: Unassign issues
     steps:
       - name: Unassign issues
-        uses: codethesaurus/unassign-issues@1.3
+        uses: codethesaurus/unassign-issues@fec46824b2acd69b012edb5db2101399019be0b6 # 1.3
         id: unassign_issues
         with:
           token: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/json-validate.yml b/.github/workflows/json-validate.yml
index 91f85ce65..6b7510800 100644
--- a/.github/workflows/json-validate.yml
+++ b/.github/workflows/json-validate.yml
@@ -8,13 +8,29 @@ on:
     paths:
       - '**.json'
 
+permissions:
+  contents: read
+
+concurrency:
+  group: json-syntax-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check:
     name: Check JSON Files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
       - name: JSON Syntax Check
-        uses: limitusus/json-syntax-check@v1
-        with:
-          pattern: "\\.json$"
\ No newline at end of file
+        run: |
+          failed=0
+          while IFS= read -r -d '' file; do
+            if python3 -m json.tool "$file" > /dev/null 2>&1; then
+              echo "OK: $file"
+            else
+              echo "Invalid JSON: $file"
+              failed=1
+            fi
+          done < <(find . -type f -name '*.json' -not -path './.git/*' -not -path './venv/*' -print0)
+          exit "$failed"
\ No newline at end of file
diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml
index fe2203378..37ee4c9f1 100644
--- a/.github/workflows/run-unit-tests.yml
+++ b/.github/workflows/run-unit-tests.yml
@@ -20,16 +20,23 @@ on:
       - 'manage.py'
       - '.github/workflows/run-unit-tests.yml'
 
+permissions:
+  contents: read
+
+concurrency:
+  group: unit-tests-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   run:
     name: Run Django Unit Tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.11.4
           cache: 'pip'
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index 57c1dc882..ec20582a4 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -16,44 +16,58 @@ on:
   schedule:
     - cron: '30 4 * * *' # Daily at 04:30 UTC
 
+concurrency:
+  group: security-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   bandit:
     name: Bandit (SAST)
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: '3.13'
+          cache: 'pip'
 
       - name: Install Bandit
-        run: pip install bandit
+        run: pip install bandit==1.9.4
 
       - name: Run Bandit
         # -r: recursive, -ll: medium severity or higher, -x: exclude directories
         run: bandit -r . -ll -x ./venv,./web/tests,./staticfiles
 
   dependency-check:
-    name: Dependency Scan
+    name: Dependency Scan (pip-audit)
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: '3.13'
+          cache: 'pip'
 
-      - name: Install dependencies
-        run: |
-          pip install pip-audit safety
+      - name: Install pip-audit
+        run: pip install pip-audit==2.10.1
 
       - name: Run pip-audit
         run: pip-audit -r requirements.txt
 
-      - name: Run Safety
-        run: safety check -r requirements.txt --full-report || echo "Safety found some issues or failed (likely due to missing API key for latest DB)"
+  osv-scanner:
+    name: Dependency Scan (OSV)
+    permissions:
+      contents: read
+      actions: read
+      security-events: write
+    uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@a345acffa64b0eaede81a3d9aae6141214d9c8fc # v2.6.0
\ No newline at end of file
diff --git a/.github/workflows/validate-data.yml b/.github/workflows/validate-data.yml
index 50ddb5143..f1391a102 100644
--- a/.github/workflows/validate-data.yml
+++ b/.github/workflows/validate-data.yml
@@ -18,16 +18,23 @@ on:
       - 'manage.py'
       - '.github/workflows/validate-data.yml'
 
+permissions:
+  contents: read
+
+concurrency:
+  group: validate-data-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   validate:
     name: Validate Data Files
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.11.4
           cache: 'pip'

From 1ee6a86da56fa41e8a53fdfe2f0f61df4a096d13 Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Thu, 17 Sep 2026 11:37:38 -0400
Subject: [PATCH 10/15] Fix borked merge between CT main and my fork:

* Upgrade to Django 6.1 and Python 3.14
* Refactor email and logging configurations
* Switch from `django-on-heroku` to `dj-database-url` and `whitenoise` for enhanced static file handling and deployment
---
 .github/workflows/run-unit-tests.yml          |  2 +-
 .github/workflows/security.yml                |  4 +-
 .../validate-language-info-files.yml          |  6 +-
 .github/workflows/validate-meta-info-file.yml |  6 +-
 AGENTS.md                                     |  6 +-
 codethesaurus/settings.py                     | 96 +++++++++++++++----
 requirements.txt                              | 72 ++++++--------
 web/tests/test_email_settings.py              | 47 +++++++++
 8 files changed, 166 insertions(+), 73 deletions(-)
 create mode 100644 web/tests/test_email_settings.py

diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml
index 3c888eef6..9d4291f2c 100644
--- a/.github/workflows/run-unit-tests.yml
+++ b/.github/workflows/run-unit-tests.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
-          python-version: 3.14
+          python-version: '3.14'
           cache: 'pip'
 
       - name: Install dependencies
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index ec20582a4..31387b3ad 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
-          python-version: '3.13'
+          python-version: '3.14'
           cache: 'pip'
 
       - name: Install Bandit
@@ -55,7 +55,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
-          python-version: '3.13'
+          python-version: '3.14'
           cache: 'pip'
 
       - name: Install pip-audit
diff --git a/.github/workflows/validate-language-info-files.yml b/.github/workflows/validate-language-info-files.yml
index e057467bc..c5178f118 100644
--- a/.github/workflows/validate-language-info-files.yml
+++ b/.github/workflows/validate-language-info-files.yml
@@ -15,12 +15,12 @@ jobs:
     steps:
 
       - name: Checkout the branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
-          python-version: 3.14
+          python-version: '3.14'
           cache: 'pip'
 
       - name: Install dependencies
diff --git a/.github/workflows/validate-meta-info-file.yml b/.github/workflows/validate-meta-info-file.yml
index 06cc031f3..e3c3f91e5 100644
--- a/.github/workflows/validate-meta-info-file.yml
+++ b/.github/workflows/validate-meta-info-file.yml
@@ -15,12 +15,12 @@ jobs:
     steps:
 
       - name: Checkout the branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
-          python-version: 3.14
+          python-version: '3.14'
           cache: 'pip'
 
       - name: Install dependencies
diff --git a/AGENTS.md b/AGENTS.md
index 730200d5a..4b87ab358 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -18,12 +18,12 @@ Code Thesaurus is a polyglot developer reference tool. It compares a programming
 Most of the site is driven by JSON data files — the Django app mostly reads them and renders comparison/reference pages; the relational database only stores visit/lookup analytics.
 
 ### Key Technologies
-- Python 3.11 (per `runtime.txt` and CI; project requires pinned `requirements.txt`)
-- Django 4.2 (project package `codethesaurus/`, single app `web/`)
+- Python 3.14 (per `runtime.txt` and CI; project requires pinned `requirements.txt`)
+- Django 6.1 (project package `codethesaurus/`, single app `web/`)
 - Bootstrap 5 (CDN) + Font Awesome (CDN) for the frontend
 - Pygments (syntax highlighting), django-markdownify (Markdown rendering)
 - jsonmerge / jsonschema (thesaurus data handling and validation)
-- SQLite for local dev, PostgreSQL in production (Heroku via `django-on-heroku`)
+- SQLite for local dev, PostgreSQL in production (via `dj-database-url`)
 - Gunicorn (production), WhiteNoise (static files)
 
 ## Repository Structure
diff --git a/codethesaurus/settings.py b/codethesaurus/settings.py
index fb6397371..111aa035f 100644
--- a/codethesaurus/settings.py
+++ b/codethesaurus/settings.py
@@ -4,15 +4,15 @@
 Generated by 'django-admin startproject' using Django 3.1.1.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/6.0/topics/settings/
+https://docs.djangoproject.com/en/6.1/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/6.0/ref/settings/
+https://docs.djangoproject.com/en/6.1/ref/settings/
 """
-from pathlib import Path
 import os
+from pathlib import Path
+
 import dj_database_url
-import django_on_heroku
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -48,6 +48,7 @@
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'web.middleware.DatabaseDownMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -87,7 +88,7 @@
 WSGI_APPLICATION = 'codethesaurus.wsgi.application'
 
 # Database
-# https://docs.djangoproject.com/en/6.0/ref/settings/#databases
+# https://docs.djangoproject.com/en/6.1/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -101,7 +102,7 @@
 DATABASES['default'].update(db_from_env)
 
 # Password validation
-# https://docs.djangoproject.com/en/6.0/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/6.1/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -119,7 +120,7 @@
 ]
 
 # Internationalization
-# https://docs.djangoproject.com/en/6.0/topics/i18n/
+# https://docs.djangoproject.com/en/6.1/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -130,14 +131,14 @@
 USE_TZ = True
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/6.0/howto/static-files/
+# https://docs.djangoproject.com/en/6.1/howto/static-files/
 # https://dev.to/fazledyn/deploying-django-3-1-on-heroku-417
-# https://github.com/pkrefta/django-on-heroku/blob/3b2367fec9417230dbfba0235353403865386a41/django_on_heroku/core.py#L106
+# https://whitenoise.readthedocs.io/en/stable/
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
 os.makedirs(STATIC_ROOT, exist_ok=True)
 
 # Extra places for collectstatic to find static files.
@@ -155,30 +156,85 @@
     if item == "":
         break
     contact = item.split(":")
-    ADMINS.append((contact[0], contact[1]))
-EMAIL_HOST = os.getenv('EMAIL_HOST', '')
-EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', '')
-EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', '')
+    ADMINS.append(contact[1])
 SERVER_EMAIL = os.getenv('SERVER_EMAIL', '')
-EMAIL_USE_SSL = os.getenv('EMAIL_USE_SSL', '')
-EMAIL_PORT = os.getenv('EMAIL_PORT', '')
-EMAIL_USE_TLS = os.getenv('EMAIL_USE_TLS', '')
+
+# Django 6.1+ email configuration via the MAILERS framework.
+# The deprecated EMAIL_* settings must not be used alongside MAILERS.
+# See https://docs.djangoproject.com/en/6.1/topics/email/#email-configuration
+MAILERS = {
+    "default": {
+        "BACKEND": "django.core.mail.backends.smtp.EmailBackend",
+        "OPTIONS": {
+            "host": os.getenv('EMAIL_HOST', ''),
+            "port": int(os.getenv('EMAIL_PORT', '25') or 25),
+            "username": os.getenv('EMAIL_HOST_USER', ''),
+            "password": os.getenv('EMAIL_HOST_PASSWORD', ''),
+            "use_tls": os.getenv('EMAIL_USE_TLS', '') == 'True',
+            "use_ssl": os.getenv('EMAIL_USE_SSL', '') == 'True',
+        },
+    },
+}
 
 LOGGING = {
     "version": 1,  # the dictConfig format version
     "disable_existing_loggers": False,  # retain the default loggers
+    "filters": {
+        "require_debug_false": {
+            "()": "django.utils.log.RequireDebugFalse",
+        },
+        "require_debug_true": {
+            "()": "django.utils.log.RequireDebugTrue",
+        },
+    },
+    "formatters": {
+        "django.server": {
+            "()": "django.utils.log.ServerFormatter",
+            "format": "[{server_time}] {message}",
+            "style": "{",
+        }
+    },
     "handlers": {
+        "console": {
+            "level": "INFO",
+            "filters": ["require_debug_true"],
+            "class": "logging.StreamHandler",
+        },
+        "django.server": {
+            "level": "INFO",
+            "class": "logging.StreamHandler",
+            "formatter": "django.server",
+        },
         "mail_admins": {
             "level": "ERROR",
+            "filters": ["require_debug_false"],
             "class": "django.utils.log.AdminEmailHandler",
             "include_html": True,
         },
-    }
+    },
+    "loggers": {
+        "django": {
+            "handlers": ["console", "mail_admins"],
+            "level": "INFO",
+        },
+        "django.server": {
+            "handlers": ["django.server"],
+            "level": "INFO",
+            "propagate": False,
+        },
+    },
 }
 
 SIMILAR_LEXERS = {
     "clips": "prolog",
 }
 
-# Configure Django App for Heroku.
-django_on_heroku.settings(locals(), test_runner=False, databases=False, staticfiles=True, logging=True)
+# WhiteNoise serves static files from STATIC_ROOT.
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
+    },
+}
diff --git a/requirements.txt b/requirements.txt
index 7789ee9ec..332d1461c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,41 +1,31 @@
-asgiref==3.11.1
-astroid==3.0.1
-attrs==25.4.0
-bleach==6.4.0
-colorama==0.4.6
-dill==0.4.1
-dj-database-url==3.1.0
-Django==6.0.6
-django-markdownify==0.9.6
-django-on-heroku==1.1.2
-gunicorn==25.0.1
-importlib_metadata==8.7.1
-isort==5.13.2
-jsonmerge==1.9.2
-jsonschema==4.26.0
-jsonschema-specifications==2025.9.1
-lazy-object-proxy==1.12.0
-Markdown==3.10.1
-mccabe==0.7.0
-packaging==26.0
-platformdirs==4.5.1
-protobuf==6.33.5
-psycopg2-binary==2.9.11
-Pygments==2.19.2
-pylint==3.0.2
-pyparsing==3.3.2
-pytz==2025.2
-referencing==0.37.0
-rpds-py==0.30.0
-six==1.17.0
-sqlparse==0.6.0
-tinycss2==1.4.0
-toml==0.10.2
-tomli==2.4.0
-tomlkit==0.14.0
-typing_extensions==4.15.0
-tzdata==2025.3
-webencodings==0.5.1
-whitenoise==6.11.0
-wrapt==2.1.1
-zipp==3.23.0
+asgiref==3.11.0
+astroid==3.0.1
+attrs==25.4.0
+bleach==6.4.0
+colorama==0.4.6
+dill==0.3.7
+dj-database-url==3.0.1
+Django==6.1.1
+django-markdownify==0.9.7
+gunicorn==26.0.0
+isort==5.12.0
+jsonmerge==1.9.2
+jsonschema==4.25.1
+jsonschema-specifications==2025.9.1
+Markdown==3.8.2
+mccabe==0.7.0
+packaging==26.2
+platformdirs==4.10.0
+psycopg2-binary==2.9.11
+Pygments==2.20.0
+pylint==3.0.2
+referencing==0.37.0
+rpds-py==2026.5.1
+six==1.17.0
+sqlparse==0.6.0
+tinycss2==1.5.1
+tomlkit==0.15.0
+typing_extensions==4.15.0
+tzdata==2026.2
+webencodings==0.5.1
+whitenoise==6.11.0
diff --git a/web/tests/test_email_settings.py b/web/tests/test_email_settings.py
new file mode 100644
index 000000000..d10820080
--- /dev/null
+++ b/web/tests/test_email_settings.py
@@ -0,0 +1,47 @@
+import logging
+
+from django.conf import settings
+from django.core import mail
+from django.test import TestCase, override_settings
+
+request_logger = logging.getLogger("django.request")
+
+
+class EmailSettingsTests(TestCase):
+    def test_uses_mailers_instead_of_deprecated_email_settings(self):
+        self.assertTrue(hasattr(settings, "MAILERS"))
+        for deprecated in (
+            "EMAIL_HOST",
+            "EMAIL_HOST_USER",
+            "EMAIL_HOST_PASSWORD",
+            "EMAIL_PORT",
+            "EMAIL_USE_SSL",
+            "EMAIL_USE_TLS",
+        ):
+            self.assertFalse(
+                hasattr(settings, deprecated),
+                f"{deprecated} requested removal: use MAILERS instead",
+            )
+
+    def test_mail_admins_handler_is_attached_to_django_logger(self):
+        handlers = logging.getLogger("django").handlers
+        admin_handlers = [
+            handler
+            for handler in handlers
+            if handler.__class__.__name__ == "AdminEmailHandler"
+        ]
+        self.assertTrue(admin_handlers, "AdminEmailHandler not wired to django logger")
+        self.assertTrue(
+            all(getattr(handler, "include_html", False) for handler in admin_handlers),
+            "mail_admins handler must include HTML (was dead config)",
+        )
+
+    @override_settings(DEBUG=False, ADMINS=["admin@example.com"])
+    def test_error_log_email_sent_to_admins_with_html(self):
+        try:
+            raise ValueError("test error")
+        except ValueError:
+            request_logger.exception("Test error for admin email")
+        self.assertEqual(len(mail.outbox), 1)
+        message = mail.outbox[0]
+        self.assertTrue(message.alternatives, "expected HTML alternative in error email")
\ No newline at end of file

From 3a5b96678064a4cef2e524b34af6887ecd9f376d Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Fri, 18 Sep 2026 09:49:48 -0400
Subject: [PATCH 11/15] Replace management command external calls with internal
 calls

---
 .../commands/generate_missing_templates.py    |  8 +++-
 web/tests/test_commands.py                    | 41 +++++++++++++++++--
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/web/management/commands/generate_missing_templates.py b/web/management/commands/generate_missing_templates.py
index 95f93c7c0..7830b4e4a 100644
--- a/web/management/commands/generate_missing_templates.py
+++ b/web/management/commands/generate_missing_templates.py
@@ -1,3 +1,4 @@
+from django.core.management import call_command
 from django.core.management.base import BaseCommand
 
 from web.models import ThesaurusEntry, ThesaurusMetaInfo
@@ -25,4 +26,9 @@ def handle(self, *args, **options):
                         structure + '.json'
                     )
                     if not os.path.exists(file_path):
-                        os.system(f'python manage.py generate_template "{language}" "{structure}" --language-version="{version}"')
\ No newline at end of file
+                        call_command(
+                            'generate_template',
+                            language,
+                            structure,
+                            language_version=version,
+                        )
\ No newline at end of file
diff --git a/web/tests/test_commands.py b/web/tests/test_commands.py
index 2754163db..22419f84b 100644
--- a/web/tests/test_commands.py
+++ b/web/tests/test_commands.py
@@ -1,6 +1,7 @@
 import os
 import shutil
 from io import StringIO
+from unittest.mock import Mock, patch
 from django.core.management import call_command
 from django.test import TestCase
 
@@ -50,7 +51,39 @@ def test_generate_template_command(self):
                 shutil.rmtree(test_lang_dir)
 
     def test_generate_missing_templates_command(self):
-        # This one uses os.system('python manage.py ...') which is hard to test with call_command
-        # and it might try to generate MANY files.
-        # Maybe skip for now or mock os.system
-        pass
+        # Expect the command to invoke generate_template via call_command
+        # rather than shelling out with os.system.
+        test_lang = 'test_lang'
+        test_version = '1.0'
+        test_structure = 'data_types'
+
+        test_lang_dir = os.path.join('web', 'thesauruses', test_lang)
+        if os.path.exists(test_lang_dir):
+            shutil.rmtree(test_lang_dir)
+
+        meta_mock = Mock()
+        meta_mock.languages = {test_lang: 'Test Lang'}
+        meta_mock.structures = {test_structure: 'Data Types'}
+
+        entry_mock = Mock()
+        entry_mock.versions.return_value = [test_version]
+
+        try:
+            with patch(
+                'web.management.commands.generate_missing_templates.ThesaurusMetaInfo',
+                return_value=meta_mock,
+            ), patch(
+                'web.management.commands.generate_missing_templates.ThesaurusEntry',
+                return_value=entry_mock,
+            ), patch(
+                'web.management.commands.generate_missing_templates.call_command',
+            ) as mock_call_command:
+                call_command('generate_missing_templates', stdout=StringIO())
+
+            mock_call_command.assert_called_once_with(
+                'generate_template', test_lang, test_structure,
+                language_version=test_version,
+            )
+        finally:
+            if os.path.exists(test_lang_dir):
+                shutil.rmtree(test_lang_dir)

From c870288290f736dd1a564fdefd1ae455bdd137a9 Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Fri, 18 Sep 2026 10:39:37 -0400
Subject: [PATCH 12/15] Add OS path safety check in ThesurausEntry loading

---
 web/models.py            | 11 ++++++++++-
 web/tests/test_models.py |  7 +++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/web/models.py b/web/models.py
index d7bdd36b6..974cbdb3e 100644
--- a/web/models.py
+++ b/web/models.py
@@ -6,6 +6,10 @@
 from django.db import models
 
 
+def _is_safe_path_component(value):
+    return bool(value) and value not in (os.curdir, os.pardir) and os.path.basename(value) == value
+
+
 # pylint: disable=too-few-public-methods
 class MetaStructure:
     """
@@ -59,6 +63,9 @@ def __init__(self, key, name):
         self.concepts = None
         self.version = None
         self.language_dir = None
+        if not _is_safe_path_component(self.key):
+            return
+
         for category in os.listdir(os.path.join("web", "thesauruses")):
             if category == "_meta" or not os.path.isdir(os.path.join("web", "thesauruses", category)):
                 continue
@@ -77,6 +84,8 @@ def __init__(self, key, name):
     def versions(self):
         """Generate all versions and their paths for the ThesaurusEntry"""
         versions = dict()
+        if self.language_dir is None:
+            return versions
         try:
             for entry in os.scandir(self.language_dir):
                 if not entry.is_dir():
@@ -97,7 +106,7 @@ def __bool__(self):
 
         :rtype: bool
         """
-        return os.path.exists(self.language_dir)
+        return self.language_dir is not None and os.path.exists(self.language_dir)
 
     def load_concepts(self, structure_key, version):
         """
diff --git a/web/tests/test_models.py b/web/tests/test_models.py
index fdb159044..4bbc012bb 100644
--- a/web/tests/test_models.py
+++ b/web/tests/test_models.py
@@ -75,6 +75,13 @@ def test_language_bad_key_and_lang_exists(self):
         self.assertRaises(FileNotFoundError,
                           language.load_concepts,  "notastructure", "notaversion")
 
+    def test_malicious_language_key_cannot_escape_thesaurus_dir(self):
+        """test that a user-controlled key cannot traverse out of the thesaurus dir"""
+        for bad_key in ("..", "../..", "..\\..", "python/.."):
+            with self.subTest(key=bad_key):
+                entry = ThesaurusEntry(bad_key, "")
+                self.assertIsNone(entry.language_dir)
+
 
     # Commented out as the function *technically* works, but it can't
     # ensure that the sample concept and language actually exist. So

From 98c7c8171b89197fb0e6c36d19f7535df17f9bd0 Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Fri, 18 Sep 2026 10:57:09 -0400
Subject: [PATCH 13/15] Add OS path safety check (now OS agnostic) in
 ThesurausEntry loading

---
 web/models.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/models.py b/web/models.py
index 974cbdb3e..b06ca934f 100644
--- a/web/models.py
+++ b/web/models.py
@@ -7,7 +7,9 @@
 
 
 def _is_safe_path_component(value):
-    return bool(value) and value not in (os.curdir, os.pardir) and os.path.basename(value) == value
+    return bool(value) and value not in (
+        os.curdir, os.pardir
+    ) and "/" not in value and "\\" not in value
 
 
 # pylint: disable=too-few-public-methods

From 92a181901fbfeb03329446f2c83d77a68b3587c5 Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Fri, 18 Sep 2026 11:16:30 -0400
Subject: [PATCH 14/15] Add path traversal safeguards in MetaStructure and
 ThesaurusEntry methods, with new test cases for validation

---
 web/models.py            |  6 ++++++
 web/tests/test_models.py | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/web/models.py b/web/models.py
index b06ca934f..d0825610f 100644
--- a/web/models.py
+++ b/web/models.py
@@ -31,6 +31,9 @@ def __init__(self, key, name):
         self.key = key
         self.name = name
 
+        if not _is_safe_path_component(key):
+            raise FileNotFoundError(f"Structure key is not a safe path component: {key!r}")
+
         if key in MetaStructure._cached_files:
             self.categories = MetaStructure._cached_files[key]
             return
@@ -117,6 +120,9 @@ def load_concepts(self, structure_key, version):
         :param structure_key: the key for the structure to load
         :param version: the version of the language
         """
+        if not (_is_safe_path_component(structure_key) and _is_safe_path_component(version)):
+            raise FileNotFoundError(
+                f"Unsafe structure/version path components: {structure_key!r} / {version!r}")
         file_path = os.path.join(self.language_dir, version, f"{structure_key}.json")
         with open(file_path, 'r', encoding='UTF-8') as file:
             file_json = json.load(file)
diff --git a/web/tests/test_models.py b/web/tests/test_models.py
index 4bbc012bb..866ce0d09 100644
--- a/web/tests/test_models.py
+++ b/web/tests/test_models.py
@@ -82,6 +82,27 @@ def test_malicious_language_key_cannot_escape_thesaurus_dir(self):
                 entry = ThesaurusEntry(bad_key, "")
                 self.assertIsNone(entry.language_dir)
 
+    def test_metastructure_rejects_path_traversal_key(self):
+        """test that a malicious structure key never opens a file"""
+        from unittest.mock import mock_open, patch
+
+        with patch("builtins.open", mock_open()) as mocked_open:
+            with self.assertRaises(FileNotFoundError):
+                MetaStructure("../..", "")
+        mocked_open.assert_not_called()
+
+    def test_load_concepts_rejects_path_traversal_components(self):
+        """test that a malicious structure/version never opens a file"""
+        from unittest.mock import mock_open, patch
+
+        entry = ThesaurusEntry("python", "")
+        with patch("builtins.open", mock_open()) as mocked_open:
+            with self.assertRaises(FileNotFoundError):
+                entry.load_concepts("..", "3")
+            with self.assertRaises(FileNotFoundError):
+                entry.load_concepts("data_types", "../..")
+        mocked_open.assert_not_called()
+
 
     # Commented out as the function *technically* works, but it can't
     # ensure that the sample concept and language actually exist. So

From ecafb6164c8c7e3049b2df9b1c8286e88c6e0dff Mon Sep 17 00:00:00 2001
From: Sarah Withee <gitlab-95c7f0d6@geekygirlsarah.com>
Date: Fri, 18 Sep 2026 11:51:49 -0400
Subject: [PATCH 15/15] Improve path traversal protections in MetaStructure and
 ThesaurusEntry, ensuring file access remains confined to thesaurus root

---
 web/models.py            | 33 +++++++++++++++++++++++----------
 web/tests/test_models.py |  9 +++++++++
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/web/models.py b/web/models.py
index d0825610f..9b0944724 100644
--- a/web/models.py
+++ b/web/models.py
@@ -38,8 +38,12 @@ def __init__(self, key, name):
             self.categories = MetaStructure._cached_files[key]
             return
 
-        meta_structure_file_path = os.path.join(
-            "web", "thesauruses", "_meta", f"{key}.json")
+        thesaurus_root = os.path.join("web", "thesauruses")
+        root_real = os.path.realpath(thesaurus_root)
+        meta_structure_file_path = os.path.realpath(
+            os.path.join(thesaurus_root, "_meta", f"{key}.json"))
+        if not meta_structure_file_path.startswith(root_real + os.sep):
+            raise FileNotFoundError(f"Structure key escapes the thesaurus dir: {key!r}")
         with open(meta_structure_file_path, 'r', encoding='UTF-8') as meta_structure_file:
             meta_structure_file_json = json.load(meta_structure_file)
 
@@ -71,18 +75,22 @@ def __init__(self, key, name):
         if not _is_safe_path_component(self.key):
             return
 
-        for category in os.listdir(os.path.join("web", "thesauruses")):
-            if category == "_meta" or not os.path.isdir(os.path.join("web", "thesauruses", category)):
+        thesaurus_root = os.path.join("web", "thesauruses")
+        root_real = os.path.realpath(thesaurus_root)
+        for category in os.listdir(thesaurus_root):
+            if category == "_meta" or not os.path.isdir(os.path.join(thesaurus_root, category)):
                 continue
-            potential_dir = os.path.join("web", "thesauruses", category, self.key)
-            if os.path.exists(potential_dir):
+            potential_dir = os.path.realpath(
+                os.path.join(thesaurus_root, category, self.key))
+            if potential_dir.startswith(root_real + os.sep) and os.path.isdir(potential_dir):
                 self.language_dir = potential_dir
                 break
         
         if self.language_dir is None:
-            # Fallback for when it doesn't exist yet (e.g. during template generation)
-            # Defaulting to 'langs' if not found, but this might need refinement
-            self.language_dir = os.path.join("web", "thesauruses", "langs", self.key)
+            fallback_dir = os.path.realpath(
+                os.path.join(thesaurus_root, "langs", self.key))
+            if fallback_dir.startswith(root_real + os.sep):
+                self.language_dir = fallback_dir
         self.version = None
 
 
@@ -123,7 +131,12 @@ def load_concepts(self, structure_key, version):
         if not (_is_safe_path_component(structure_key) and _is_safe_path_component(version)):
             raise FileNotFoundError(
                 f"Unsafe structure/version path components: {structure_key!r} / {version!r}")
-        file_path = os.path.join(self.language_dir, version, f"{structure_key}.json")
+        root_real = os.path.realpath(os.path.join("web", "thesauruses"))
+        file_path = os.path.realpath(os.path.join(
+            self.language_dir, version, f"{structure_key}.json"))
+        if not file_path.startswith(root_real + os.sep):
+            raise FileNotFoundError(
+                f"Structure/version escape the thesaurus dir: {structure_key!r} / {version!r}")
         with open(file_path, 'r', encoding='UTF-8') as file:
             file_json = json.load(file)
             self.concepts = file_json["concepts"]
diff --git a/web/tests/test_models.py b/web/tests/test_models.py
index 866ce0d09..95df57723 100644
--- a/web/tests/test_models.py
+++ b/web/tests/test_models.py
@@ -1,5 +1,6 @@
 """test for the models"""
 import json
+import os
 
 from django.test import TestCase
 
@@ -82,6 +83,14 @@ def test_malicious_language_key_cannot_escape_thesaurus_dir(self):
                 entry = ThesaurusEntry(bad_key, "")
                 self.assertIsNone(entry.language_dir)
 
+    def test_language_dir_stays_within_thesaurus_root(self):
+        """test that language_dir is confined to the thesaurus directory"""
+        entry = ThesaurusEntry("python", "")
+        thesaurus_root = os.path.realpath(
+            os.path.join("web", "thesauruses"))
+        self.assertIsNotNone(entry.language_dir)
+        self.assertTrue(entry.language_dir.startswith(thesaurus_root + os.sep))
+
     def test_metastructure_rejects_path_traversal_key(self):
         """test that a malicious structure key never opens a file"""
         from unittest.mock import mock_open, patch