diff --git a/.gitignore b/.gitignore
index 1665271..f82d9f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,8 @@
 
 tmp/
+
+index.js.json
+
+index.js.map
+
+package-lock.json
diff --git a/public/pages/contact.html b/public/pages/contact.html
index 91e6707..6ee84ad 100644
--- a/public/pages/contact.html
+++ b/public/pages/contact.html
@@ -5,7 +5,7 @@
 		<div class="col-md-8 m">
 			<h1>@{title}</h1>
 			<!-- CONTACTFORM COMPONENT -->
-			<!--- <ui-import path="/public/components/contactform.html"></ui-import> --->
+			<!--- <ui-import path="/components/contactform.html"></ui-import> --->
 			<ui-component name="visible" path="response" config="if:!value || !value.success">
 				<div class="row">com
 					<div class="col-md-6 m">
diff --git a/public/pages/references.html b/public/pages/references.html
index c0db64d..0755013 100644
--- a/public/pages/references.html
+++ b/public/pages/references.html
@@ -14,40 +14,40 @@
 	<h1>References</h1>
 	<div class="row">
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 		<div class="col-md-3 col-sm-6 col-xs-6 reference">
-			<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+			<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 		</div>
 	</div>
 </ui-plugin>
diff --git a/public/pages/services.html b/public/pages/services.html
index d15e53f..3c40264 100644
--- a/public/pages/services.html
+++ b/public/pages/services.html
@@ -13,7 +13,7 @@ <h2>Lorem ipsum dolor sit</h2>
 		</div>
 	</div>
 	<br />
-	<div><img src="/public/img/image.jpg" alt="Our work" class="img-responsive img-rounded" /></div>
+	<div><img src="/img/image.jpg" alt="Our work" class="img-responsive img-rounded" /></div>
 	<br />
 	<br />
 	<div class="row">
diff --git a/views/contact.html b/views/contact.html
index 7dad099..3652193 100644
--- a/views/contact.html
+++ b/views/contact.html
@@ -7,7 +7,7 @@
 	<meta name="format-detection" content="telephone=no" />
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 	<meta name="robots" content="all,follow" />
-	<link rel="stylesheet" href="/public/css/default.css">
+	<link rel="stylesheet" href="/css/default.css">
 	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Source+Sans+Pro:400,200,700&subset=latin,latin-ext" />
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
 	<link rel="stylesheet" href="//cdn.componentator.com/spa.min.css" />
diff --git a/views/index.html b/views/index.html
index 189a564..29f5ba0 100755
--- a/views/index.html
+++ b/views/index.html
@@ -7,7 +7,7 @@
 	<meta name="format-detection" content="telephone=no" />
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 	<meta name="robots" content="all,follow" />
-	<link rel="stylesheet" href="/public/css/default.css">
+	<link rel="stylesheet" href="/css/default.css">
 	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Source+Sans+Pro:400,200,700&subset=latin,latin-ext" />
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
 	<link rel="stylesheet" href="//cdn.componentator.com/spa.min.css" />
@@ -18,19 +18,19 @@
 	<h1>Total.js Example</h1>
 	<div class="row">
 		<div class="col-md-4 col-sm-4 m">
-			<a href="/services/"><img src="/public/img/001.jpg" alt="Eshop" class="img-responsive img-rounded" /></a>
+			<a href="/services/"><img src="/img/001.jpg" alt="Eshop" class="img-responsive img-rounded" /></a>
 		</div>
 		<div class="col-md-4 col-sm-4 m">
-			<a href="/services/"><img src="/public/img/002.jpg" alt="Easy modifications" class="img-responsive img-rounded" /></a>
+			<a href="/services/"><img src="/img/002.jpg" alt="Easy modifications" class="img-responsive img-rounded" /></a>
 		</div>
 		<div class="col-md-4 col-sm-4 m">
-			<a href="/services/"><img src="/public/img/003.jpg" alt="Redesign it" class="img-responsive img-rounded" /></a>
+			<a href="/services/"><img src="/img/003.jpg" alt="Redesign it" class="img-responsive img-rounded" /></a>
 		</div>
 	</div>
 	<br />
 	<div class="row">
 		<div class="col-md-8 col-md-offset-2">
-			<ui-import path="/public/components/newsletter.html"></ui-import>
+			<ui-import path="/components/newsletter.html"></ui-import>
 		</div>
 	</div>
 	<br />
diff --git a/views/layout.html b/views/layout.html
index 37d346b..2569a10 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -6,7 +6,7 @@
 	<meta name="format-detection" content="telephone=no" />
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 	<meta name="robots" content="all,follow" />
-	<link rel="stylesheet" href="/public/css/default.css">
+	<link rel="stylesheet" href="/css/default.css">
 	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Source+Sans+Pro:400,200,700&subset=latin,latin-ext" />
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
 	<!--- <link rel="stylesheet" href="//cdn.componentator.com/spa.min.css" /> --->
@@ -22,7 +22,7 @@
 	<header>
 		<div class="container">
 			<a href="javascript:void(0)" class="mainmenu-button"><i class="ti ti-navicon"></i></a>
-			<a href="/"><img src="/public/img/logo.png" alt="@{config.name}" height="30" /></a>
+			<a href="/"><img src="/img/logo.png" alt="@{config.name}" height="30" /></a>
 			<nav>
 				<a href="/"><i class="ti ti-home"></i>Home</a>
 				<a href="services.html">Services</a>
@@ -36,20 +36,20 @@
 		<h1>Total.js Example</h1>
 		<div class="row">
 			<div class="col-md-4 col-sm-4 m">
-				<a href="/services/"><img src="/public/img/001.jpg" alt="Eshop" class="img-responsive img-rounded" /></a>
+				<a href="/services/"><img src="/img/001.jpg" alt="Eshop" class="img-responsive img-rounded" /></a>
 			</div>
 			<div class="col-md-4 col-sm-4 m">
-				<a href="/services/"><img src="/public/img/002.jpg" alt="Easy modifications" class="img-responsive img-rounded" /></a>
+				<a href="/services/"><img src="/img/002.jpg" alt="Easy modifications" class="img-responsive img-rounded" /></a>
 			</div>
 			<div class="col-md-4 col-sm-4 m">
-				<a href="/services/"><img src="/public/img/003.jpg" alt="Redesign it" class="img-responsive img-rounded" /></a>
+				<a href="/services/"><img src="/img/003.jpg" alt="Redesign it" class="img-responsive img-rounded" /></a>
 			</div>
 		</div>
 		<br />
 		<div class="row">
 			<div class="col-md-8 col-md-offset-2">
 				<!-- NEWSLETTER COMPONENT -->
-				<ui-import path="/public/components/newsletter.html"></ui-import>
+				<ui-import path="/components/newsletter.html"></ui-import>
 			</div>
 		</div>
 		<br />
diff --git a/views/references.html b/views/references.html
index 2dad7b7..d7444cd 100644
--- a/views/references.html
+++ b/views/references.html
@@ -7,7 +7,7 @@
 	<meta name="format-detection" content="telephone=no" />
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 	<meta name="robots" content="all,follow" />
-	<link rel="stylesheet" href="/public/css/default.css">
+	<link rel="stylesheet" href="/css/default.css">
 	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Source+Sans+Pro:400,200,700&subset=latin,latin-ext" />
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
 	<link rel="stylesheet" href="//cdn.componentator.com/spa.min.css" />
@@ -30,40 +30,40 @@
 			<h1>References</h1>
 			<div class="row">
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 				<div class="col-md-3 col-sm-6 col-xs-6 reference">
-					<a href="#"><img src="/public/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
+					<a href="#"><img src="/img/reference.png" class="img-responsive" alt="" /><span class="reference-title"><b>Lorem Ipsum</b><span>Lorem Ipsum Alias</span></span></a>
 				</div>
 			</div>
 		</div>
diff --git a/views/services.html b/views/services.html
index c850055..8f76b9d 100644
--- a/views/services.html
+++ b/views/services.html
@@ -7,7 +7,7 @@
 	<meta name="format-detection" content="telephone=no" />
 	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 	<meta name="robots" content="all,follow" />
-	<link rel="stylesheet" href="/public/css/default.css">
+	<link rel="stylesheet" href="/css/default.css">
 	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Source+Sans+Pro:400,200,700&subset=latin,latin-ext" />
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
 	<link rel="stylesheet" href="//cdn.componentator.com/spa.min.css" />
@@ -30,7 +30,7 @@ <h2>Lorem ipsum dolor sit</h2>
 				</div>
 			</div>
 			<br />
-			<div><img src="/public/img/image.jpg" alt="Our work" class="img-responsive img-rounded" /></div>
+			<div><img src="/img/image.jpg" alt="Our work" class="img-responsive img-rounded" /></div>
 			<br />
 			<br />
 			<div class="row">