diff --git a/index.html b/index.html
index 082ffec..6aa2e59 100644
--- a/index.html
+++ b/index.html
@@ -27,81 +27,5 @@
 	<script data-main="/resources/js/main" src="/resources/vendors/require/require.min.js">/**/</script>
 </head>
 <body>
-	<ul id="listItemContextMenu" class="context-menu dropdown-menu">
-		<li><a href="javascript:void(0);" data-target="listItemDetails"><i class="icon-info-sign"></i>&nbsp;Details...</a></li>
-		<li><a href="javascript:void(0);" data-target="permalink"><i class="icon-bookmark"></i>&nbsp;Direct link</a></li>
-		<li><a href="javascript:void(0);" data-target="download"><i class="icon-download-alt"></i>&nbsp;Download</a></li>
-	</ul>
-
-	<ul id="listColumnsContextMenu" class="context-menu dropdown-menu">
-		<li><a href="javascript:void(0);">Title</a></li>
-		<li><a href="javascript:void(0);">Artist</a></li>
-		<li><a href="javascript:void(0);">Album</a></li>
-		<li><a href="javascript:void(0);">Track</a></li>
-		<li><a href="javascript:void(0);">Disc</a></li>
-		<li><a href="javascript:void(0);">Year</a></li>
-		<li><a href="javascript:void(0);">Time</a></li>
-		<li><a href="javascript:void(0);">Genre</a></li>
-	</ul>
-
-	<!-- Underscore Templates -->
-	<script type="text/html" id="_tmplPlayerView">
-		<div class="daaprPlayerTitleIndicator">{{dmap_itemname}}</div>
-		<div class="daaprPlayerInfoIndicator">{{daap_songartist}}</div>
-		<div class="daaprProgressWrap">
-			<span id="daaprProgressTimeElapsed">0:00</span>
-			<progress min="0" max="1" value="0" id="daaprPlayerProgress"></progress>
-			<span id="daaprProgressTimeRemain">-0:00</span>
-		</div>
-	</script>
-
-	<script type="text/html" id="_tmplModalFatal">
-		<div id="modalFatal">
-			<div class="overlay"></div>
-			<div class="modal" data-show="true" tabindex="-1" role="dialog" aria-hidden="true">
-				<div class="modal-header alert alert-error">
-					<h3 id="myModalLabel">A fatal error has occured</h3>
-				</div>
-				<div class="modal-body" style="font-size: 1.2em">
-
-				</div>
-				<div class="modal-footer">
-					<button class="btn btn-mini btn-primary" data-dismiss="modal" aria-hidden="true"><i class="icon-refresh"></i>&nbsp;Reload</button>
-				</div>
-			</div>
-		</div>
-	</script>
-	<script type="text/html" id="_tmplListItemDetails">
-		<div id="listItemDetails" data-closable="true">
-			<div class="overlay"></div>
-			<div class="modal hide fade" data-show="true" tabindex="-1" role="dialog" aria-labelledby="listItemDetailsLabel" aria-hidden="true">
-				<div class="modal-header">
-					<!--button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button-->
-					<h4 id="myModalLabel">Song Details</h4>
-				</div>
-				<div class="modal-body">
-					<table class="table table-striped table-hover table-condensed">
-					<%
-						_.each(items, function(item) {
-							print("<tr>\n");
-							print("	<td>\n");
-							print("		" + item.title + ":\n");
-							print("	</td>\n");
-							print("	<td>\n");
-							print("		" + item.data + "\n");
-							print("	</td>\n");
-							print("</tr>\n");
-
-						});
-					%>
-					</table>
-				</div>
-				<div class="modal-footer">
-					<button class="btn btn-mini" data-target="download" aria-hidden="true" data-loading-text="Downloading..."><i class="icon-download-alt"></i>&nbsp;Download</button>
-					<button class="btn btn-mini btn-primary" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i>&nbsp;Close</button>
-				</div>
-			</div>
-		</div>
-	</script>
 </body>
 </html>
diff --git a/resources/templates/app/modal-fatal.html b/resources/templates/app/modal-fatal.html
new file mode 100644
index 0000000..ddbe4eb
--- /dev/null
+++ b/resources/templates/app/modal-fatal.html
@@ -0,0 +1,14 @@
+<div id="modalFatal">
+	<div class="overlay"></div>
+	<div class="modal" data-show="true" tabindex="-1" role="dialog" aria-hidden="true">
+		<div class="modal-header alert alert-error">
+			<h3 id="myModalLabel">A fatal error has occured</h3>
+		</div>
+		<div class="modal-body" style="font-size: 1.2em">
+
+		</div>
+		<div class="modal-footer">
+			<button class="btn btn-mini btn-primary" data-dismiss="modal" aria-hidden="true"><i class="icon-refresh"></i>&nbsp;Reload</button>
+		</div>
+	</div>
+</div>
diff --git a/resources/templates/list/column-dropdown.html b/resources/templates/list/column-dropdown.html
new file mode 100644
index 0000000..e758551
--- /dev/null
+++ b/resources/templates/list/column-dropdown.html
@@ -0,0 +1,10 @@
+<ul id="listColumnsContextMenu" class="context-menu dropdown-menu">
+	<li><a href="javascript:void(0);">Title</a></li>
+	<li><a href="javascript:void(0);">Artist</a></li>
+	<li><a href="javascript:void(0);">Album</a></li>
+	<li><a href="javascript:void(0);">Track</a></li>
+	<li><a href="javascript:void(0);">Disc</a></li>
+	<li><a href="javascript:void(0);">Year</a></li>
+	<li><a href="javascript:void(0);">Time</a></li>
+	<li><a href="javascript:void(0);">Genre</a></li>
+</ul>
\ No newline at end of file
diff --git a/resources/templates/list/item-dropdown.html b/resources/templates/list/item-dropdown.html
new file mode 100644
index 0000000..8664d95
--- /dev/null
+++ b/resources/templates/list/item-dropdown.html
@@ -0,0 +1,5 @@
+<ul id="listItemContextMenu" class="context-menu dropdown-menu">
+	<li><a href="javascript:void(0);" data-target="listItemDetails"><i class="icon-info-sign"></i>&nbsp;Details...</a></li>
+	<li><a href="javascript:void(0);" data-target="permalink"><i class="icon-bookmark"></i>&nbsp;Direct link</a></li>
+	<li><a href="javascript:void(0);" data-target="download"><i class="icon-download-alt"></i>&nbsp;Download</a></li>
+</ul>
\ No newline at end of file
diff --git a/resources/templates/list/modal-item-details.html b/resources/templates/list/modal-item-details.html
new file mode 100644
index 0000000..825c57d
--- /dev/null
+++ b/resources/templates/list/modal-item-details.html
@@ -0,0 +1,30 @@
+<div id="listItemDetails" data-closable="true">
+	<div class="overlay"></div>
+	<div class="modal hide fade" data-show="true" tabindex="-1" role="dialog" aria-labelledby="listItemDetailsLabel" aria-hidden="true">
+		<div class="modal-header">
+			<!--button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button-->
+			<h4 id="myModalLabel">Song Details</h4>
+		</div>
+		<div class="modal-body">
+			<table class="table table-striped table-hover table-condensed">
+			<%
+				_.each(items, function(item) {
+					print("<tr>\n");
+					print("	<td>\n");
+					print("		" + item.title + ":\n");
+					print("	</td>\n");
+					print("	<td>\n");
+					print("		" + item.data + "\n");
+					print("	</td>\n");
+					print("</tr>\n");
+
+				});
+			%>
+			</table>
+		</div>
+		<div class="modal-footer">
+			<button class="btn btn-mini" data-target="download" aria-hidden="true" data-loading-text="Downloading..."><i class="icon-download-alt"></i>&nbsp;Download</button>
+			<button class="btn btn-mini btn-primary" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i>&nbsp;Close</button>
+		</div>
+	</div>
+</div>
diff --git a/resources/templates/player/player-status.html b/resources/templates/player/player-status.html
new file mode 100644
index 0000000..5c4dbab
--- /dev/null
+++ b/resources/templates/player/player-status.html
@@ -0,0 +1,7 @@
+<div class="daaprPlayerTitleIndicator">{{dmap_itemname}}</div>
+<div class="daaprPlayerInfoIndicator">{{daap_songartist}}</div>
+<div class="daaprProgressWrap">
+	<span id="daaprProgressTimeElapsed">0:00</span>
+	<progress min="0" max="1" value="0" id="daaprPlayerProgress"></progress>
+	<span id="daaprProgressTimeRemain">-0:00</span>
+</div>
\ No newline at end of file
