diff --git a/default-settings/admin_pw b/conf-examples/default-settings/admin_pw
similarity index 100%
rename from default-settings/admin_pw
rename to conf-examples/default-settings/admin_pw
diff --git a/default-settings/ip b/conf-examples/default-settings/ip
similarity index 100%
rename from default-settings/ip
rename to conf-examples/default-settings/ip
diff --git a/default-settings/language b/conf-examples/default-settings/language
similarity index 100%
rename from default-settings/language
rename to conf-examples/default-settings/language
diff --git a/default-settings/names.db b/conf-examples/default-settings/names.db
similarity index 100%
rename from default-settings/names.db
rename to conf-examples/default-settings/names.db
diff --git a/default-settings/timeout b/conf-examples/default-settings/timeout
similarity index 100%
rename from default-settings/timeout
rename to conf-examples/default-settings/timeout
diff --git a/default-settings/version b/conf-examples/default-settings/version
similarity index 100%
rename from default-settings/version
rename to conf-examples/default-settings/version
diff --git a/logo/ameisenkopp.svg b/design/logo/ameisenkopp.svg
similarity index 100%
rename from logo/ameisenkopp.svg
rename to design/logo/ameisenkopp.svg
diff --git a/logo/antlogo100px.png b/design/logo/antlogo100px.png
similarity index 100%
rename from logo/antlogo100px.png
rename to design/logo/antlogo100px.png
diff --git a/logo/antlogo100px_green.png b/design/logo/antlogo100px_green.png
similarity index 100%
rename from logo/antlogo100px_green.png
rename to design/logo/antlogo100px_green.png
diff --git a/logo/antlogo100px_red.png b/design/logo/antlogo100px_red.png
similarity index 100%
rename from logo/antlogo100px_red.png
rename to design/logo/antlogo100px_red.png
diff --git a/logo/antlogo100px_transp_red.png b/design/logo/antlogo100px_transp_red.png
similarity index 100%
rename from logo/antlogo100px_transp_red.png
rename to design/logo/antlogo100px_transp_red.png
diff --git a/logo/boesetest.svg b/design/logo/boesetest.svg
similarity index 100%
rename from logo/boesetest.svg
rename to design/logo/boesetest.svg
diff --git a/logo/bubblebutton.svg b/design/logo/bubblebutton.svg
similarity index 100%
rename from logo/bubblebutton.svg
rename to design/logo/bubblebutton.svg
diff --git a/logo/entwurf.svg b/design/logo/entwurf.svg
similarity index 100%
rename from logo/entwurf.svg
rename to design/logo/entwurf.svg
diff --git a/logo/evil_stick.png b/design/logo/evil_stick.png
similarity index 100%
rename from logo/evil_stick.png
rename to design/logo/evil_stick.png
diff --git a/logo/evil_stick.svg b/design/logo/evil_stick.svg
similarity index 100%
rename from logo/evil_stick.svg
rename to design/logo/evil_stick.svg
diff --git a/logo/evil_stick2.png b/design/logo/evil_stick2.png
similarity index 100%
rename from logo/evil_stick2.png
rename to design/logo/evil_stick2.png
diff --git a/logo/evil_stick2.svg b/design/logo/evil_stick2.svg
similarity index 100%
rename from logo/evil_stick2.svg
rename to design/logo/evil_stick2.svg
diff --git a/logo/evil_stick3.png b/design/logo/evil_stick3.png
similarity index 100%
rename from logo/evil_stick3.png
rename to design/logo/evil_stick3.png
diff --git a/logo/evil_stick3.svg b/design/logo/evil_stick3.svg
similarity index 100%
rename from logo/evil_stick3.svg
rename to design/logo/evil_stick3.svg
diff --git a/logo/vault_pingu_gross.png b/design/logo/vault_pingu_gross.png
similarity index 100%
rename from logo/vault_pingu_gross.png
rename to design/logo/vault_pingu_gross.png
diff --git a/logo/vault_pingu_uncut.png b/design/logo/vault_pingu_uncut.png
similarity index 100%
rename from logo/vault_pingu_uncut.png
rename to design/logo/vault_pingu_uncut.png