diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index ddedcba..b860e20 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import './App.css';
-import { Waveform } from './Waveform';
+import { Waveform } from './Waveform/Waveform';
 
 const audioContext = new AudioContext();
 
 function App() {
   return (
     <div className="App">
-      <Waveform audioContext={audioContext}/>
+      <Waveform audioContext={audioContext} />
     </div>
   );
 }
diff --git a/frontend/src/Waveform/Canvas.tsx b/frontend/src/Waveform/Canvas.tsx
index eff3fa4..36a06f6 100644
--- a/frontend/src/Waveform/Canvas.tsx
+++ b/frontend/src/Waveform/Canvas.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react';
-import { CanvasLogicalWidth, CanvasLogicalHeight } from '../Waveform';
+import { CanvasLogicalWidth, CanvasLogicalHeight } from './Waveform';
 
 const maxPeakValue = 32_768;
 
diff --git a/frontend/src/Waveform/Helpers.tsx b/frontend/src/Waveform/Helpers.tsx
index 2226b9c..4876e02 100644
--- a/frontend/src/Waveform/Helpers.tsx
+++ b/frontend/src/Waveform/Helpers.tsx
@@ -1,4 +1,4 @@
-import { CanvasLogicalWidth } from '../Waveform';
+import { CanvasLogicalWidth } from './Waveform';
 import { MouseEvent } from 'react';
 
 // TODO: add tests
diff --git a/frontend/src/Waveform/Overview.tsx b/frontend/src/Waveform/Overview.tsx
index 71a8594..9aae053 100644
--- a/frontend/src/Waveform/Overview.tsx
+++ b/frontend/src/Waveform/Overview.tsx
@@ -1,10 +1,6 @@
 import { useEffect, useState, useRef, MouseEvent } from 'react';
 import { Canvas as WaveformCanvas } from './Canvas';
-import {
-  CanvasLogicalWidth,
-  CanvasLogicalHeight,
-  Selection,
-} from '../Waveform';
+import { CanvasLogicalWidth, CanvasLogicalHeight, Selection } from './Waveform';
 import { mouseEventToCanvasX } from './Helpers';
 
 interface Props {
diff --git a/frontend/src/Waveform/Thumbnails.tsx b/frontend/src/Waveform/Thumbnails.tsx
index 19ac80b..8032b6e 100644
--- a/frontend/src/Waveform/Thumbnails.tsx
+++ b/frontend/src/Waveform/Thumbnails.tsx
@@ -1,5 +1,5 @@
 import { useState, useEffect, useRef } from 'react';
-import { CanvasLogicalWidth, CanvasLogicalHeight, MediaSet } from '../Waveform';
+import { CanvasLogicalWidth, CanvasLogicalHeight, MediaSet } from './Waveform';
 
 interface Props {
   mediaSet: MediaSet;
diff --git a/frontend/src/Waveform.tsx b/frontend/src/Waveform/Waveform.tsx
similarity index 97%
rename from frontend/src/Waveform.tsx
rename to frontend/src/Waveform/Waveform.tsx
index e2ead40..4fe874a 100644
--- a/frontend/src/Waveform.tsx
+++ b/frontend/src/Waveform/Waveform.tsx
@@ -1,8 +1,8 @@
 import { useEffect, useState, useRef, MouseEvent } from 'react';
-import { Waveform as WaveformOverview } from './Waveform/Overview';
-import { Thumbnails } from './Waveform/Thumbnails';
-import { Canvas as WaveformCanvas } from './Waveform/Canvas';
-import { canvasXToFrame, mouseEventToCanvasX } from './Waveform/Helpers';
+import { Waveform as WaveformOverview } from './Overview';
+import { Thumbnails } from './Thumbnails';
+import { Canvas as WaveformCanvas } from './Canvas';
+import { canvasXToFrame, mouseEventToCanvasX } from './Helpers';
 
 interface Props {
   audioContext: AudioContext;