From 34ef5a60254dd006b65eac737d9b17dc11a36e9c Mon Sep 17 00:00:00 2001 From: James Miller Date: Sat, 25 Apr 2020 01:37:42 -0500 Subject: [PATCH] MAJOR DIRECTORY OVERHAUL --- README.md | 19 ++++++++++++ {data/yaml => bin}/cleanyaml.py | 3 ++ {gendb => bin}/gendb.py | 30 +++++++++++++++---- {data/yaml => bin}/standardizeyaml.py | 2 ++ .../utilities/monsters-html-escaper.py | 0 data/{yaml => }/actions.yaml | 0 data/{yaml => }/ammunition.yaml | 0 data/{yaml => }/ancestriesheritages.yaml | 0 data/{yaml => }/armor.yaml | 0 data/{yaml => }/backgrounds.yaml | 0 data/{yaml => }/basics.yaml | 0 data/{yaml => }/bulks.yaml | 0 data/{yaml => }/conditions.yaml | 0 data/{yaml => }/damage.yaml | 0 data/{yaml => }/feats.yaml | 0 data/{yaml => }/gear.yaml | 0 data/{yaml => }/itemcategories.yaml | 0 data/{yaml => }/items-staves.yaml | 0 data/{yaml => }/langs.yaml | 0 data/{yaml => }/monsters.yaml | 0 data/{yaml => }/requirements.yaml | 0 data/{yaml => }/senses.yaml | 0 data/{yaml => }/skills.yaml | 0 data/{yaml => }/sources.yaml | 0 data/{yaml => }/spells.yaml | 0 data/{yaml => }/traits.yaml | 0 data/{yaml => }/triggers.yaml | 0 data/{yaml => }/weapongroups.yaml | 0 data/{yaml => }/weapons.yaml | 0 .../feat_level.csv | 0 .../feat_level.ipynb | 0 .../deprecated-old-scripts-dir}/feat_level.py | 0 .../abilityscores.sql | 0 .../actions.sql | 0 .../alignments.sql | 0 .../ammunition.sql | 0 .../ancestries.sql | 0 .../deprecated-old-sql-data-files}/armor.sql | 0 .../backgrounds.sql | 0 .../deprecated-old-sql-data-files}/bulks.sql | 0 .../conditions.sql | 0 .../damagetypes.sql | 0 .../deprecated-old-sql-data-files}/feats.sql | 0 .../frequency.sql | 0 .../deprecated-old-sql-data-files}/gear.sql | 0 .../deprecated-old-sql-data-files}/gendb.bat | 0 .../deprecated-old-sql-data-files}/gendb.sh | 0 .../heritages.sql | 0 .../deprecated-old-sql-data-files}/langs.sql | 0 .../monsters.sql | 0 .../movements.sql | 0 .../requirements.sql | 0 .../deprecated-old-sql-data-files}/senses.sql | 0 .../deprecated-old-sql-data-files}/sizes.sql | 0 .../deprecated-old-sql-data-files}/skills.sql | 0 .../sources.sql | 0 .../deprecated-old-sql-data-files}/spells.sql | 0 .../deprecated-old-sql-data-files}/staves.sql | 0 .../third_party_json/spells.json | 0 .../third_party_json/spells.py | 0 .../third_party_json/spells20191115.json | 0 .../third_party_json/spellsNEW.json | 0 .../deprecated-old-sql-data-files}/traits.sql | 0 .../triggers.sql | 0 .../weapons.sql | 0 .../deprecated-old-src-dir}/README.md | 0 .../deprecated/backgrounds/background.csv | 0 .../backgrounds/scrape_background.ipynb | 0 .../backgrounds/scrape_background.py | 0 .../deprecated/gear/README.md | 0 .../deprecated/gear/gear.csv | 0 .../deprecated/gear/scrape_gear.ipynb | 0 .../deprecated/gear/scrape_gear.py | 0 .../deprecated/weapons/README.md | 0 .../deprecated/weapons/ammunition.csv | 0 .../deprecated/weapons/melee.csv | 0 .../deprecated/weapons/ranged.csv | 0 .../deprecated/weapons/scrape.ipynb | 0 .../deprecated/weapons/scrape.py | 0 .../deprecated/weapons/weapons.py | 0 .../deprecated-old-src-dir}/requirements.txt | 0 .../deprecated-old-src-dir}/staves/staves.csv | 0 .../abilityscores.sql | 0 .../deprecated-sql-schema-files}/actions.sql | 0 .../alignments.sql | 0 .../ammunition.sql | 0 .../ancestries.sql | 0 .../deprecated-sql-schema-files}/armor.sql | 0 .../backgrounds.sql | 0 .../deprecated-sql-schema-files}/bulks.sql | 0 .../conditions.sql | 0 .../damagetypes.sql | 0 .../deprecated-sql-schema-files}/feats.sql | 0 .../frequency.sql | 0 .../deprecated-sql-schema-files}/gear.sql | 0 .../deprecated-sql-schema-files}/langs.sql | 0 .../deprecated-sql-schema-files}/monsters.sql | 0 .../movements.sql | 0 .../requirements.sql | 0 .../deprecated-sql-schema-files}/senses.sql | 0 .../deprecated-sql-schema-files}/sizes.sql | 0 .../deprecated-sql-schema-files}/skills.sql | 0 .../deprecated-sql-schema-files}/sources.sql | 0 .../deprecated-sql-schema-files}/spells.sql | 0 .../deprecated-sql-schema-files}/staves.sql | 0 .../deprecated-sql-schema-files}/traits.sql | 0 .../deprecated-sql-schema-files}/triggers.sql | 0 .../deprecated-sql-schema-files}/weapons.sql | 0 .../deprecated-yaml-scripts}/ancestries.yaml | 0 .../clean-up-monsters.py | 0 .../deprecated-yaml-scripts}/feat-levels.py | 0 .../feats-levels-false-matches.yaml | 0 .../feats-levels-true-matches.yaml | 0 .../deprecated-yaml-scripts}/gendb.py | 0 .../deprecated-yaml-scripts}/hanc.py | 0 .../deprecated-yaml-scripts}/heritages.yaml | 0 .../deprecated-yaml-scripts}/monsters.yaml | 0 .../monsters.yaml.old | 0 .../scraped-monsters.yaml | 0 .../deprecated-yaml-scripts}/sensesyamltmp.py | 0 .../sql-to-heritages.py | 0 .../deprecated-yaml-scripts}/sql-to-traits.py | 0 .../sql-to-yaml-backgrounds.py | 0 .../tmp-ac-special.py | 0 .../tmp-actions-to-yaml.py | 0 .../tmp-ammunition-to-yaml.py | 0 .../tmp-ancestries-to-yaml.py | 0 .../deprecated-yaml-scripts}/tmp-armoryaml.py | 0 .../deprecated-yaml-scripts}/tmp-feat.yaml | 0 .../tmp-gear-to-yaml.py | 0 .../tmp-spells-to-yaml.py | 0 .../tmp-sql-staves-to-yaml.py | 0 .../tmp-sql-to-weapons.py | 0 .../tmp-sql-to-yaml-feats.py | 0 {gendb/lib => lib}/__init__.py | 0 lib/gendb/__init__.py | 0 {gendb/lib => lib/gendb}/basics.py | 0 {gendb/lib => lib/gendb}/utils.py | 0 138 files changed, 48 insertions(+), 6 deletions(-) rename {data/yaml => bin}/cleanyaml.py (95%) rename {gendb => bin}/gendb.py (98%) rename {data/yaml => bin}/standardizeyaml.py (97%) rename {scripts => bin}/utilities/monsters-html-escaper.py (100%) rename data/{yaml => }/actions.yaml (100%) rename data/{yaml => }/ammunition.yaml (100%) rename data/{yaml => }/ancestriesheritages.yaml (100%) rename data/{yaml => }/armor.yaml (100%) rename data/{yaml => }/backgrounds.yaml (100%) rename data/{yaml => }/basics.yaml (100%) rename data/{yaml => }/bulks.yaml (100%) rename data/{yaml => }/conditions.yaml (100%) rename data/{yaml => }/damage.yaml (100%) rename data/{yaml => }/feats.yaml (100%) rename data/{yaml => }/gear.yaml (100%) rename data/{yaml => }/itemcategories.yaml (100%) rename data/{yaml => }/items-staves.yaml (100%) rename data/{yaml => }/langs.yaml (100%) rename data/{yaml => }/monsters.yaml (100%) rename data/{yaml => }/requirements.yaml (100%) rename data/{yaml => }/senses.yaml (100%) rename data/{yaml => }/skills.yaml (100%) rename data/{yaml => }/sources.yaml (100%) rename data/{yaml => }/spells.yaml (100%) rename data/{yaml => }/traits.yaml (100%) rename data/{yaml => }/triggers.yaml (100%) rename data/{yaml => }/weapongroups.yaml (100%) rename data/{yaml => }/weapons.yaml (100%) rename {scripts => deprecated/deprecated-old-scripts-dir}/feat_level.csv (100%) rename {scripts => deprecated/deprecated-old-scripts-dir}/feat_level.ipynb (100%) rename {scripts => deprecated/deprecated-old-scripts-dir}/feat_level.py (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/abilityscores.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/actions.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/alignments.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/ammunition.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/ancestries.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/armor.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/backgrounds.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/bulks.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/conditions.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/damagetypes.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/feats.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/frequency.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/gear.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/gendb.bat (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/gendb.sh (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/heritages.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/langs.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/monsters.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/movements.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/requirements.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/senses.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/sizes.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/skills.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/sources.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/spells.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/staves.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/third_party_json/spells.json (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/third_party_json/spells.py (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/third_party_json/spells20191115.json (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/third_party_json/spellsNEW.json (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/traits.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/triggers.sql (100%) rename {data/deprecated => deprecated/deprecated-old-sql-data-files}/weapons.sql (100%) rename {src => deprecated/deprecated-old-src-dir}/README.md (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/backgrounds/background.csv (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/backgrounds/scrape_background.ipynb (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/backgrounds/scrape_background.py (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/gear/README.md (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/gear/gear.csv (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/gear/scrape_gear.ipynb (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/gear/scrape_gear.py (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/weapons/README.md (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/weapons/ammunition.csv (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/weapons/melee.csv (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/weapons/ranged.csv (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/weapons/scrape.ipynb (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/weapons/scrape.py (100%) rename {src => deprecated/deprecated-old-src-dir}/deprecated/weapons/weapons.py (100%) rename {src => deprecated/deprecated-old-src-dir}/requirements.txt (100%) rename {src => deprecated/deprecated-old-src-dir}/staves/staves.csv (100%) rename {schema => deprecated/deprecated-sql-schema-files}/abilityscores.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/actions.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/alignments.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/ammunition.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/ancestries.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/armor.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/backgrounds.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/bulks.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/conditions.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/damagetypes.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/feats.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/frequency.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/gear.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/langs.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/monsters.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/movements.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/requirements.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/senses.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/sizes.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/skills.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/sources.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/spells.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/staves.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/traits.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/triggers.sql (100%) rename {schema => deprecated/deprecated-sql-schema-files}/weapons.sql (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/ancestries.yaml (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/clean-up-monsters.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/feat-levels.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/feats-levels-false-matches.yaml (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/feats-levels-true-matches.yaml (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/gendb.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/hanc.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/heritages.yaml (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/monsters.yaml (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/monsters.yaml.old (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/scraped-monsters.yaml (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/sensesyamltmp.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/sql-to-heritages.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/sql-to-traits.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/sql-to-yaml-backgrounds.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-ac-special.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-actions-to-yaml.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-ammunition-to-yaml.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-ancestries-to-yaml.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-armoryaml.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-feat.yaml (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-gear-to-yaml.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-spells-to-yaml.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-sql-staves-to-yaml.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-sql-to-weapons.py (100%) rename {data/yaml/deprecated => deprecated/deprecated-yaml-scripts}/tmp-sql-to-yaml-feats.py (100%) rename {gendb/lib => lib}/__init__.py (100%) create mode 100644 lib/gendb/__init__.py rename {gendb/lib => lib/gendb}/basics.py (100%) rename {gendb/lib => lib/gendb}/utils.py (100%) diff --git a/README.md b/README.md index 22e1fc2..d85b39e 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,25 @@ will fit into memory easily so performance issues aren't likely to be a problem. Also, most use cases of this data will likely be read only, so the sqlite limitations on concurrent writes won't be an issue either. +## Stop yacking and tell me how to generate the database from the YAMl! + +Ok! + +You'll need a working python3 installation and the module `pyyaml` installed. + +### To install pyyaml + +Run the correct pip install command: `pip install pyyaml`. Depending on your +operating system, this might be `pip3` or `python3-pip` instead of `pip`. + +### Generate the database + +From the repository root, navigate to the `bin` directory with a `cd ./bin` and +then run `python3 gendb.py`. The code is not optimized for speed, so depending +on your system and disk I/O, it might take a minute or so. The output file is +currently a `tmp.db` in the repository root. You can then explore the db file +with `sqlite3 tmp.db` called from the repository root directory. + ## Where we need the most help right now ### Proofreading Spells.yaml diff --git a/data/yaml/cleanyaml.py b/bin/cleanyaml.py similarity index 95% rename from data/yaml/cleanyaml.py rename to bin/cleanyaml.py index 6169932..89925b3 100644 --- a/data/yaml/cleanyaml.py +++ b/bin/cleanyaml.py @@ -9,6 +9,9 @@ import os def main(): + # change directory to the data directory + os.chdir('../data/') + # gets all files with a yaml extension in the directory yfiles = [] for file in glob.glob("*.yaml"): diff --git a/gendb/gendb.py b/bin/gendb.py similarity index 98% rename from gendb/gendb.py rename to bin/gendb.py index d2a1d3a..9341697 100644 --- a/gendb/gendb.py +++ b/bin/gendb.py @@ -1,30 +1,48 @@ +import sys +# the append makes python look in the repo dir for other python modules +sys.path.append('..') import yaml import sqlite3 import os import pprint -import sys -from lib.basics import * -import lib.utils as utils +from lib.gendb.basics import * +from lib.gendb import utils +import pathlib + DBFILE = 'tmp.db' -DATA_PATH = "../data/yaml" # This is path relative to gendb.py +DBOUTPUT_PATH = pathlib.Path().absolute().parent +DATA_PATH = pathlib.Path().absolute().parent / 'data' def main(): + print("DB output is in path: {}".format(DBOUTPUT_PATH)) + print("Data is in path: {}".format(DATA_PATH)) + + # CHANGE TO DIR WHERE DB FILE IS OUTPUT + try: + os.chdir(DBOUTPUT_PATH) + except OSError as e: + print("{}".format(e)) + # delete DBfile and run fresh try: os.remove(DBFILE) except OSError as e: - print("{}".format(e)) + print("No prior database file found to remove. Will create a new one. Error message: {}".format(e)) # Get a DB conn + try: + os.chdir(DBOUTPUT_PATH) + except OSError as e: + print("{}".format(e)) conn = utils.get_db_conn(DBFILE) pragma = "PRAGMA foreign_keys = ON;" c = conn.cursor() c.execute(pragma) - # change directory to where the data currently is relative to script + # CHANGE DIRECTORY TO WHERE THE DATA CURRENTLY IS RELATIVE TO SCRIPT try: os.chdir(DATA_PATH) except OSError as e: diff --git a/data/yaml/standardizeyaml.py b/bin/standardizeyaml.py similarity index 97% rename from data/yaml/standardizeyaml.py rename to bin/standardizeyaml.py index caed085..98efd4f 100644 --- a/data/yaml/standardizeyaml.py +++ b/bin/standardizeyaml.py @@ -1,5 +1,6 @@ import yaml import pprint +import os def main(): @@ -8,6 +9,7 @@ def main(): def standardize_monsters(): + os.chdir('../data/') with open('monsters.yaml', 'r') as f: data = yaml.full_load(f) goodset = set() diff --git a/scripts/utilities/monsters-html-escaper.py b/bin/utilities/monsters-html-escaper.py similarity index 100% rename from scripts/utilities/monsters-html-escaper.py rename to bin/utilities/monsters-html-escaper.py diff --git a/data/yaml/actions.yaml b/data/actions.yaml similarity index 100% rename from data/yaml/actions.yaml rename to data/actions.yaml diff --git a/data/yaml/ammunition.yaml b/data/ammunition.yaml similarity index 100% rename from data/yaml/ammunition.yaml rename to data/ammunition.yaml diff --git a/data/yaml/ancestriesheritages.yaml b/data/ancestriesheritages.yaml similarity index 100% rename from data/yaml/ancestriesheritages.yaml rename to data/ancestriesheritages.yaml diff --git a/data/yaml/armor.yaml b/data/armor.yaml similarity index 100% rename from data/yaml/armor.yaml rename to data/armor.yaml diff --git a/data/yaml/backgrounds.yaml b/data/backgrounds.yaml similarity index 100% rename from data/yaml/backgrounds.yaml rename to data/backgrounds.yaml diff --git a/data/yaml/basics.yaml b/data/basics.yaml similarity index 100% rename from data/yaml/basics.yaml rename to data/basics.yaml diff --git a/data/yaml/bulks.yaml b/data/bulks.yaml similarity index 100% rename from data/yaml/bulks.yaml rename to data/bulks.yaml diff --git a/data/yaml/conditions.yaml b/data/conditions.yaml similarity index 100% rename from data/yaml/conditions.yaml rename to data/conditions.yaml diff --git a/data/yaml/damage.yaml b/data/damage.yaml similarity index 100% rename from data/yaml/damage.yaml rename to data/damage.yaml diff --git a/data/yaml/feats.yaml b/data/feats.yaml similarity index 100% rename from data/yaml/feats.yaml rename to data/feats.yaml diff --git a/data/yaml/gear.yaml b/data/gear.yaml similarity index 100% rename from data/yaml/gear.yaml rename to data/gear.yaml diff --git a/data/yaml/itemcategories.yaml b/data/itemcategories.yaml similarity index 100% rename from data/yaml/itemcategories.yaml rename to data/itemcategories.yaml diff --git a/data/yaml/items-staves.yaml b/data/items-staves.yaml similarity index 100% rename from data/yaml/items-staves.yaml rename to data/items-staves.yaml diff --git a/data/yaml/langs.yaml b/data/langs.yaml similarity index 100% rename from data/yaml/langs.yaml rename to data/langs.yaml diff --git a/data/yaml/monsters.yaml b/data/monsters.yaml similarity index 100% rename from data/yaml/monsters.yaml rename to data/monsters.yaml diff --git a/data/yaml/requirements.yaml b/data/requirements.yaml similarity index 100% rename from data/yaml/requirements.yaml rename to data/requirements.yaml diff --git a/data/yaml/senses.yaml b/data/senses.yaml similarity index 100% rename from data/yaml/senses.yaml rename to data/senses.yaml diff --git a/data/yaml/skills.yaml b/data/skills.yaml similarity index 100% rename from data/yaml/skills.yaml rename to data/skills.yaml diff --git a/data/yaml/sources.yaml b/data/sources.yaml similarity index 100% rename from data/yaml/sources.yaml rename to data/sources.yaml diff --git a/data/yaml/spells.yaml b/data/spells.yaml similarity index 100% rename from data/yaml/spells.yaml rename to data/spells.yaml diff --git a/data/yaml/traits.yaml b/data/traits.yaml similarity index 100% rename from data/yaml/traits.yaml rename to data/traits.yaml diff --git a/data/yaml/triggers.yaml b/data/triggers.yaml similarity index 100% rename from data/yaml/triggers.yaml rename to data/triggers.yaml diff --git a/data/yaml/weapongroups.yaml b/data/weapongroups.yaml similarity index 100% rename from data/yaml/weapongroups.yaml rename to data/weapongroups.yaml diff --git a/data/yaml/weapons.yaml b/data/weapons.yaml similarity index 100% rename from data/yaml/weapons.yaml rename to data/weapons.yaml diff --git a/scripts/feat_level.csv b/deprecated/deprecated-old-scripts-dir/feat_level.csv similarity index 100% rename from scripts/feat_level.csv rename to deprecated/deprecated-old-scripts-dir/feat_level.csv diff --git a/scripts/feat_level.ipynb b/deprecated/deprecated-old-scripts-dir/feat_level.ipynb similarity index 100% rename from scripts/feat_level.ipynb rename to deprecated/deprecated-old-scripts-dir/feat_level.ipynb diff --git a/scripts/feat_level.py b/deprecated/deprecated-old-scripts-dir/feat_level.py similarity index 100% rename from scripts/feat_level.py rename to deprecated/deprecated-old-scripts-dir/feat_level.py diff --git a/data/deprecated/abilityscores.sql b/deprecated/deprecated-old-sql-data-files/abilityscores.sql similarity index 100% rename from data/deprecated/abilityscores.sql rename to deprecated/deprecated-old-sql-data-files/abilityscores.sql diff --git a/data/deprecated/actions.sql b/deprecated/deprecated-old-sql-data-files/actions.sql similarity index 100% rename from data/deprecated/actions.sql rename to deprecated/deprecated-old-sql-data-files/actions.sql diff --git a/data/deprecated/alignments.sql b/deprecated/deprecated-old-sql-data-files/alignments.sql similarity index 100% rename from data/deprecated/alignments.sql rename to deprecated/deprecated-old-sql-data-files/alignments.sql diff --git a/data/deprecated/ammunition.sql b/deprecated/deprecated-old-sql-data-files/ammunition.sql similarity index 100% rename from data/deprecated/ammunition.sql rename to deprecated/deprecated-old-sql-data-files/ammunition.sql diff --git a/data/deprecated/ancestries.sql b/deprecated/deprecated-old-sql-data-files/ancestries.sql similarity index 100% rename from data/deprecated/ancestries.sql rename to deprecated/deprecated-old-sql-data-files/ancestries.sql diff --git a/data/deprecated/armor.sql b/deprecated/deprecated-old-sql-data-files/armor.sql similarity index 100% rename from data/deprecated/armor.sql rename to deprecated/deprecated-old-sql-data-files/armor.sql diff --git a/data/deprecated/backgrounds.sql b/deprecated/deprecated-old-sql-data-files/backgrounds.sql similarity index 100% rename from data/deprecated/backgrounds.sql rename to deprecated/deprecated-old-sql-data-files/backgrounds.sql diff --git a/data/deprecated/bulks.sql b/deprecated/deprecated-old-sql-data-files/bulks.sql similarity index 100% rename from data/deprecated/bulks.sql rename to deprecated/deprecated-old-sql-data-files/bulks.sql diff --git a/data/deprecated/conditions.sql b/deprecated/deprecated-old-sql-data-files/conditions.sql similarity index 100% rename from data/deprecated/conditions.sql rename to deprecated/deprecated-old-sql-data-files/conditions.sql diff --git a/data/deprecated/damagetypes.sql b/deprecated/deprecated-old-sql-data-files/damagetypes.sql similarity index 100% rename from data/deprecated/damagetypes.sql rename to deprecated/deprecated-old-sql-data-files/damagetypes.sql diff --git a/data/deprecated/feats.sql b/deprecated/deprecated-old-sql-data-files/feats.sql similarity index 100% rename from data/deprecated/feats.sql rename to deprecated/deprecated-old-sql-data-files/feats.sql diff --git a/data/deprecated/frequency.sql b/deprecated/deprecated-old-sql-data-files/frequency.sql similarity index 100% rename from data/deprecated/frequency.sql rename to deprecated/deprecated-old-sql-data-files/frequency.sql diff --git a/data/deprecated/gear.sql b/deprecated/deprecated-old-sql-data-files/gear.sql similarity index 100% rename from data/deprecated/gear.sql rename to deprecated/deprecated-old-sql-data-files/gear.sql diff --git a/data/deprecated/gendb.bat b/deprecated/deprecated-old-sql-data-files/gendb.bat similarity index 100% rename from data/deprecated/gendb.bat rename to deprecated/deprecated-old-sql-data-files/gendb.bat diff --git a/data/deprecated/gendb.sh b/deprecated/deprecated-old-sql-data-files/gendb.sh similarity index 100% rename from data/deprecated/gendb.sh rename to deprecated/deprecated-old-sql-data-files/gendb.sh diff --git a/data/deprecated/heritages.sql b/deprecated/deprecated-old-sql-data-files/heritages.sql similarity index 100% rename from data/deprecated/heritages.sql rename to deprecated/deprecated-old-sql-data-files/heritages.sql diff --git a/data/deprecated/langs.sql b/deprecated/deprecated-old-sql-data-files/langs.sql similarity index 100% rename from data/deprecated/langs.sql rename to deprecated/deprecated-old-sql-data-files/langs.sql diff --git a/data/deprecated/monsters.sql b/deprecated/deprecated-old-sql-data-files/monsters.sql similarity index 100% rename from data/deprecated/monsters.sql rename to deprecated/deprecated-old-sql-data-files/monsters.sql diff --git a/data/deprecated/movements.sql b/deprecated/deprecated-old-sql-data-files/movements.sql similarity index 100% rename from data/deprecated/movements.sql rename to deprecated/deprecated-old-sql-data-files/movements.sql diff --git a/data/deprecated/requirements.sql b/deprecated/deprecated-old-sql-data-files/requirements.sql similarity index 100% rename from data/deprecated/requirements.sql rename to deprecated/deprecated-old-sql-data-files/requirements.sql diff --git a/data/deprecated/senses.sql b/deprecated/deprecated-old-sql-data-files/senses.sql similarity index 100% rename from data/deprecated/senses.sql rename to deprecated/deprecated-old-sql-data-files/senses.sql diff --git a/data/deprecated/sizes.sql b/deprecated/deprecated-old-sql-data-files/sizes.sql similarity index 100% rename from data/deprecated/sizes.sql rename to deprecated/deprecated-old-sql-data-files/sizes.sql diff --git a/data/deprecated/skills.sql b/deprecated/deprecated-old-sql-data-files/skills.sql similarity index 100% rename from data/deprecated/skills.sql rename to deprecated/deprecated-old-sql-data-files/skills.sql diff --git a/data/deprecated/sources.sql b/deprecated/deprecated-old-sql-data-files/sources.sql similarity index 100% rename from data/deprecated/sources.sql rename to deprecated/deprecated-old-sql-data-files/sources.sql diff --git a/data/deprecated/spells.sql b/deprecated/deprecated-old-sql-data-files/spells.sql similarity index 100% rename from data/deprecated/spells.sql rename to deprecated/deprecated-old-sql-data-files/spells.sql diff --git a/data/deprecated/staves.sql b/deprecated/deprecated-old-sql-data-files/staves.sql similarity index 100% rename from data/deprecated/staves.sql rename to deprecated/deprecated-old-sql-data-files/staves.sql diff --git a/data/deprecated/third_party_json/spells.json b/deprecated/deprecated-old-sql-data-files/third_party_json/spells.json similarity index 100% rename from data/deprecated/third_party_json/spells.json rename to deprecated/deprecated-old-sql-data-files/third_party_json/spells.json diff --git a/data/deprecated/third_party_json/spells.py b/deprecated/deprecated-old-sql-data-files/third_party_json/spells.py similarity index 100% rename from data/deprecated/third_party_json/spells.py rename to deprecated/deprecated-old-sql-data-files/third_party_json/spells.py diff --git a/data/deprecated/third_party_json/spells20191115.json b/deprecated/deprecated-old-sql-data-files/third_party_json/spells20191115.json similarity index 100% rename from data/deprecated/third_party_json/spells20191115.json rename to deprecated/deprecated-old-sql-data-files/third_party_json/spells20191115.json diff --git a/data/deprecated/third_party_json/spellsNEW.json b/deprecated/deprecated-old-sql-data-files/third_party_json/spellsNEW.json similarity index 100% rename from data/deprecated/third_party_json/spellsNEW.json rename to deprecated/deprecated-old-sql-data-files/third_party_json/spellsNEW.json diff --git a/data/deprecated/traits.sql b/deprecated/deprecated-old-sql-data-files/traits.sql similarity index 100% rename from data/deprecated/traits.sql rename to deprecated/deprecated-old-sql-data-files/traits.sql diff --git a/data/deprecated/triggers.sql b/deprecated/deprecated-old-sql-data-files/triggers.sql similarity index 100% rename from data/deprecated/triggers.sql rename to deprecated/deprecated-old-sql-data-files/triggers.sql diff --git a/data/deprecated/weapons.sql b/deprecated/deprecated-old-sql-data-files/weapons.sql similarity index 100% rename from data/deprecated/weapons.sql rename to deprecated/deprecated-old-sql-data-files/weapons.sql diff --git a/src/README.md b/deprecated/deprecated-old-src-dir/README.md similarity index 100% rename from src/README.md rename to deprecated/deprecated-old-src-dir/README.md diff --git a/src/deprecated/backgrounds/background.csv b/deprecated/deprecated-old-src-dir/deprecated/backgrounds/background.csv similarity index 100% rename from src/deprecated/backgrounds/background.csv rename to deprecated/deprecated-old-src-dir/deprecated/backgrounds/background.csv diff --git a/src/deprecated/backgrounds/scrape_background.ipynb b/deprecated/deprecated-old-src-dir/deprecated/backgrounds/scrape_background.ipynb similarity index 100% rename from src/deprecated/backgrounds/scrape_background.ipynb rename to deprecated/deprecated-old-src-dir/deprecated/backgrounds/scrape_background.ipynb diff --git a/src/deprecated/backgrounds/scrape_background.py b/deprecated/deprecated-old-src-dir/deprecated/backgrounds/scrape_background.py similarity index 100% rename from src/deprecated/backgrounds/scrape_background.py rename to deprecated/deprecated-old-src-dir/deprecated/backgrounds/scrape_background.py diff --git a/src/deprecated/gear/README.md b/deprecated/deprecated-old-src-dir/deprecated/gear/README.md similarity index 100% rename from src/deprecated/gear/README.md rename to deprecated/deprecated-old-src-dir/deprecated/gear/README.md diff --git a/src/deprecated/gear/gear.csv b/deprecated/deprecated-old-src-dir/deprecated/gear/gear.csv similarity index 100% rename from src/deprecated/gear/gear.csv rename to deprecated/deprecated-old-src-dir/deprecated/gear/gear.csv diff --git a/src/deprecated/gear/scrape_gear.ipynb b/deprecated/deprecated-old-src-dir/deprecated/gear/scrape_gear.ipynb similarity index 100% rename from src/deprecated/gear/scrape_gear.ipynb rename to deprecated/deprecated-old-src-dir/deprecated/gear/scrape_gear.ipynb diff --git a/src/deprecated/gear/scrape_gear.py b/deprecated/deprecated-old-src-dir/deprecated/gear/scrape_gear.py similarity index 100% rename from src/deprecated/gear/scrape_gear.py rename to deprecated/deprecated-old-src-dir/deprecated/gear/scrape_gear.py diff --git a/src/deprecated/weapons/README.md b/deprecated/deprecated-old-src-dir/deprecated/weapons/README.md similarity index 100% rename from src/deprecated/weapons/README.md rename to deprecated/deprecated-old-src-dir/deprecated/weapons/README.md diff --git a/src/deprecated/weapons/ammunition.csv b/deprecated/deprecated-old-src-dir/deprecated/weapons/ammunition.csv similarity index 100% rename from src/deprecated/weapons/ammunition.csv rename to deprecated/deprecated-old-src-dir/deprecated/weapons/ammunition.csv diff --git a/src/deprecated/weapons/melee.csv b/deprecated/deprecated-old-src-dir/deprecated/weapons/melee.csv similarity index 100% rename from src/deprecated/weapons/melee.csv rename to deprecated/deprecated-old-src-dir/deprecated/weapons/melee.csv diff --git a/src/deprecated/weapons/ranged.csv b/deprecated/deprecated-old-src-dir/deprecated/weapons/ranged.csv similarity index 100% rename from src/deprecated/weapons/ranged.csv rename to deprecated/deprecated-old-src-dir/deprecated/weapons/ranged.csv diff --git a/src/deprecated/weapons/scrape.ipynb b/deprecated/deprecated-old-src-dir/deprecated/weapons/scrape.ipynb similarity index 100% rename from src/deprecated/weapons/scrape.ipynb rename to deprecated/deprecated-old-src-dir/deprecated/weapons/scrape.ipynb diff --git a/src/deprecated/weapons/scrape.py b/deprecated/deprecated-old-src-dir/deprecated/weapons/scrape.py similarity index 100% rename from src/deprecated/weapons/scrape.py rename to deprecated/deprecated-old-src-dir/deprecated/weapons/scrape.py diff --git a/src/deprecated/weapons/weapons.py b/deprecated/deprecated-old-src-dir/deprecated/weapons/weapons.py similarity index 100% rename from src/deprecated/weapons/weapons.py rename to deprecated/deprecated-old-src-dir/deprecated/weapons/weapons.py diff --git a/src/requirements.txt b/deprecated/deprecated-old-src-dir/requirements.txt similarity index 100% rename from src/requirements.txt rename to deprecated/deprecated-old-src-dir/requirements.txt diff --git a/src/staves/staves.csv b/deprecated/deprecated-old-src-dir/staves/staves.csv similarity index 100% rename from src/staves/staves.csv rename to deprecated/deprecated-old-src-dir/staves/staves.csv diff --git a/schema/abilityscores.sql b/deprecated/deprecated-sql-schema-files/abilityscores.sql similarity index 100% rename from schema/abilityscores.sql rename to deprecated/deprecated-sql-schema-files/abilityscores.sql diff --git a/schema/actions.sql b/deprecated/deprecated-sql-schema-files/actions.sql similarity index 100% rename from schema/actions.sql rename to deprecated/deprecated-sql-schema-files/actions.sql diff --git a/schema/alignments.sql b/deprecated/deprecated-sql-schema-files/alignments.sql similarity index 100% rename from schema/alignments.sql rename to deprecated/deprecated-sql-schema-files/alignments.sql diff --git a/schema/ammunition.sql b/deprecated/deprecated-sql-schema-files/ammunition.sql similarity index 100% rename from schema/ammunition.sql rename to deprecated/deprecated-sql-schema-files/ammunition.sql diff --git a/schema/ancestries.sql b/deprecated/deprecated-sql-schema-files/ancestries.sql similarity index 100% rename from schema/ancestries.sql rename to deprecated/deprecated-sql-schema-files/ancestries.sql diff --git a/schema/armor.sql b/deprecated/deprecated-sql-schema-files/armor.sql similarity index 100% rename from schema/armor.sql rename to deprecated/deprecated-sql-schema-files/armor.sql diff --git a/schema/backgrounds.sql b/deprecated/deprecated-sql-schema-files/backgrounds.sql similarity index 100% rename from schema/backgrounds.sql rename to deprecated/deprecated-sql-schema-files/backgrounds.sql diff --git a/schema/bulks.sql b/deprecated/deprecated-sql-schema-files/bulks.sql similarity index 100% rename from schema/bulks.sql rename to deprecated/deprecated-sql-schema-files/bulks.sql diff --git a/schema/conditions.sql b/deprecated/deprecated-sql-schema-files/conditions.sql similarity index 100% rename from schema/conditions.sql rename to deprecated/deprecated-sql-schema-files/conditions.sql diff --git a/schema/damagetypes.sql b/deprecated/deprecated-sql-schema-files/damagetypes.sql similarity index 100% rename from schema/damagetypes.sql rename to deprecated/deprecated-sql-schema-files/damagetypes.sql diff --git a/schema/feats.sql b/deprecated/deprecated-sql-schema-files/feats.sql similarity index 100% rename from schema/feats.sql rename to deprecated/deprecated-sql-schema-files/feats.sql diff --git a/schema/frequency.sql b/deprecated/deprecated-sql-schema-files/frequency.sql similarity index 100% rename from schema/frequency.sql rename to deprecated/deprecated-sql-schema-files/frequency.sql diff --git a/schema/gear.sql b/deprecated/deprecated-sql-schema-files/gear.sql similarity index 100% rename from schema/gear.sql rename to deprecated/deprecated-sql-schema-files/gear.sql diff --git a/schema/langs.sql b/deprecated/deprecated-sql-schema-files/langs.sql similarity index 100% rename from schema/langs.sql rename to deprecated/deprecated-sql-schema-files/langs.sql diff --git a/schema/monsters.sql b/deprecated/deprecated-sql-schema-files/monsters.sql similarity index 100% rename from schema/monsters.sql rename to deprecated/deprecated-sql-schema-files/monsters.sql diff --git a/schema/movements.sql b/deprecated/deprecated-sql-schema-files/movements.sql similarity index 100% rename from schema/movements.sql rename to deprecated/deprecated-sql-schema-files/movements.sql diff --git a/schema/requirements.sql b/deprecated/deprecated-sql-schema-files/requirements.sql similarity index 100% rename from schema/requirements.sql rename to deprecated/deprecated-sql-schema-files/requirements.sql diff --git a/schema/senses.sql b/deprecated/deprecated-sql-schema-files/senses.sql similarity index 100% rename from schema/senses.sql rename to deprecated/deprecated-sql-schema-files/senses.sql diff --git a/schema/sizes.sql b/deprecated/deprecated-sql-schema-files/sizes.sql similarity index 100% rename from schema/sizes.sql rename to deprecated/deprecated-sql-schema-files/sizes.sql diff --git a/schema/skills.sql b/deprecated/deprecated-sql-schema-files/skills.sql similarity index 100% rename from schema/skills.sql rename to deprecated/deprecated-sql-schema-files/skills.sql diff --git a/schema/sources.sql b/deprecated/deprecated-sql-schema-files/sources.sql similarity index 100% rename from schema/sources.sql rename to deprecated/deprecated-sql-schema-files/sources.sql diff --git a/schema/spells.sql b/deprecated/deprecated-sql-schema-files/spells.sql similarity index 100% rename from schema/spells.sql rename to deprecated/deprecated-sql-schema-files/spells.sql diff --git a/schema/staves.sql b/deprecated/deprecated-sql-schema-files/staves.sql similarity index 100% rename from schema/staves.sql rename to deprecated/deprecated-sql-schema-files/staves.sql diff --git a/schema/traits.sql b/deprecated/deprecated-sql-schema-files/traits.sql similarity index 100% rename from schema/traits.sql rename to deprecated/deprecated-sql-schema-files/traits.sql diff --git a/schema/triggers.sql b/deprecated/deprecated-sql-schema-files/triggers.sql similarity index 100% rename from schema/triggers.sql rename to deprecated/deprecated-sql-schema-files/triggers.sql diff --git a/schema/weapons.sql b/deprecated/deprecated-sql-schema-files/weapons.sql similarity index 100% rename from schema/weapons.sql rename to deprecated/deprecated-sql-schema-files/weapons.sql diff --git a/data/yaml/deprecated/ancestries.yaml b/deprecated/deprecated-yaml-scripts/ancestries.yaml similarity index 100% rename from data/yaml/deprecated/ancestries.yaml rename to deprecated/deprecated-yaml-scripts/ancestries.yaml diff --git a/data/yaml/deprecated/clean-up-monsters.py b/deprecated/deprecated-yaml-scripts/clean-up-monsters.py similarity index 100% rename from data/yaml/deprecated/clean-up-monsters.py rename to deprecated/deprecated-yaml-scripts/clean-up-monsters.py diff --git a/data/yaml/deprecated/feat-levels.py b/deprecated/deprecated-yaml-scripts/feat-levels.py similarity index 100% rename from data/yaml/deprecated/feat-levels.py rename to deprecated/deprecated-yaml-scripts/feat-levels.py diff --git a/data/yaml/deprecated/feats-levels-false-matches.yaml b/deprecated/deprecated-yaml-scripts/feats-levels-false-matches.yaml similarity index 100% rename from data/yaml/deprecated/feats-levels-false-matches.yaml rename to deprecated/deprecated-yaml-scripts/feats-levels-false-matches.yaml diff --git a/data/yaml/deprecated/feats-levels-true-matches.yaml b/deprecated/deprecated-yaml-scripts/feats-levels-true-matches.yaml similarity index 100% rename from data/yaml/deprecated/feats-levels-true-matches.yaml rename to deprecated/deprecated-yaml-scripts/feats-levels-true-matches.yaml diff --git a/data/yaml/deprecated/gendb.py b/deprecated/deprecated-yaml-scripts/gendb.py similarity index 100% rename from data/yaml/deprecated/gendb.py rename to deprecated/deprecated-yaml-scripts/gendb.py diff --git a/data/yaml/deprecated/hanc.py b/deprecated/deprecated-yaml-scripts/hanc.py similarity index 100% rename from data/yaml/deprecated/hanc.py rename to deprecated/deprecated-yaml-scripts/hanc.py diff --git a/data/yaml/deprecated/heritages.yaml b/deprecated/deprecated-yaml-scripts/heritages.yaml similarity index 100% rename from data/yaml/deprecated/heritages.yaml rename to deprecated/deprecated-yaml-scripts/heritages.yaml diff --git a/data/yaml/deprecated/monsters.yaml b/deprecated/deprecated-yaml-scripts/monsters.yaml similarity index 100% rename from data/yaml/deprecated/monsters.yaml rename to deprecated/deprecated-yaml-scripts/monsters.yaml diff --git a/data/yaml/deprecated/monsters.yaml.old b/deprecated/deprecated-yaml-scripts/monsters.yaml.old similarity index 100% rename from data/yaml/deprecated/monsters.yaml.old rename to deprecated/deprecated-yaml-scripts/monsters.yaml.old diff --git a/data/yaml/deprecated/scraped-monsters.yaml b/deprecated/deprecated-yaml-scripts/scraped-monsters.yaml similarity index 100% rename from data/yaml/deprecated/scraped-monsters.yaml rename to deprecated/deprecated-yaml-scripts/scraped-monsters.yaml diff --git a/data/yaml/deprecated/sensesyamltmp.py b/deprecated/deprecated-yaml-scripts/sensesyamltmp.py similarity index 100% rename from data/yaml/deprecated/sensesyamltmp.py rename to deprecated/deprecated-yaml-scripts/sensesyamltmp.py diff --git a/data/yaml/deprecated/sql-to-heritages.py b/deprecated/deprecated-yaml-scripts/sql-to-heritages.py similarity index 100% rename from data/yaml/deprecated/sql-to-heritages.py rename to deprecated/deprecated-yaml-scripts/sql-to-heritages.py diff --git a/data/yaml/deprecated/sql-to-traits.py b/deprecated/deprecated-yaml-scripts/sql-to-traits.py similarity index 100% rename from data/yaml/deprecated/sql-to-traits.py rename to deprecated/deprecated-yaml-scripts/sql-to-traits.py diff --git a/data/yaml/deprecated/sql-to-yaml-backgrounds.py b/deprecated/deprecated-yaml-scripts/sql-to-yaml-backgrounds.py similarity index 100% rename from data/yaml/deprecated/sql-to-yaml-backgrounds.py rename to deprecated/deprecated-yaml-scripts/sql-to-yaml-backgrounds.py diff --git a/data/yaml/deprecated/tmp-ac-special.py b/deprecated/deprecated-yaml-scripts/tmp-ac-special.py similarity index 100% rename from data/yaml/deprecated/tmp-ac-special.py rename to deprecated/deprecated-yaml-scripts/tmp-ac-special.py diff --git a/data/yaml/deprecated/tmp-actions-to-yaml.py b/deprecated/deprecated-yaml-scripts/tmp-actions-to-yaml.py similarity index 100% rename from data/yaml/deprecated/tmp-actions-to-yaml.py rename to deprecated/deprecated-yaml-scripts/tmp-actions-to-yaml.py diff --git a/data/yaml/deprecated/tmp-ammunition-to-yaml.py b/deprecated/deprecated-yaml-scripts/tmp-ammunition-to-yaml.py similarity index 100% rename from data/yaml/deprecated/tmp-ammunition-to-yaml.py rename to deprecated/deprecated-yaml-scripts/tmp-ammunition-to-yaml.py diff --git a/data/yaml/deprecated/tmp-ancestries-to-yaml.py b/deprecated/deprecated-yaml-scripts/tmp-ancestries-to-yaml.py similarity index 100% rename from data/yaml/deprecated/tmp-ancestries-to-yaml.py rename to deprecated/deprecated-yaml-scripts/tmp-ancestries-to-yaml.py diff --git a/data/yaml/deprecated/tmp-armoryaml.py b/deprecated/deprecated-yaml-scripts/tmp-armoryaml.py similarity index 100% rename from data/yaml/deprecated/tmp-armoryaml.py rename to deprecated/deprecated-yaml-scripts/tmp-armoryaml.py diff --git a/data/yaml/deprecated/tmp-feat.yaml b/deprecated/deprecated-yaml-scripts/tmp-feat.yaml similarity index 100% rename from data/yaml/deprecated/tmp-feat.yaml rename to deprecated/deprecated-yaml-scripts/tmp-feat.yaml diff --git a/data/yaml/deprecated/tmp-gear-to-yaml.py b/deprecated/deprecated-yaml-scripts/tmp-gear-to-yaml.py similarity index 100% rename from data/yaml/deprecated/tmp-gear-to-yaml.py rename to deprecated/deprecated-yaml-scripts/tmp-gear-to-yaml.py diff --git a/data/yaml/deprecated/tmp-spells-to-yaml.py b/deprecated/deprecated-yaml-scripts/tmp-spells-to-yaml.py similarity index 100% rename from data/yaml/deprecated/tmp-spells-to-yaml.py rename to deprecated/deprecated-yaml-scripts/tmp-spells-to-yaml.py diff --git a/data/yaml/deprecated/tmp-sql-staves-to-yaml.py b/deprecated/deprecated-yaml-scripts/tmp-sql-staves-to-yaml.py similarity index 100% rename from data/yaml/deprecated/tmp-sql-staves-to-yaml.py rename to deprecated/deprecated-yaml-scripts/tmp-sql-staves-to-yaml.py diff --git a/data/yaml/deprecated/tmp-sql-to-weapons.py b/deprecated/deprecated-yaml-scripts/tmp-sql-to-weapons.py similarity index 100% rename from data/yaml/deprecated/tmp-sql-to-weapons.py rename to deprecated/deprecated-yaml-scripts/tmp-sql-to-weapons.py diff --git a/data/yaml/deprecated/tmp-sql-to-yaml-feats.py b/deprecated/deprecated-yaml-scripts/tmp-sql-to-yaml-feats.py similarity index 100% rename from data/yaml/deprecated/tmp-sql-to-yaml-feats.py rename to deprecated/deprecated-yaml-scripts/tmp-sql-to-yaml-feats.py diff --git a/gendb/lib/__init__.py b/lib/__init__.py similarity index 100% rename from gendb/lib/__init__.py rename to lib/__init__.py diff --git a/lib/gendb/__init__.py b/lib/gendb/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gendb/lib/basics.py b/lib/gendb/basics.py similarity index 100% rename from gendb/lib/basics.py rename to lib/gendb/basics.py diff --git a/gendb/lib/utils.py b/lib/gendb/utils.py similarity index 100% rename from gendb/lib/utils.py rename to lib/gendb/utils.py