diff --git a/app.liquid b/app.liquid
index 87db0cb..92bb56f 100644
--- a/app.liquid
+++ b/app.liquid
@@ -1,6 +1,6 @@
 {% assign pageId = page.fileSlug -%}
 {% assign pageClass = 'html_ui' -%}
-{% layout 'hippie/default.liquid' %}
+{% layout 'hippie-view/default.liquid' %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/default.liquid b/default.liquid
index 4ff5f5a..84730b3 100644
--- a/default.liquid
+++ b/default.liquid
@@ -19,10 +19,10 @@
 	</title>
 
 	{% block meta -%}
-	{% render 'hippie/partials/meta.liquid' %}
+	{% render 'hippie-view/partials/meta.liquid' %}
 	{% endblock -%}
 	{% block links -%}
-	{% render 'hippie/partials/links.liquid' %}
+	{% render 'hippie-view/partials/links.liquid' %}
 	{% endblock -%}
 	{% block style -%}{% endblock -%}
 	{% endblock -%}
diff --git a/full.liquid b/full.liquid
index dbbe4ae..e5b3e9e 100644
--- a/full.liquid
+++ b/full.liquid
@@ -18,32 +18,32 @@
 		{{ hippie.titlePostfix -}}
 	</title>
 	{% block meta -%}
-	{% render 'hippie/partials/meta.liquid', author: 'Interaktionsweise', desc: 'Hippie interweaves preeminent personal interface elements' %}
+	{% render 'hippie-view/partials/meta.liquid', author: 'Interaktionsweise', desc: 'Hippie interweaves preeminent personal interface elements' %}
 	{% comment %}<base href="/">{% endcomment %}
 	{% endblock -%}
-	{% render 'hippie/partials/script-log.liquid' %}
-	{% render 'hippie/partials/log-setup', hippie: hippie, state: true -%}
-	{% render 'hippie/partials/log-start' -%}
+	{% render 'hippie-view/partials/script-log.liquid' %}
+	{% render 'hippie-view/partials/log-setup', hippie: hippie, state: true -%}
+	{% render 'hippie-view/partials/log-start' -%}
 	{% block links -%}
-	{% render 'hippie/partials/links.liquid' %}
+	{% render 'hippie-view/partials/links.liquid' %}
 	<link rel="stylesheet" media="all" href="/css/demo.css" type="text/css"/>
 	{% endblock -%}
-	{% render 'hippie/partials/log-log' with 'HEAD end    :: Links parsed, starting to load.' as msg -%}
+	{% render 'hippie-view/partials/log-log' with 'HEAD end    :: Links parsed, starting to load.' as msg -%}
 	{% endblock -%}
 </head>
 
 <body{{ bodyClassAttr }}>
-{% render 'hippie/partials/log-log' with 'BODY start' as msg -%}
+{% render 'hippie-view/partials/log-log' with 'BODY start' as msg -%}
 {%- block body %}{% endblock -%}
-{% render 'hippie/partials/log-log' with 'BODY        :: Loading script assets...' as msg -%}
+{% render 'hippie-view/partials/log-log' with 'BODY        :: Loading script assets...' as msg -%}
 {%- block assets %}{% endblock -%}
-{% render 'hippie/partials/log-assets', state: true -%}
-{% render 'hippie/partials/log-log', msg: 'BODY        :: Assets loaded, running page specific script...', arg: true -%}
+{% render 'hippie-view/partials/log-assets', state: true -%}
+{% render 'hippie-view/partials/log-log', msg: 'BODY        :: Assets loaded, running page specific script...', arg: true -%}
 <script>
 	// {{ title }} script using full template
 </script>
 {%- block script %}{% endblock -%}
-{% render 'hippie/partials/log-log' with 'BODY end    :: Page script might still be loading.' as msg -%}
-{% render 'hippie/partials/log-log' with 'Application ready... or is it?' as msg -%}
+{% render 'hippie-view/partials/log-log' with 'BODY end    :: Page script might still be loading.' as msg -%}
+{% render 'hippie-view/partials/log-log' with 'Application ready... or is it?' as msg -%}
 </body>
 </html>
\ No newline at end of file
diff --git a/game.liquid b/game.liquid
index 37c890b..6621eb9 100644
--- a/game.liquid
+++ b/game.liquid
@@ -1,5 +1,5 @@
 {% assign pageId = page.fileSlug -%}
-{% layout 'hippie/default.liquid' %}
+{% layout 'hippie-view/default.liquid' %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/page.liquid b/page.liquid
index 5cf93c9..b1d8e47 100644
--- a/page.liquid
+++ b/page.liquid
@@ -1,5 +1,5 @@
 {% assign pageId = page.fileSlug -%}
-{% layout 'hippie/full.liquid' %}
+{% layout 'hippie-view/full.liquid' %}
 
 {% block meta %}
 {{ block.super -}}
@@ -22,15 +22,15 @@
 
 {% block body %}
 {{ block.super -}}
-{% render 'hippie/partials/nav-page.liquid' %}
+{% render 'hippie-view/partials/nav-page.liquid' %}
 <div id="root">
-	{% render 'hippie/partials/header-page.liquid' %}
+	{% render 'hippie-view/partials/header-page.liquid' %}
 
 	<main class="main_site">
 		{% block main %}{% endblock %}
 	</main>
 
-	{% render 'hippie/partials/footer-page.liquid' %}
+	{% render 'hippie-view/partials/footer-page.liquid' %}
 </div>
 {% endblock %}
 
diff --git a/partials/header-status.liquid b/partials/header-status.liquid
index 725e305..524d22a 100644
--- a/partials/header-status.liquid
+++ b/partials/header-status.liquid
@@ -12,10 +12,10 @@
 		</ul>
 	</nav>
 	<div class="state">
-		<p>{% render 'hippie/partials/status-coord', id: "log" %}
+		<p>{% render 'hippie-view/partials/status-coord', id: "log" %}
 			/
-			{% render 'hippie/partials/status-date', id: "date" %}
+			{% render 'hippie-view/partials/status-date', id: "date" %}
 			/
-			{% render 'hippie/partials/status-time', id: "time" %}</p>
+			{% render 'hippie-view/partials/status-time', id: "time" %}</p>
 	</div>
 </div>
diff --git a/simple.liquid b/simple.liquid
index b888886..bd6dac5 100644
--- a/simple.liquid
+++ b/simple.liquid
@@ -1,5 +1,5 @@
 {% assign pageId = page.fileSlug -%}
-{% layout 'hippie/default.liquid' %}
+{% layout 'hippie-view/default.liquid' %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/status.liquid b/status.liquid
index 86499ed..c93d4b8 100644
--- a/status.liquid
+++ b/status.liquid
@@ -15,7 +15,7 @@
 		{{ hippie.titlePostfix -}}
 	</title>
 	{% block meta -%}
-	{% render 'hippie/partials/meta.liquid' %}
+	{% render 'hippie-view/partials/meta.liquid' %}
 	{% endblock -%}
 	{% block links -%}
 	<link rel="shortcut icon" type="image/x-icon"
@@ -31,7 +31,7 @@
 	<h1>{{ title }}</h1>
 	{% block main %}{% endblock -%}
 </main>
-{% render 'hippie/partials/footer-status' %}
+{% render 'hippie-view/partials/footer-status' %}
 {% endblock -%}
 </body>
 </html>
\ No newline at end of file