diff --git a/_includes/footer.html b/_includes/footer.html
index 33a40d0..0cbe58b 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -16,7 +16,7 @@
     </div> <!-- /container -->
 
     {% if page.layout == "license" or page.class == "license-types" %}
-    <script src="/javascripts/javascript.js"></script>
+    <script src="/js/javascript.js"></script>
     {% endif %}
 
     <script>
diff --git a/_includes/header.html b/_includes/header.html
index cb51235..43fcd71 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -11,9 +11,9 @@
     <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon">
     <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Chivo:900">
     <link rel="stylesheet" href="/css/application.css" media="screen">
-    <script src="/javascripts/modernizr.js"></script>
+    <script src="/js/modernizr.js"></script>
     <!--[if (gte IE 6)&(lte IE 8)]>
-      <script src="/javascripts/selectivizr-min.js"></script>
+      <script src="/js/selectivizr-min.js"></script>
     <![endif]-->
 
   </head>
diff --git a/_includes/js/app.coffee b/_includes/js/app.coffee
index 218cef4..2cad4fa 100644
--- a/_includes/js/app.coffee
+++ b/_includes/js/app.coffee
@@ -66,7 +66,7 @@ class Choosealicense
 
     # Hook up copy to clipboard buttons
     clip = new ZeroClipboard $(".js-clipboard-button"),
-      moviePath: "/javascripts/ZeroClipboard.swf"
+      moviePath: "/js/ZeroClipboard.swf"
     clip.on "mouseout", @clipboardMouseout
     clip.on "complete", @clipboardComplete
     clip
diff --git a/_includes/js/app.js b/_includes/js/app.js
index aac1b3e..c449e85 100644
--- a/_includes/js/app.js
+++ b/_includes/js/app.js
@@ -75,7 +75,7 @@
       var clip;
       $(".js-clipboard-button").data("clipboard-prompt", $(".js-clipboard-button").text());
       clip = new ZeroClipboard($(".js-clipboard-button"), {
-        moviePath: "/javascripts/ZeroClipboard.swf"
+        moviePath: "/js/ZeroClipboard.swf"
       });
       clip.on("mouseout", this.clipboardMouseout);
       clip.on("complete", this.clipboardComplete);
diff --git a/css/application.css b/css/application.css
index fa91cd8..c90a694 100644
--- a/css/application.css
+++ b/css/application.css
@@ -6,7 +6,7 @@ layout: nil
 {% include css/jquery.qtip.min.css %}
 
 body {
-  background: #f5f1ec url(../images/bg.jpg);
+  background: #f5f1ec url(../img/bg.jpg);
   color: #5c5855;
   font: 14px/1.4 "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
@@ -265,15 +265,15 @@ strong {
 }
 
 .license-required li {
-  background-image: url(../images/blue-dot@2x.png);
+  background-image: url(../img/blue-dot@2x.png);
 }
 
 .license-permitted li {
-  background-image: url(../images/green-dot@2x.png);
+  background-image: url(../img/green-dot@2x.png);
 }
 
 .license-forbidden li {
-  background-image: url(../images/red-dot@2x.png);
+  background-image: url(../img/red-dot@2x.png);
 }
 
 .license-rules-sidebar li {
@@ -336,7 +336,7 @@ strong {
 
 .sidebar .source a {
   padding-left: 20px;
-  background: transparent url(../images/source@2x.png) 0 1px no-repeat;
+  background: transparent url(../img/source@2x.png) 0 1px no-repeat;
   background-size: 16px 12px;
 }
 
diff --git a/images/bg.jpg b/img/bg.jpg
similarity index 100%
rename from images/bg.jpg
rename to img/bg.jpg
diff --git a/images/blue-dot@2x.png b/img/blue-dot@2x.png
similarity index 100%
rename from images/blue-dot@2x.png
rename to img/blue-dot@2x.png
diff --git a/images/circular@2x.png b/img/circular@2x.png
similarity index 100%
rename from images/circular@2x.png
rename to img/circular@2x.png
diff --git a/images/green-dot@2x.png b/img/green-dot@2x.png
similarity index 100%
rename from images/green-dot@2x.png
rename to img/green-dot@2x.png
diff --git a/images/lightbulb@2x.png b/img/lightbulb@2x.png
similarity index 100%
rename from images/lightbulb@2x.png
rename to img/lightbulb@2x.png
diff --git a/images/red-dot@2x.png b/img/red-dot@2x.png
similarity index 100%
rename from images/red-dot@2x.png
rename to img/red-dot@2x.png
diff --git a/images/source@2x.png b/img/source@2x.png
similarity index 100%
rename from images/source@2x.png
rename to img/source@2x.png
diff --git a/images/three-arrows@2x.png b/img/three-arrows@2x.png
similarity index 100%
rename from images/three-arrows@2x.png
rename to img/three-arrows@2x.png
diff --git a/index.html b/index.html
index 6cbcc7d..185eed7 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,7 @@ description: A site to provide non-judgmental guidance on choosing a license for
 <ul class="triptych situations clearfix">
   <li class="whatever">
     <a href="licenses/mit">
-      <img src="images/three-arrows@2x.png" alt="three arrows" width="72" height="57">
+      <img src="img/three-arrows@2x.png" alt="three arrows" width="72" height="57">
       <h3>I want it simple and permissive.</h3>
     </a>
     <p>
@@ -26,7 +26,7 @@ description: A site to provide non-judgmental guidance on choosing a license for
   </li>
   <li class="patents">
     <a href="licenses/apache">
-      <img src="images/lightbulb@2x.png" alt="light bulb" width="43" height="72">
+      <img src="img/lightbulb@2x.png" alt="light bulb" width="43" height="72">
       <h3>I’m concerned about patents.</h3>
     </a>
     <p>
@@ -38,7 +38,7 @@ description: A site to provide non-judgmental guidance on choosing a license for
   </li>
   <li class="copyleft">
     <a href="licenses/gpl-v2">
-      <img src="images/circular@2x.png" alt="circular arrows" width="72" height="69">
+      <img src="img/circular@2x.png" alt="circular arrows" width="72" height="69">
       <h3>I care about sharing improvements.</h3>
     </a>
     <p>
diff --git a/javascripts/ZeroClipboard.swf b/js/ZeroClipboard.swf
similarity index 100%
rename from javascripts/ZeroClipboard.swf
rename to js/ZeroClipboard.swf
diff --git a/javascripts/javascript.js b/js/javascript.js
similarity index 100%
rename from javascripts/javascript.js
rename to js/javascript.js
diff --git a/javascripts/modernizr.js b/js/modernizr.js
similarity index 100%
rename from javascripts/modernizr.js
rename to js/modernizr.js
diff --git a/javascripts/selectivizr-min.js b/js/selectivizr-min.js
similarity index 100%
rename from javascripts/selectivizr-min.js
rename to js/selectivizr-min.js