diff --git a/web/chat_style.css b/web/css/chat_style.css
similarity index 100%
rename from web/chat_style.css
rename to web/css/chat_style.css
diff --git a/web/dynmap_style.css b/web/css/dynmap_style.css
similarity index 100%
rename from web/dynmap_style.css
rename to web/css/dynmap_style.css
diff --git a/web/embedded_example.css b/web/css/embedded_example.css
similarity index 100%
rename from web/embedded_example.css
rename to web/css/embedded_example.css
diff --git a/web/override_example.css b/web/css/override_example.css
similarity index 100%
rename from web/override_example.css
rename to web/css/override_example.css
diff --git a/web/standalone.css b/web/css/standalone.css
similarity index 100%
rename from web/standalone.css
rename to web/css/standalone.css
diff --git a/web/index.html b/web/index.html
index 6fa6557f..9c557d85 100644
--- a/web/index.html
+++ b/web/index.html
@@ -10,22 +10,22 @@
 	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
 	<link rel="icon" href="images/dynmap.ico" type="image/ico" />
 
-	<!--<link rel="stylesheet" type="text/css" href="/map/embedded.css" media="screen" />-->
-	<link rel="stylesheet" type="text/css" href="standalone.css" media="screen" />
-	<link rel="stylesheet" type="text/css" href="dynmap_style.css" media="screen" />
-	<!-- <link rel="stylesheet" type="text/css" href="override.css" media="screen" /> -->
+	<!--<link rel="stylesheet" type="text/css" href="css/embedded.css" media="screen" />-->
+	<link rel="stylesheet" type="text/css" href="css/standalone.css" media="screen" />
+	<link rel="stylesheet" type="text/css" href="css/dynmap_style.css" media="screen" />
+	<!-- <link rel="stylesheet" type="text/css" href="css/override.css" media="screen" /> -->
 
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
-	<script type="text/javascript" src="jquery.json.js"></script>
+	<script type="text/javascript" src="js/jquery.json.js"></script>
 	<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-	<script type="text/javascript" src="custommarker.js"></script>
-	<script type="text/javascript" src="minecraft.js"></script>
-	<script type="text/javascript" src="map.js"></script>
-	<script type="text/javascript" src="kzedmaps.js"></script>
-	<script type="text/javascript" src="flatmap.js"></script>
-	<script type="text/javascript" src="clock.timeofday.js"></script>
-	<script type="text/javascript" src="clock.digital.js"></script>
-	<script type="text/javascript" src="chat.js"></script>
+	<script type="text/javascript" src="js/custommarker.js"></script>
+	<script type="text/javascript" src="js/minecraft.js"></script>
+	<script type="text/javascript" src="js/map.js"></script>
+	<script type="text/javascript" src="js/kzedmaps.js"></script>
+	<script type="text/javascript" src="js/flatmap.js"></script>
+	<script type="text/javascript" src="js/clock.timeofday.js"></script>
+	<script type="text/javascript" src="js/clock.digital.js"></script>
+	<script type="text/javascript" src="js/chat.js"></script>
 	<script type="text/javascript" src="config.js"></script>
 
 	<script type="text/javascript">
diff --git a/web/chat.js b/web/js/chat.js
similarity index 100%
rename from web/chat.js
rename to web/js/chat.js
diff --git a/web/clock.digital.js b/web/js/clock.digital.js
similarity index 100%
rename from web/clock.digital.js
rename to web/js/clock.digital.js
diff --git a/web/clock.timeofday.js b/web/js/clock.timeofday.js
similarity index 100%
rename from web/clock.timeofday.js
rename to web/js/clock.timeofday.js
diff --git a/web/custommarker.js b/web/js/custommarker.js
similarity index 100%
rename from web/custommarker.js
rename to web/js/custommarker.js
diff --git a/web/flatmap.js b/web/js/flatmap.js
similarity index 100%
rename from web/flatmap.js
rename to web/js/flatmap.js
diff --git a/web/jquery-1.4.4.min.js b/web/js/jquery-1.4.4.min.js
similarity index 100%
rename from web/jquery-1.4.4.min.js
rename to web/js/jquery-1.4.4.min.js
diff --git a/web/jquery.json.js b/web/js/jquery.json.js
similarity index 100%
rename from web/jquery.json.js
rename to web/js/jquery.json.js
diff --git a/web/kzedmaps.js b/web/js/kzedmaps.js
similarity index 100%
rename from web/kzedmaps.js
rename to web/js/kzedmaps.js
diff --git a/web/map.js b/web/js/map.js
similarity index 100%
rename from web/map.js
rename to web/js/map.js
diff --git a/web/minecraft.js b/web/js/minecraft.js
similarity index 100%
rename from web/minecraft.js
rename to web/js/minecraft.js