diff --git a/.gitignore b/.gitignore
index c7ee02c58f..c87a1fe575 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,31 @@ requirements/conf_all.txt
 **/.vscode/
 /custom_plugins
 /priv_tools
+
+
+# ./etc -- ignore everything
+etc/*
+# except yaml default-files
+!etc/admin.yaml.default
+!etc/holidays.yaml.default
+!etc/logging.yaml.default
+!etc/logic.yaml.default
+!etc/module.yaml.default
+!etc/plugin.yaml.default
+!etc/smarthome.yaml.default
+
+# ./items -- ignore everything
+items/
+
+# ./logics -- ignore everything
+logics/
+
+# ./functions -- ignore everything
+functions/
+
+# ./structs -- ignore everything
+structs/
+
+# ./scenes -- ignore everything
+scenes/
+
diff --git a/etc/.gitignore b/etc/.gitignore
deleted file mode 100644
index f29354a153..0000000000
--- a/etc/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-# ignore everything
-*
-# except .gitignore
-!.gitignore
-#!logging.yaml
-# except yaml default-files
-!admin.yaml.default
-!holidays.yaml.default
-!logging.yaml.default
-!logic.yaml.default
-!module.yaml.default
-!plugin.yaml.default
-!smarthome.yaml.default
diff --git a/functions/.gitignore b/functions/.gitignore
deleted file mode 100644
index 5b5726d9f4..0000000000
--- a/functions/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# ignore everything
-*
-# except .gitignore and template file
-!.gitignore
-!uf.tpl
diff --git a/functions/uf.tpl b/functions/uf.tpl
deleted file mode 100644
index dd523d0aad..0000000000
--- a/functions/uf.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# This file contains user defined functions for use with SmartHomeNG
-#
-import logging
-_logger = logging.getLogger(__name__)
-
-_VERSION     = '0.1.0'
-_DESCRIPTION = 'Per Anhalter durch die Galaxis'
-
-#
-# Example functions
-#
-def zweiundvierzig():
-
-    return 'Die Antwort auf die Frage aller Fragen'
-
-def itemtest(sh):
-
-    return sh.env.location.sun_position.elevation.degrees()
-
-def log_test():
-
-    _logger.warning('Log-Test aus einer Userfunction')
-
-    return
diff --git a/items/.gitignore b/items/.gitignore
deleted file mode 100644
index 6c22af6ce7..0000000000
--- a/items/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# ignore everything
-*
-# except .gitignore
-!.gitignore
diff --git a/logics/.gitignore b/logics/.gitignore
deleted file mode 100644
index f850825a77..0000000000
--- a/logics/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# ignore everything
-*
-# except .gitignore
-!.gitignore
-!example_*.*
-!logic.tpl
diff --git a/logics/logic.tpl b/logics/logic.tpl
deleted file mode 100644
index 280e34fa01..0000000000
--- a/logics/logic.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python3
-#
-# This file contains a logic for use with SmartHomeNG
-#
-# Name of the logic: example_logic.py
-#
-
-# This logic performs the following function(s):
-#
-#    ...
-#
-
-# The following triggers should be defined in ../etc/logic.yaml:
-#
-#	watch_item = <item1> | <item2> | ...
-#	crontab = init = Init
-#   cycle = 600
-#
-
diff --git a/scenes/.gitignore b/scenes/.gitignore
deleted file mode 100644
index 6c22af6ce7..0000000000
--- a/scenes/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# ignore everything
-*
-# except .gitignore
-!.gitignore
diff --git a/structs/.gitignore b/structs/.gitignore
deleted file mode 100644
index 6c22af6ce7..0000000000
--- a/structs/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# ignore everything
-*
-# except .gitignore
-!.gitignore