diff --git a/static/space.png b/static/assets/space.png
similarity index 100%
rename from static/space.png
rename to static/assets/space.png
diff --git a/static/telegraph-a.mp3 b/static/assets/telegraph-a.mp3
similarity index 100%
rename from static/telegraph-a.mp3
rename to static/assets/telegraph-a.mp3
diff --git a/static/telegraph-b.mp3 b/static/assets/telegraph-b.mp3
similarity index 100%
rename from static/telegraph-b.mp3
rename to static/assets/telegraph-b.mp3
diff --git a/static/vail.png b/static/assets/vail.png
similarity index 100%
rename from static/vail.png
rename to static/assets/vail.png
diff --git a/static/vail.svg b/static/assets/vail.svg
similarity index 100%
rename from static/vail.svg
rename to static/assets/vail.svg
diff --git a/static/b0.svg b/static/b0.svg
deleted file mode 100644
index ae8964f..0000000
--- a/static/b0.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="-1 -1 15 15" xmlns="http://www.w3.org/2000/svg">
-  <circle cx= "6" cy="10" r="2" style="stroke: #000;"/>
-  <circle cx="10" cy= "6" r="2" style="stroke: #000; fill: none;"/>
-  <circle cx= "2" cy= "6" r="2" style="stroke: #000; fill: none;"/>
-  <circle cx= "6" cy= "2" r="2" style="stroke: #000; fill: none;"/>
-</svg>
diff --git a/static/b1.svg b/static/b1.svg
deleted file mode 100644
index c120102..0000000
--- a/static/b1.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="-1 -1 15 15" xmlns="http://www.w3.org/2000/svg">
-  <circle cx= "6" cy="10" r="2" style="stroke: #000; fill: none;"/>
-  <circle cx="10" cy= "6" r="2" style="stroke: #000;"/>
-  <circle cx= "2" cy= "6" r="2" style="stroke: #000; fill: none;"/>
-  <circle cx= "6" cy= "2" r="2" style="stroke: #000; fill: none;"/>
-</svg>
diff --git a/static/b2.svg b/static/b2.svg
deleted file mode 100644
index e748260..0000000
--- a/static/b2.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="-1 -1 15 15" xmlns="http://www.w3.org/2000/svg">
-  <circle cx= "6" cy="10" r="2" style="stroke: #000; fill: none;"/>
-  <circle cx="10" cy= "6" r="2" style="stroke: #000; fill: none;"/>
-  <circle cx= "2" cy= "6" r="2" style="stroke: #000;"/>
-  <circle cx= "6" cy= "2" r="2" style="stroke: #000; fill: none;"/>
-</svg>
diff --git a/static/b3.svg b/static/b3.svg
deleted file mode 100644
index 0d098e2..0000000
--- a/static/b3.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="-1 -1 15 15" xmlns="http://www.w3.org/2000/svg">
-  <circle cx= "6" cy="10" r="2" style="stroke: #000; fill: none;"/>
-  <circle cx="10" cy= "6" r="2" style="stroke: #000; fill: none;"/>
-  <circle cx= "2" cy= "6" r="2" style="stroke: #000; fill: none;"/>
-  <circle cx= "6" cy= "2" r="2" style="stroke: #000;"/>
-</svg>
diff --git a/static/chart.html b/static/chart.html
deleted file mode 100644
index 29dc459..0000000
--- a/static/chart.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Chart-O-Matic</title>
-        <script type="module" src="chart.mjs"></script>
-    </head>
-    <body>
-        <h1>The Amazing Chart-O-Matic</h1>
-        <canvas id="chart" style="border: solid black 1px; width: 100%;"></canvas>
-    </body>
-</html>
diff --git a/static/index.html b/static/index.html
index d7ea930..83cbb1d 100644
--- a/static/index.html
+++ b/static/index.html
@@ -11,17 +11,17 @@
 
 		<!-- Vail stuff -->
 		<link rel="manifest" href="manifest.json">
-		<link rel="icon" href="vail.png" sizes="256x256" type="image/png">
-		<link rel="icon" href="vail.svg" sizes="any" type="image/svg+xml">
-		<script type="module" src="vail.mjs"></script>
-		<script type="module" src="ui.mjs"></script>
+		<link rel="icon" href="assets/vail.png" sizes="256x256" type="image/png">
+		<link rel="icon" href="assets/vail.svg" sizes="any" type="image/svg+xml">
+		<script type="module" src="scripts/vail.mjs"></script>
+		<script type="module" src="scripts/ui.mjs"></script>
 		<link rel="stylesheet" href="vail.css">
 	</head>
 	<body>
 		<nav class="navbar is-dark">
 			<div class="navbar-brand">
 				<a class="navbar-item">
-					<img class="" src="vail.svg" alt="">
+					<img class="" src="assets/vail.svg" alt="">
 					<div class="block">Vail</div>
 				</a>
 			</div>
diff --git a/static/manifest.json b/static/manifest.json
index 2792f5d..f3d37b4 100644
--- a/static/manifest.json
+++ b/static/manifest.json
@@ -7,7 +7,7 @@
   "theme_color": "#009688",
   "description": "Internet Morse Code client",
   "icons": [
-    {"src": "vail.png", "sizes": "250x250"},
-    {"src": "vail.svg", "sizes": "150x150"}
+    {"src": "assets/vail.png", "sizes": "250x250"},
+    {"src": "assets/vail.svg", "sizes": "150x150"}
   ]
 }
diff --git a/static/chart.mjs b/static/scripts/chart.mjs
similarity index 100%
rename from static/chart.mjs
rename to static/scripts/chart.mjs
diff --git a/static/duration.mjs b/static/scripts/duration.mjs
similarity index 100%
rename from static/duration.mjs
rename to static/scripts/duration.mjs
diff --git a/static/fortunes.mjs b/static/scripts/fortunes.mjs
similarity index 100%
rename from static/fortunes.mjs
rename to static/scripts/fortunes.mjs
diff --git a/static/inputs.mjs b/static/scripts/inputs.mjs
similarity index 100%
rename from static/inputs.mjs
rename to static/scripts/inputs.mjs
diff --git a/static/keyers.mjs b/static/scripts/keyers.mjs
similarity index 100%
rename from static/keyers.mjs
rename to static/scripts/keyers.mjs
diff --git a/static/outputs.mjs b/static/scripts/outputs.mjs
similarity index 98%
rename from static/outputs.mjs
rename to static/scripts/outputs.mjs
index 58427aa..b6f6f4d 100644
--- a/static/outputs.mjs
+++ b/static/scripts/outputs.mjs
@@ -259,8 +259,8 @@ class TelegraphBuzzer extends AudioBuzzer{
 
         this.hum = new Oscillator(140, 0.005, "sawtooth")
 
-        this.closeSample = new Sample("telegraph-a.mp3")
-        this.openSample = new Sample("telegraph-b.mp3")
+        this.closeSample = new Sample("../assets/telegraph-a.mp3")
+        this.openSample = new Sample("../assets/telegraph-b.mp3")
 	}
 
 	async Buzz(tx, when=0) {
diff --git a/static/repeaters.mjs b/static/scripts/repeaters.mjs
similarity index 86%
rename from static/repeaters.mjs
rename to static/scripts/repeaters.mjs
index fbb7a10..fdee0d3 100644
--- a/static/repeaters.mjs
+++ b/static/scripts/repeaters.mjs
@@ -53,12 +53,13 @@ export class Vail {
             "open",
             msg => {
                 this.connected = true
-                this.rx(0, 0, {connected: true})
+                this.rx(0, 0, {connected: true, notice: "Repeater connected"})
             }
         )
 		this.socket.addEventListener(
             "close",
             msg => {
+                this.rx(0, 0, {connected: false, notice: `Repeater disconnected: ${msg.reason}`})
                 console.error("Repeater connection dropped:", msg.reason)
                 setTimeout(() => this.reopen(), 2*Second)
             }
@@ -158,20 +159,20 @@ export class Vail {
 export class Null {
     constructor(rx, interval=3*Second) {
         this.rx = rx
-        this.interval = setInterval(() => this.pulse(), interval)
-        this.pulse()
+        this.init()
     }
 
-    pulse() {
-        this.rx(0, 0, {note: "local", connected: false})
+    notice(msg) {
+        this.rx(0, 0, {connected: false, notice: msg})
     }
 
-    Transmit(time, duration, squelch=true) {
+    init() {
+        this.notice("Null repeater: nobody will hear you.")
     }
 
-    Close() {
-        clearInterval(this.interval)
-    }
+    Transmit(time, duration, squelch=true) {}
+
+    Close() {}
 }
 
 export class Echo extends Null {
@@ -180,6 +181,10 @@ export class Echo extends Null {
         this.delay = delay
     }
 
+    init () {
+        this.notice("Echo repeater: you can only hear yourself.")
+    }
+
     Transmit(time, duration, squelch=true) {
         this.rx(time + this.delay, duration, {note: "local"})
     }
@@ -189,16 +194,19 @@ export class Fortune extends Null {
     /**
      * 
      * @param rx Receive callback
-     * @param {Keyer} keyer Keyer object
+     * @param {Keyer} keyer Robokeyer
      */
     constructor(rx, keyer) {
-        super(rx, 1*Minute)
+        super(rx)
         this.keyer = keyer
-        this.pulse()
+    }
+
+    init() {
+        this.notice("Say something, and I will tell you your fortune.")
     }
 
     pulse() {
-        super.pulse()
+        this.timeout = null
         if (!this.keyer || this.keyer.Busy()) {
             return
         }
@@ -207,6 +215,13 @@ export class Fortune extends Null {
         this.keyer.EnqueueAsciiString(`${fortune} \x04    `)
     }
 
+    Transmit(time, duration, squelch=true) {
+        if (this.timeout) {
+            clearTimeout(this.timeout)
+        }
+        this.timeout = setTimeout(() => this.pulse(), 3 * Second)
+    }
+
     Close() {
         this.keyer.Flush()
         super.Close()
diff --git a/static/robokeyer.mjs b/static/scripts/robokeyer.mjs
similarity index 100%
rename from static/robokeyer.mjs
rename to static/scripts/robokeyer.mjs
diff --git a/static/sw.js b/static/scripts/sw.js
similarity index 100%
rename from static/sw.js
rename to static/scripts/sw.js
diff --git a/static/ui.mjs b/static/scripts/ui.mjs
similarity index 100%
rename from static/ui.mjs
rename to static/scripts/ui.mjs
diff --git a/static/vail.mjs b/static/scripts/vail.mjs
similarity index 99%
rename from static/vail.mjs
rename to static/scripts/vail.mjs
index e407d49..0a7bd75 100644
--- a/static/vail.mjs
+++ b/static/scripts/vail.mjs
@@ -281,7 +281,7 @@ class VailClient {
 			number = Number(numberMatch[0])
 		}
 
-		if (name.startsWith("Fortunesf")) {
+		if (name.startsWith("Fortunes")) {
 			this.roboKeyer.SetPauseMultiplier(number || 1)
 			this.repeater = new Repeaters.Fortune(rx, this.roboKeyer)
 		} else if (name.startsWith("Echo")) {
@@ -291,8 +291,6 @@ class VailClient {
 		} else {
 			this.repeater = new Repeaters.Vail(rx, name)
 		}
-
-		toast(`Now using repeater: ${name}`)
 	}
 
 	/**
@@ -371,6 +369,10 @@ class VailClient {
 			this.rxDurations.splice(20, 2)
 		}
 
+		if (stats.notice) {
+			toast(stats.notice)
+		}
+
 		let averageLag = (stats.averageLag || 0).toFixed(2)
 		let longestRxDuration = this.rxDurations.reduce((a,b) => Math.max(a,b))
 		let suggestedDelay = ((averageLag + longestRxDuration) * 1.2).toFixed(0)
