diff --git a/rawilum/Pages.php b/rawilum/Pages.php
index 68355587..6fdd31e5 100755
--- a/rawilum/Pages.php
+++ b/rawilum/Pages.php
@@ -80,7 +80,7 @@ class Pages
         if ($this->rawilum['filesystem']->exists($template_path)) {
             include $template_path;
         } else {
-            throw new RuntimeException("Template does not exist.");
+            throw new RuntimeException("Template {$template_name} does not exist.");
         }
     }
 
diff --git a/rawilum/boot/defines.php b/rawilum/boot/defines.php
index f354c7a3..3b2d740f 100755
--- a/rawilum/boot/defines.php
+++ b/rawilum/boot/defines.php
@@ -15,8 +15,8 @@ define('ROOT_DIR', str_replace(DIRECTORY_SEPARATOR, '/', getcwd()));
 // Define the path to the site directory (without trailing slash).
 define('SITE_PATH', ROOT_DIR . '/site-katerinasitnikova');
 
-// Define the path to the content directory (without trailing slash).
-define('CONTENT_PATH', SITE_PATH . '/content');
+// Define the path to the pages directory (without trailing slash).
+define('PAGES_PATH', SITE_PATH . '/pages');
 
 // Define the path to the themes directory (without trailing slash).
 define('THEMES_PATH', SITE_PATH . '/themes');
diff --git a/site/pages/404/index.md b/site/pages/404/index.md
new file mode 100755
index 00000000..dc41754a
--- /dev/null
+++ b/site/pages/404/index.md
@@ -0,0 +1,7 @@
+---
+title: Error 404  
+robots: noindex,nofollow  
+---
+
+## Error 404
+We're sorry but the page you are looking for doesn't appear to exist!
diff --git a/site/pages/contact/index.md b/site/pages/contact/index.md
new file mode 100755
index 00000000..8a8939e7
--- /dev/null
+++ b/site/pages/contact/index.md
@@ -0,0 +1,15 @@
+---
+title: Contact  
+description: Rawilum is a simple and light-weighted Content Management System  
+---
+
+## Stay in touch
+
+[Rawilum official site](http://Rawilum.org/)   
+[Rawilum forum](http://forum.Rawilum.org/)  
+[Rawilum on Github](https://github.com/Rawilum/Rawilum)  
+[Rawilum Gitter chat room](https://gitter.im/Rawilum/Rawilum)  
+
+## Follow us on Twitter
+
+Follow Rawilum on Twitter [@Rawilum_cms](https://twitter.com/Rawilum_cms)
diff --git a/site/pages/home/index.md b/site/pages/home/index.md
new file mode 100755
index 00000000..871da36d
--- /dev/null
+++ b/site/pages/home/index.md
@@ -0,0 +1,7 @@
+---
+title: Главная страница  
+description: страница
+template: home  
+---
+
+home