diff --git a/index.html b/index.html
index 50c7bf94..7dc21274 100644
--- a/index.html
+++ b/index.html
@@ -160,7 +160,7 @@
         <script type="text/javascript" src="js/views/conversation_view.js"></script>
         <script type="text/javascript" src="js/views/new_conversation_view.js"></script>
         <script type="text/javascript" src="js/views/new_group_view.js"></script>
-        <script type="text/javascript" src="js/popup.js"></script>
+        <script type="text/javascript" src="js/index.js"></script>
         <div id="listener"></div>
         <div id="log"></div>
     </body>
diff --git a/js/popup.js b/js/index.js
similarity index 100%
rename from js/popup.js
rename to js/index.js
diff --git a/popup.html b/popup.html
deleted file mode 100644
index 950fca26..00000000
--- a/popup.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- vim: ts=4:sw=4:noexpandtab:
---!>
-<!--This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<link type='text/css' rel='stylesheet' href='css/forms.css'>
-	<link type='text/css' rel='stylesheet' href='css/buttons.css'>
-	<link type='text/css' rel='stylesheet' href='css/conversation.css'>
-	<link type='text/css' rel='stylesheet' href='css/popup.css'>
-</head>
-<body data-name="curve25519" data-tools="pnacl" data-configs="Debug Release" data-path="nacl/pnacl/{config}">
-	<header class="clearfix">
-		<div class='container'>
-			<button class='btn btn-square' id='send_link'>&plus;</button>
-			<span class='help' id='new-chat-help'>new message</span>
-		</div>
-	</header>
-	<div class='colmask leftmenu'>
-		<div class='colleft'>
-			<div id='main' class='col1'>
-				<div class='container'>
-					<div id="listener"></div>
-					<div id="log"></div>
-				</div>
-				<div class='message-container'></div>
-				<form id="new-message" class='clearfix'>
-					<input id="new-message-text" type='text' autocomplete=false>
-					<input type=submit id="compose-message" class='btn btn-square' value='>'>
-				</form>
-			</div>
-			<div id='sidebar' class="col2">
-				<form id="send" class='clearfix'>
-					<input type=submit id="compose-create" class='btn btn-square' value='>'>
-					<input id="send_numbers" type='text' placeholder="+xxxxxxxxxx">
-				</form>
-				<ul id="contacts"></ul>
-			</div>
-		</div>
-	</div>
-	<script type="text/x-tmpl-mustache" id="contact">
-		<div class='image'>
-			{{#image}}
-				<img src="{{image}}">
-			{{/image}}
-		</div>
-		<div class='name'>{{name}}</div>
-		<div class='snippet'>{{lastMessage}}</div>
-	</script>
-	<script type="text/x-tmpl-mustache" id="message">
-		<div class="bubble">
-			<span class="message-text">
-			{{body}}
-			</span>
-			<span class="message-attachment">
-				{{#attachments}}
-					<img src="{{.}}"/>
-				{{/attachments}}
-			</span>
-			<span class="metadata">{{date}}</span>
-		</div>
-	</script>
-	<!-- /TEMPLATES -->
-	<script type="text/javascript" src="js-deps/nacl-common.js"></script>
-	<script type="text/javascript" src="js-deps/jquery.js"></script>
-	<script type="text/javascript" src="js-deps/CryptoJS.js"></script>
-	<script type="text/javascript" src="js-deps/curve255.js"></script>
-	<script type="text/javascript" src="js-deps/Long.min.js"></script>
-	<script type="text/javascript" src="js-deps/ByteBuffer.min.js"></script>
-	<script type="text/javascript" src="js-deps/ProtoBuf.min.js"></script>
-	<script type="text/javascript" src="js-deps/underscore.js"></script>
-	<script type="text/javascript" src="js-deps/backbone.js"></script>
-	<script type="text/javascript" src="js-deps/backbone.localStorage.js"></script>
-	<script type="text/javascript" src="js-deps/mustache.js"></script>
-	<script type="text/javascript" src="js-deps/libphonenumber_api-compiled.js"></script>
-
-	<script type="text/javascript" src="js/helpers.js"></script>
-	<script type="text/javascript" src="js/webcrypto.js"></script>
-	<script type="text/javascript" src="js/crypto.js"></script>
-	<script type="text/javascript" src="js/models/messages.js"></script>
-	<script type="text/javascript" src="js/models/threads.js"></script>
-	<script type="text/javascript" src="js/api.js"></script>
-	<script type="text/javascript" src="js/sendmessage.js"></script>
-
-	<script type="text/javascript" src="js/chromium.js"></script>
-	<script type="text/javascript" src="js/views/notifications.js"></script>
-	<script type="text/javascript" src="js/views/list_view.js"></script>
-	<script type="text/javascript" src="js/views/message_view.js"></script>
-	<script type="text/javascript" src="js/views/message_list_view.js"></script>
-	<script type="text/javascript" src="js/views/conversation_list_item_view.js"></script>
-	<script type="text/javascript" src="js/views/conversation_list_view.js"></script>
-	<script type="text/javascript" src="js/views/conversation_view.js"></script>
-	<script type="text/javascript" src="js/popup.js"></script>
-</body>
-</html>
