diff --git a/bin/install-category b/bin/install-category
index f9706a2..56e072c 100755
--- a/bin/install-category
+++ b/bin/install-category
@@ -27,7 +27,7 @@ template () {
 	<head>
 		<meta charset="UTF-8">
 		<title>$cat $points</title>
-		<link rel="stylesheet" href="/../../css/style.css" type="text/css">
+		<link rel="stylesheet" href="../../style.css">
 	</head>
 	<body>
 		<h1>$cat for $points points</h1>
diff --git a/bin/puzzles b/bin/puzzles
index abd2610..5e05d80 100755
--- a/bin/puzzles
+++ b/bin/puzzles
@@ -1,6 +1,6 @@
 #! /usr/bin/lua
 
-package.path = "cgi/?.lua"
+package.path = "www/?.lua"
 local koth = require "koth"
 
 local max_by_cat = {}
diff --git a/cgi/cgi.lua b/html/cgi.lua
similarity index 100%
rename from cgi/cgi.lua
rename to html/cgi.lua
diff --git a/html/credits.html b/html/credits.html
index c0484e2..3c27eb9 100644
--- a/html/credits.html
+++ b/html/credits.html
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<title>The Credits</title>
-		<link rel="stylesheet" href="css/style.css" type="text/css">
+		<link rel="stylesheet" href="style.css" type="text/css">
 		<script>
 function shuf (ul) {
 	var lists = document.getElementsByClassName("shuf");
diff --git a/html/index.html b/html/index.html
index 40a3fff..3b9e1eb 100644
--- a/html/index.html
+++ b/html/index.html
@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="UTF-8">
 		<title>Welcome</title>
-		<link rel="stylesheet" href="css/style.css" type="text/css">
+		<link rel="stylesheet" href="style.css" type="text/css">
 	</head>
 	<body>
 		<h1>Tracer FIRE</h1>
diff --git a/cgi/koth.lua b/html/koth.lua
similarity index 79%
rename from cgi/koth.lua
rename to html/koth.lua
index ded0124..9360bd6 100644
--- a/cgi/koth.lua
+++ b/html/koth.lua
@@ -27,16 +27,24 @@ function koth.anchored_search(haystack, needle, anchor)
 end
 
 function koth.page(title, body)
-	print("Content-type: text/html")
-	print()
+	if (os.getenv("REQUEST_METHOD")) then
+		print("Content-type: text/html")
+		print()
+	end
 	print("<!DOCTYPE html>")
-	print("<html><head><title>" .. title .. "</title><link rel=\"stylesheet\" href=\"css/style.css\"></head>")
+	print("<html><head><title>" .. title .. "</title><link rel=\"stylesheet\" href=\"style.css\"></head>")
 	print("<body><h1>" .. title .. "</h1>")
 	if (body) then
 		print("<section>")
 		print(body)
 		print("</section>")
 	end
+	print([[<section id="sponsors">
+			<img src="images/lanl.png" alt="Los Alamos National Laboratory">
+			<img src="images/doe.png" alt="US Department Of Energy">
+			<img src="images/sandia.png" alt="Sandia National Laboratories">
+		</section>]])
+
 	print("</body></html>")
 	os.exit(0)
 end
diff --git a/cgi/puzzler.cgi b/html/puzzler.cgi
similarity index 100%
rename from cgi/puzzler.cgi
rename to html/puzzler.cgi
diff --git a/html/register.html b/html/register.html
index ebbc2c8..50f35fb 100644
--- a/html/register.html
+++ b/html/register.html
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<title>Team Registration</title>
-		<link rel="stylesheet" href="css/style.css" type="text/css">
+		<link rel="stylesheet" href="style.css" type="text/css">
 	</head>
 	<body>
 		<h1>Team Registration</h1>
diff --git a/html/scoreboard.html b/html/scoreboard.html
index d284ad2..a37fa7b 100644
--- a/html/scoreboard.html
+++ b/html/scoreboard.html
@@ -2,8 +2,8 @@
 <html>
 	<head>
 		<title>Scoreboard</title>
-		<link rel="stylesheet" href="css/style.css" type="text/css">
-		<script src="js/scoreboard.js" async></script>
+		<link rel="stylesheet" href="style.css" type="text/css">
+		<script src="scoreboard.js" async></script>
 		<script>
 function init() {
 	var sb = document.getElementById("scoreboard");
diff --git a/html/js/scoreboard.js b/html/scoreboard.js
similarity index 100%
rename from html/js/scoreboard.js
rename to html/scoreboard.js
diff --git a/html/scoring.html b/html/scoring.html
index ff0cf76..74fedb3 100644
--- a/html/scoring.html
+++ b/html/scoring.html
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<title>About scoring</title>
-		<link rel="stylesheet" href="css/style.css" type="text/css">
+		<link rel="stylesheet" href="style.css" type="text/css">
 		<meta charset="utf-8">
 	</head>
 	<body>
diff --git a/html/css/style.css b/html/style.css
similarity index 96%
rename from html/css/style.css
rename to html/style.css
index 049fe49..856de66 100644
--- a/html/css/style.css
+++ b/html/style.css
@@ -6,10 +6,10 @@ Light brown: #432115
 Tan: #e1caa5
 */
 
-@import "../fonts/maven_pro.css";
+@import "fonts/maven_pro.css";
 
 html {
-	background: #35170c url(../images/brown-circles.jpg) repeat left bottom;
+	background: #35170c url(images/brown-circles.jpg) repeat left bottom;
 	min-height: 100%;
 	font-family: "Maven Pro", Ubuntu, sans-serif;
 	overflow-y: scroll;
diff --git a/html/js/terminal.js b/html/terminal.js
similarity index 100%
rename from html/js/terminal.js
rename to html/terminal.js
diff --git a/install b/install
index cd8e600..307c7ca 100755
--- a/install
+++ b/install
@@ -77,9 +77,6 @@ git ls-files | while read fn; do
 	bin/*)
 		copy $fn
 		;;
-	cgi/*)
-		copy $fn
-		;;
 	*)
 		echo "??? $fn"
 		;;
