diff --git a/.gitignore b/.gitignore
index 6a73d23..8bfe5ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,15 @@
 /config/app_local.php
 /config/.env
 /logs/*
+/logs/*.log
 /tmp/*
+/tmp/cache/
+/tmp/sessions/
 /vendor/*
 /database/*
+/database/app.sqlite
+# Ignore .gitkeep in all folders
+**/.gitkeep
 # OS generated files #
 ######################
 .DS_Store
@@ -51,3 +57,4 @@ nbproject/*
 # yarn
 yarn-debug.log
 yarn-error.log
+
diff --git a/plugins/.gitkeep b/plugins/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/resources/.gitkeep b/resources/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Controller/Component/.gitkeep b/src/Controller/Component/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Model/Behavior/.gitkeep b/src/Model/Behavior/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/View/Cell/.gitkeep b/src/View/Cell/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/View/Helper/.gitkeep b/src/View/Helper/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/templates/cell/.gitkeep b/templates/cell/.gitkeep
deleted file mode 100644
index 8b13789..0000000
--- a/templates/cell/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/TestCase/Controller/Component/.gitkeep b/tests/TestCase/Controller/Component/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/TestCase/Model/Behavior/.gitkeep b/tests/TestCase/Model/Behavior/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/TestCase/View/Helper/.gitkeep b/tests/TestCase/View/Helper/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/webroot/js/.gitkeep b/webroot/js/.gitkeep
deleted file mode 100644
index e69de29..0000000