diff --git a/templates/search2_files/bootstrap.css b/templates/css/bootstrap.css
similarity index 100%
rename from templates/search2_files/bootstrap.css
rename to templates/css/bootstrap.css
diff --git a/templates/search2_files/cover.css b/templates/css/cover.css
similarity index 100%
rename from templates/search2_files/cover.css
rename to templates/css/cover.css
diff --git a/templates/search2_files/bootstrap.js b/templates/js/bootstrap.js
similarity index 100%
rename from templates/search2_files/bootstrap.js
rename to templates/js/bootstrap.js
diff --git a/templates/search2_files/docs.js b/templates/js/docs.js
similarity index 100%
rename from templates/search2_files/docs.js
rename to templates/js/docs.js
diff --git a/templates/search2_files/ie-emulation-modes-warning.js b/templates/js/ie-emulation-modes-warning.js
similarity index 100%
rename from templates/search2_files/ie-emulation-modes-warning.js
rename to templates/js/ie-emulation-modes-warning.js
diff --git a/templates/search2_files/ie10-viewport-bug-workaround.js b/templates/js/ie10-viewport-bug-workaround.js
similarity index 100%
rename from templates/search2_files/ie10-viewport-bug-workaround.js
rename to templates/js/ie10-viewport-bug-workaround.js
diff --git a/templates/search2_files/jquery.js b/templates/js/jquery.js
similarity index 100%
rename from templates/search2_files/jquery.js
rename to templates/js/jquery.js
diff --git a/templates/search.html b/templates/search.html
index 445ba21..e742705 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -1,11 +1,65 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
 	<head>
+		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 		<meta charset="utf-8">
-		<title>TITLE</title>
-		<link rel="stylesheet" href="css/style.css">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<meta name="description" content="">
+		<meta name="author" content="">
+		<link rel="icon" href="favicon.ico">
+		<title>{{pageTitle}}</title>
+		<!-- Bootstrap core CSS -->
+		<link href="css/bootstrap.css" rel="stylesheet">
+		<!-- Custom styles for this template -->
+		<link href="css/cover.css" rel="stylesheet">
 	</head>
+
 	<body>
-		
+		<div class="site-wrapper">
+			<div class="site-wrapper-inner">
+				<div class="cover-container">
+					<div class="masthead clearfix">
+						<div class="inner">
+							<h3 class="masthead-brand">Cover</h3>
+							<nav>
+								<ul class="nav masthead-nav">
+									<li class="active"><a href="#">Search</a></li>
+									<li><a href="#">Features</a></li>
+									<li><a href="#">Contact</a></li>
+								</ul>
+							</nav>
+						</div>
+					</div>
+		  		<div class="inner cover">
+						<form>
+							<input type=text>
+							<input type="submit" value="Submit">
+						</form>
+						<h1 class="cover-heading">Cover your page.</h1>
+						<p class="lead">Cover is a one-page template for building 
+simple and beautiful home pages. Download, edit the text, and add your 
+own fullscreen background photo to make it your own.</p>
+						<p class="lead">
+							<a href="#" class="btn btn-lg btn-default">Learn more</a>
+						</p>
+					</div>
+					<div class="mastfoot">
+						<div class="inner">
+							<p>Cover template for <a href="http://getbootstrap.com/">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- Bootstrap core JavaScript
+		================================================== -->
+		<!-- Placed at the end of the document so the pages load faster -->
+		<script src="js/jquery.js"></script>
+		<script src="js/bootstrap.js"></script>
+		<script src="js/docs.js"></script>
+		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+		<script src="js/ie10-viewport-bug-workaround.js"></script>
 	</body>
 </html>
diff --git a/templates/search2.html b/templates/search2.html
deleted file mode 100644
index 5051467..0000000
--- a/templates/search2.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<meta name="description" content="">
-		<meta name="author" content="">
-		<link rel="icon" href="http://getbootstrap.com/favicon.ico">
-		<title>Search</title>
-		<!-- Bootstrap core CSS -->
-		<link href="search2_files/bootstrap.css" rel="stylesheet">
-		<!-- Custom styles for this template -->
-		<link href="search2_files/cover.css" rel="stylesheet">
-		<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
-		<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
-		<script src="search2_files/ie-emulation-modes-warning.js"></script>
-	
-		<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-		<!--[if lt IE 9]>
-		  <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-		  <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-		<![endif]-->
-	</head>
-
-	<body>
-		<div class="site-wrapper">
-			<div class="site-wrapper-inner">
-				<div class="cover-container">
-					<div class="masthead clearfix">
-						<div class="inner">
-							<h3 class="masthead-brand">Cover</h3>
-							<nav>
-								<ul class="nav masthead-nav">
-									<li class="active"><a href="#">Search</a></li>
-									<li><a href="#">Features</a></li>
-									<li><a href="#">Contact</a></li>
-								</ul>
-							</nav>
-						</div>
-					</div>
-		  		<div class="inner cover">
-						<form>
-							<input type=text>
-							<input type="submit" value="Submit">
-						</form>
-						<h1 class="cover-heading">Cover your page.</h1>
-						<p class="lead">Cover is a one-page template for building 
-simple and beautiful home pages. Download, edit the text, and add your 
-own fullscreen background photo to make it your own.</p>
-						<p class="lead">
-							<a href="#" class="btn btn-lg btn-default">Learn more</a>
-						</p>
-					</div>
-					<div class="mastfoot">
-						<div class="inner">
-							<p>Cover template for <a href="http://getbootstrap.com/">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<!-- Bootstrap core JavaScript
-		================================================== -->
-		<!-- Placed at the end of the document so the pages load faster -->
-		<script src="search2_files/jquery.js"></script>
-		<script src="search2_files/bootstrap.js"></script>
-		<script src="search2_files/docs.js"></script>
-		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-		<script src="search2_files/ie10-viewport-bug-workaround.js"></script>
-	</body>
-</html>
