diff --git a/site/config/settings.yaml b/site/config/settings.yaml
new file mode 100644
index 00000000..2bd4c329
--- /dev/null
+++ b/site/config/settings.yaml
@@ -0,0 +1,21 @@
+title: Flextype
+description: 'Modern Open Source Flat-File Content Management System'
+keywords: 'flextype, php, cms, flat-file cms, flat cms, flatfile cms, html'
+robots: 'index, follow'
+author:
+  name: ''
+  email: ''
+timezone: UTC
+date_format: 'F d Y H:i:s'
+charset: UTF-8
+theme: simple
+locale: en
+pages:
+  main: home
+errors:
+  display: true
+cache:
+  enabled: true
+  prefix: flextype
+  driver: auto
+  lifetime: 604800
diff --git a/site/config/site.yaml b/site/config/site.yaml
deleted file mode 100755
index fd90ec51..00000000
--- a/site/config/site.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-title: 'Flextype'
-description: 'Modern Open Source Flat-File Content Management System'
-keywords: 'flextype, php, cms, flat-file cms, flat cms, flatfile cms, html'
-robots: 'index, follow'
-author:
-  name: ''
-  email: ''
diff --git a/site/config/system.yaml b/site/config/system.yaml
deleted file mode 100755
index a431daef..00000000
--- a/site/config/system.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-timezone: UTC
-date_format: 'F d Y H:i:s'
-charset: UTF-8
-
-theme: simple
-
-locale: 'en'
-
-pages:
-  main: home
-
-errors:
-  display: false
-
-cache:
-  enabled: true
-  prefix: flextype
-  driver: auto
-  lifetime: 604800