diff --git a/.gitignore b/.gitignore
index 8c946c3..08e324b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,18 @@
-__pycache__
+# generic temporary / dev files
+*.pyc
 *.sh
-apikey
 *.txt
+*.xcf
 nohup.out
-screenshot*.png
-/settings/settings.ini
-proxyscrobble.py
-doreah
+
+# user files
+*.tsv
+*.rulestate
+*.log
+
+# currently not using
+/screenshot*.png
+/proxyscrobble.py
+
+# only for development, normally external
+/doreah
diff --git a/clients/.gitignore b/clients/.gitignore
index b277966..77d83b6 100644
--- a/clients/.gitignore
+++ b/clients/.gitignore
@@ -1 +1 @@
-authenticated_machines.tsv
+!example_file.tsv
diff --git a/logs/.gitignore b/logs/.gitignore
deleted file mode 100644
index 397b4a7..0000000
--- a/logs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.log
diff --git a/rules/.gitignore b/rules/.gitignore
deleted file mode 100644
index 3c8ddf3..0000000
--- a/rules/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.tsv
diff --git a/rules/predefined/.gitignore b/rules/predefined/.gitignore
new file mode 100644
index 0000000..cc575b5
--- /dev/null
+++ b/rules/predefined/.gitignore
@@ -0,0 +1 @@
+!*.tsv
diff --git a/scrobblers/.gitignore b/scrobblers/.gitignore
deleted file mode 100644
index 01b9fd9..0000000
--- a/scrobblers/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.xcf
diff --git a/scrobbles/.gitignore b/scrobbles/.gitignore
deleted file mode 100644
index b5c6d43..0000000
--- a/scrobbles/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!dummy
-!.gitignore
diff --git a/settings/.gitignore b/settings/.gitignore
new file mode 100644
index 0000000..75d4de9
--- /dev/null
+++ b/settings/.gitignore
@@ -0,0 +1 @@
+settings.ini
diff --git a/website/.gitignore b/website/.gitignore
deleted file mode 100644
index 51171e9..0000000
--- a/website/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-__pycache__
-*.xcf