diff --git a/.gitignore b/.gitignore
index 011688b..b1b8942 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 .sass-cache
-assets/css
-assets/js/*.min.js
+src/delightful-downloads/assets/css
+src/delightful-downloads/assets/js/*.min.js
 builds
 languages
 node_modules
diff --git a/Gruntfile.js b/Gruntfile.js
index 5e5a568..4bcb270 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,25 +6,36 @@ module.exports = function( grunt ) {
 		compass: {
 			dist: {
 				options: {
-					cssDir: 'assets/css',
-					sassDir: 'assets/sass',
-					outputStyle: 'compressed'
+					cssDir: 'src/delightful-downloads/assets/css',
+					sassDir: 'src/delightful-downloads/assets/sass',
+					environment: 'development'
 				}
 			}
 		},
+		cssmin: {
+			target: {
+				files: [{
+					expand: true,
+					cwd: 'src/delightful-downloads/assets/css',
+					src: [ '*.css', '!*.min.css' ],
+					dest: 'src/delightful-downloads/assets/css',
+					ext: '.min.css'
+				}]
+			}
+		},
 		uglify: {
 			files: {
 				expand: true,
-				cwd: 'assets/js',
+				cwd: 'src/delightful-downloads/assets/js',
 				src: [ '*.js', '!*.min.js' ],
-				dest: 'assets/js',
+				dest: 'src/delightful-downloads/assets/js',
 				ext: '.min.js'
 			}
 		},
 		pot: {
 			options: {
 				text_domain: 'delightful-downloads',
-				dest: 'languages/delightful-downloads.pot',
+				dest: 'src/delightful-downloads/languages/delightful-downloads.pot',
 				keywords: [
 					'gettext',
 					'__',
@@ -51,12 +62,12 @@ module.exports = function( grunt ) {
 			},
 			files: {
 				expand: true,
-				src: [ '**/*.php', '!node_modules/**/*.php' ]
+				src: [ 'src/delightful-downloads/**/*.php' ]
 			}
 		},
 		po2mo: {
 			files: {
-				src: 'languages/*.po',
+				src: 'src/delightful-downloads/languages/*.po',
 				expand: true
 			}
 
@@ -69,14 +80,18 @@ module.exports = function( grunt ) {
 				command: 'tx push -s'
 			}
 		},
-		clean: ['languages/*.po'],
+		clean: ['src/delightful-downloads/languages/*.po'],
 		watch: {
 			sass: {
-				files: [ 'assets/sass/*' ],
+				files: [ 'src/delightful-downloads/assets/sass/*' ],
 				tasks: [ 'compass' ]
 			},
+			css: {
+				files: [ 'src/delightful-downloads/assets/css/*', '!src/delightful-downloads/assets/css/*.min.css' ],
+				tasks: [ 'cssmin' ]
+			},
 			js: {
-				files: [ 'assets/js/*.js', '!assets/js/*.min.js' ],
+				files: [ 'src/delightful-downloads/assets/js/*.js', '!src/delightful-downloads/assets/js/*.min.js' ],
 				tasks: [ 'uglify' ]
 			}
 		}
@@ -86,7 +101,7 @@ module.exports = function( grunt ) {
 	require( 'load-grunt-tasks' )( grunt );
 
 	// Default task(s).
-	grunt.registerTask( 'default', [ 'compass', 'uglify' ] );
+	grunt.registerTask( 'default', [ 'compass', 'cssmin', 'uglify' ] );
 	grunt.registerTask( 'translate', [ 'pot', 'shell:txPush', 'shell:txPull', 'po2mo', 'clean' ] );
 
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index 8d7d778..13a02cc 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.7.0",
     "grunt-contrib-compass": "^1.0.3",
+    "grunt-contrib-cssmin": "^0.14.0",
     "grunt-contrib-uglify": "^0.9.1",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-po2mo": "^0.1.2",
@@ -12,4 +13,4 @@
     "grunt-shell": "^1.1.2",
     "load-grunt-tasks": "^3.2.0"
   }
-}
+}
\ No newline at end of file