diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 4e189008..bc65a67e 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -12,16 +12,22 @@ module.exports = (grunt) ->
     path:
       source:
         root: 'source'
-        assets: '<%= path.source.root %>/assets'
+        fonts: '<%= path.source.root %>/fonts'
+        images: '<%= path.source.root %>/images'
         styles: '<%= path.source.root %>/styles'
-        sprites: '<%= path.source.root %>/sprites'
         layouts: '<%= path.source.root %>/layouts'
+        scripts: '<%= path.source.root %>/scripts'
+        sprites: '<%= path.source.root %>/sprites'
         boilerplates: '<%= path.source.root %>/boilerplates'
 
       build:
         root: 'build'
         assets: '<%= path.build.root %>/assets'
-        styles: '<%= path.build.root %>/styles'
+        fonts: '<%= path.build.assets %>/fonts'
+        images: '<%= path.build.assets %>/images'
+        styles: '<%= path.build.assets %>/styles'
+        scripts: '<%= path.build.assets %>/scripts'
+        sprites: '<%= path.build.assets %>/sprites'
 
     # Specify files
     file:
@@ -34,6 +40,7 @@ module.exports = (grunt) ->
           prefixed: '<%= path.build.styles %>/style.prefixed.css'
           tidy: '<%= path.build.styles %>/style.tidy.css'
           min: '<%= path.build.styles %>/style.min.css'
+        sprite: '<%= path.build.sprites %>/sprite.png'
 
   grunt.loadTasks 'tasks'
 
diff --git a/package.json b/package.json
index 7f2be2b5..634a365f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Kotsu",
-	"version": "0.3.5",
+	"version": "0.4.0",
 	"title": "Clean, opinionated foundation for new projects — to boldly go where no man has gone before",
 	"author": "LotusTM",
 	"private": true,
diff --git a/source/assets/.gitkeep b/source/images/.gitkeep
similarity index 100%
rename from source/assets/.gitkeep
rename to source/images/.gitkeep
diff --git a/source/layouts/_layout.nj b/source/layouts/_layout.nj
index b3c9c10b..bb784fe1 100644
--- a/source/layouts/_layout.nj
+++ b/source/layouts/_layout.nj
@@ -29,8 +29,8 @@
 	<!-- <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700&amp;subset=latin,cyrillic"> -->
 
 	<!-- CSS -->
-	<!-- build:[href] /styles/style.min.css -->
-	<link rel="stylesheet" href="/styles/style.prefixed.css">
+	<!-- build:[href] /assets/styles/style.min.css -->
+	<link rel="stylesheet" href="/assets/styles/style.prefixed.css">
 	<!-- /build -->
 
 	<!-- Sitemap -->
diff --git a/tasks/grunt-contrib-copy.coffee b/tasks/grunt-contrib-copy.coffee
index 9a3f36e1..127a0c68 100644
--- a/tasks/grunt-contrib-copy.coffee
+++ b/tasks/grunt-contrib-copy.coffee
@@ -13,7 +13,12 @@ module.exports = ->
           dest: '<%= path.build.root %>/'
         ,
           expand: true
-          cwd: '<%= path.source.assets %>/'
+          cwd: '<%= path.source.images %>/'
           src: ['**']
-          dest: '<%= path.build.assets %>/'
+          dest: '<%= path.build.images %>/'
+        ,
+          expand: true
+          cwd: '<%= path.source.fonts %>/'
+          src: ['**']
+          dest: '<%= path.build.fonts %>/'
       ]
\ No newline at end of file
diff --git a/tasks/grunt-spritesmith.coffee b/tasks/grunt-spritesmith.coffee
index d813ef32..97c82080 100644
--- a/tasks/grunt-spritesmith.coffee
+++ b/tasks/grunt-spritesmith.coffee
@@ -7,7 +7,7 @@ module.exports = ->
   @config 'sprite',
     build:
       src: ['<%= path.source.sprites %>/{,**/}*.png']
-      destImg: '<%= path.build.assets %>/images/sprites.png'
+      destImg: '<%= file.build.sprite %>'
       destCSS: '<%= path.source.styles %>/generic/_sprites.map.scss'
       padding: 2
       engine: 'pngsmith'