diff --git a/_layouts/default.html b/_layouts/default.html
index e7455ad..66c8247 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -15,7 +15,12 @@
   <link rel="shortcut icon" href="/favicon.png">
   <link rel="alternate" type="application/rss+xml" title="{{ site.theme.name }}" href="{{site.url}}/atom.xml" />
 
-  <link rel="stylesheet" href="/assets/css/all.css">
+  <link rel="stylesheet" href="/css/font-awesome.css">
+  <link rel="stylesheet" href="/css/base.css">
+  <link rel="stylesheet" href="/css/skeleton.css">
+  <link rel="stylesheet" href="/css/screen.css">
+  <link rel="stylesheet" href="/css/layout.css">
+  <link rel="stylesheet" href="/css/peaksea.css">
 <!--[if IE 7]>
   <link rel="stylesheet" href="/assets/css/font-awesome-ie7.min.css">
 <![endif]-->
@@ -37,4 +42,4 @@
 
 {% include analytics.html %}
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/assets/css/all.css b/assets/css/all.css
deleted file mode 100644
index 20b89db..0000000
--- a/assets/css/all.css
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: nil
----
-
-{% include css/font-awesome.css %}
-{% include css/base.css %}
-{% include css/skeleton.css %}
-{% include css/screen.css %}
-{% include css/layout.css %}
-{% include css/peaksea.css %}
diff --git a/_includes/css/base.css b/css/base.css
similarity index 100%
rename from _includes/css/base.css
rename to css/base.css
diff --git a/assets/css/font-awesome-ie7.min.css b/css/font-awesome-ie7.min.css
similarity index 100%
rename from assets/css/font-awesome-ie7.min.css
rename to css/font-awesome-ie7.min.css
diff --git a/_includes/css/font-awesome.css b/css/font-awesome.css
similarity index 100%
rename from _includes/css/font-awesome.css
rename to css/font-awesome.css
diff --git a/_includes/css/layout.css b/css/layout.css
similarity index 100%
rename from _includes/css/layout.css
rename to css/layout.css
diff --git a/_includes/css/peaksea.css b/css/peaksea.css
similarity index 100%
rename from _includes/css/peaksea.css
rename to css/peaksea.css
diff --git a/_includes/css/screen.css b/css/screen.css
similarity index 100%
rename from _includes/css/screen.css
rename to css/screen.css
diff --git a/_includes/css/skeleton.css b/css/skeleton.css
similarity index 100%
rename from _includes/css/skeleton.css
rename to css/skeleton.css
diff --git a/assets/font/FontAwesome.otf b/font/FontAwesome.otf
similarity index 100%
rename from assets/font/FontAwesome.otf
rename to font/FontAwesome.otf
diff --git a/assets/font/fontawesome-webfont.eot b/font/fontawesome-webfont.eot
similarity index 100%
rename from assets/font/fontawesome-webfont.eot
rename to font/fontawesome-webfont.eot
diff --git a/assets/font/fontawesome-webfont.svg b/font/fontawesome-webfont.svg
similarity index 100%
rename from assets/font/fontawesome-webfont.svg
rename to font/fontawesome-webfont.svg
diff --git a/assets/font/fontawesome-webfont.ttf b/font/fontawesome-webfont.ttf
similarity index 100%
rename from assets/font/fontawesome-webfont.ttf
rename to font/fontawesome-webfont.ttf
diff --git a/assets/font/fontawesome-webfont.woff b/font/fontawesome-webfont.woff
similarity index 100%
rename from assets/font/fontawesome-webfont.woff
rename to font/fontawesome-webfont.woff