diff --git a/.gitignore b/.gitignore
index 1dc3852..a007ae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,24 @@
+# Temporary files
 *.swp
+*.log
 *~
 .DS_Store
+.vscode/
 
+# Python files
+venv/
+__pycache__/
+.mypy_cache/
+
+# Github authentication files
+/.github_*
+
+# yunohost specific cache/output dirs
 .apps_cache
-builds
-tools/README-generator/venv/
+builds*
+
 tools/bot-repo-cleanup/.github_token
 tools/autoupdater-upgrader/.*
 
 tools/autopatches/login
 tools/autopatches/token
-
-.github_token
-
-__pycache__
-app_list_auto_update.log
-venv
diff --git a/README-generator/README.md b/readme_generator/README.md
similarity index 100%
rename from README-generator/README.md
rename to readme_generator/README.md
diff --git a/README-generator/__init__.py b/readme_generator/__init__.py
similarity index 100%
rename from README-generator/__init__.py
rename to readme_generator/__init__.py
diff --git a/README-generator/make_readme.py b/readme_generator/make_readme.py
similarity index 100%
rename from README-generator/make_readme.py
rename to readme_generator/make_readme.py
diff --git a/README-generator/nginx.conf b/readme_generator/nginx.conf
similarity index 100%
rename from README-generator/nginx.conf
rename to readme_generator/nginx.conf
diff --git a/README-generator/requirements.txt b/readme_generator/requirements.txt
similarity index 100%
rename from README-generator/requirements.txt
rename to readme_generator/requirements.txt
diff --git a/README-generator/templates/README.md.j2 b/readme_generator/templates/README.md.j2
similarity index 96%
rename from README-generator/templates/README.md.j2
rename to readme_generator/templates/README.md.j2
index 6786d70..d1988c2 100644
--- a/README-generator/templates/README.md.j2
+++ b/readme_generator/templates/README.md.j2
@@ -7,13 +7,13 @@
   * Using the [script helpers documentation.](https://yunohost.org/packaging_apps_helpers)
 * Add a `LICENSE` file for the package.
 * Edit `doc/DISCLAIMER*.md`
-* The `README.md` files are to be automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+* The `README.md` files are to be automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 
 ---
 {% endif -%}
 
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -88,4 +88,3 @@ sudo yunohost app upgrade {{manifest.id}} -u https://github.com/YunoHost-Apps/{{
 ```
 
 **More info regarding app packaging:** <https://yunohost.org/packaging_apps>
-
diff --git a/README-generator/templates/README_fr.md.j2 b/readme_generator/templates/README_fr.md.j2
similarity index 98%
rename from README-generator/templates/README_fr.md.j2
rename to readme_generator/templates/README_fr.md.j2
index bd36dae..6fa53b6 100644
--- a/README-generator/templates/README_fr.md.j2
+++ b/readme_generator/templates/README_fr.md.j2
@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
diff --git a/README-generator/webhook.py b/readme_generator/webhook.py
similarity index 100%
rename from README-generator/webhook.py
rename to readme_generator/webhook.py
diff --git a/README-generator/webhook.service b/readme_generator/webhook.service
similarity index 100%
rename from README-generator/webhook.service
rename to readme_generator/webhook.service