diff --git a/templates/base.html b/templates/base.html
deleted file mode 100644
index ebaf822..0000000
--- a/templates/base.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- Runnerspace
-
-
-
-
-
diff --git a/templates/index.html b/templates/index.html
deleted file mode 100644
index 357a399..0000000
--- a/templates/index.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-{% endblock %}
diff --git a/templates/layouts/base.html b/templates/layouts/base.html
new file mode 100644
index 0000000..0b05985
--- /dev/null
+++ b/templates/layouts/base.html
@@ -0,0 +1,17 @@
+
+
+
+
+ Runnerspace
+
+
+
+
+ {% include 'layouts/header.html' %}
+ {% block content %}
+ Do not extend base.html directly.
+ {% endblock content %}
+ {% include 'layouts/footer.html' %}
+
+
+
diff --git a/templates/layouts/footer.html b/templates/layouts/footer.html
new file mode 100644
index 0000000..f367f56
--- /dev/null
+++ b/templates/layouts/footer.html
@@ -0,0 +1,3 @@
+
diff --git a/templates/layouts/header.html b/templates/layouts/header.html
new file mode 100644
index 0000000..d328795
--- /dev/null
+++ b/templates/layouts/header.html
@@ -0,0 +1,20 @@
+
diff --git a/templates/layouts/index.html b/templates/layouts/index.html
new file mode 100644
index 0000000..cc48cdf
--- /dev/null
+++ b/templates/layouts/index.html
@@ -0,0 +1,5 @@
+{% extends 'layouts/base.html' %}
+
+{% block content %}
+ Hello, World!
+{% endblock %}