diff --git a/typescript/.gitignore b/frontend/.gitignore
similarity index 100%
rename from typescript/.gitignore
rename to frontend/.gitignore
diff --git a/typescript/bower.json b/frontend/bower.json
similarity index 100%
rename from typescript/bower.json
rename to frontend/bower.json
diff --git a/typescript/audio.ts b/frontend/old_test_page/audio.ts
similarity index 100%
rename from typescript/audio.ts
rename to frontend/old_test_page/audio.ts
diff --git a/typescript/sentences.ts b/frontend/old_test_page/sentences.ts
similarity index 100%
rename from typescript/sentences.ts
rename to frontend/old_test_page/sentences.ts
diff --git a/typescript/testing_app.ts b/frontend/old_test_page/testing_app.ts
similarity index 100%
rename from typescript/testing_app.ts
rename to frontend/old_test_page/testing_app.ts
diff --git a/typescript/words.ts b/frontend/old_test_page/words.ts
similarity index 100%
rename from typescript/words.ts
rename to frontend/old_test_page/words.ts
diff --git a/typescript/package.json b/frontend/package.json
similarity index 100%
rename from typescript/package.json
rename to frontend/package.json
diff --git a/typescript/tsd.json b/frontend/tsd.json
similarity index 100%
rename from typescript/tsd.json
rename to frontend/tsd.json
diff --git a/typescript/waveform.ts b/frontend/waveform_component.ts
similarity index 100%
rename from typescript/waveform.ts
rename to frontend/waveform_component.ts
diff --git a/typescript/webpack.config.js b/frontend/webpack.config.js
similarity index 53%
rename from typescript/webpack.config.js
rename to frontend/webpack.config.js
index 9d53232067..f9740126b3 100644
--- a/typescript/webpack.config.js
+++ b/frontend/webpack.config.js
@@ -1,7 +1,7 @@
 module.exports = {
   entry: {
-    testing_app: './testing_app.ts', // TODO: Rename just broke this
-    waveform: './waveform.ts',
+    testing_app: './old_test_page/testing_app.ts', // TODO: Rename broke this
+    waveform_component: './waveform_component.ts',
   },
   output: {
     path: '../web/output',
@@ -12,7 +12,10 @@ module.exports = {
   },
   module: {
     loaders: [
-      { test: /\.ts$/, loader: 'ts-loader' }
+      {
+        test: /\.ts$/,
+        loader: 'ts-loader'
+      }
     ]
   }
 }
diff --git a/web/index.html b/web/index.html
index a265d71d5d..96060a3ffa 100644
--- a/web/index.html
+++ b/web/index.html
@@ -100,7 +100,7 @@
     </div>
     <audio id="sound"></audio>
     <script src="/assets/output/libraries.js"/></script>
-    <script src="/assets/output/waveform.built.js"/></script>
+    <script src="/assets/output/waveform_component.built.js"/></script>
     <script src="/assets/output/script.js"/></script>
   </body>
 </html>
diff --git a/web/old.html b/web/old.html
index a265d71d5d..96060a3ffa 100644
--- a/web/old.html
+++ b/web/old.html
@@ -100,7 +100,7 @@
     </div>
     <audio id="sound"></audio>
     <script src="/assets/output/libraries.js"/></script>
-    <script src="/assets/output/waveform.built.js"/></script>
+    <script src="/assets/output/waveform_component.built.js"/></script>
     <script src="/assets/output/script.js"/></script>
   </body>
 </html>