diff --git a/.npmignore b/.npmignore
index 1adf861c..176a4aaa 100644
--- a/.npmignore
+++ b/.npmignore
@@ -3,6 +3,7 @@
 /out/
 /src/
 /test/
+/release/dev/
 /gulpfile.js
 /tsconfig.json
 /.npmignore
diff --git a/gulpfile.js b/gulpfile.js
index 8714e086..5ba0e593 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -58,13 +58,10 @@ gulp.task('release', ['clean-release','compile'], function() {
 
 	return merge(
 		merge(
-			bundleOne('monaco.contribution', ['vs/language/css/mode']),
-			bundleOne('mode'),
-			bundleOne('worker')
+			bundleOne('monaco.contribution', ['vs/language/css/cssMode']),
+			bundleOne('cssMode'),
+			bundleOne('cssWorker')
 		)
-	//	.pipe(uglify({
-	//		preserveComments: 'some'
-	//	}))
 		.pipe(es.through(function(data) {
 			data.contents = new Buffer(
 				BUNDLED_FILE_HEADER
@@ -72,9 +69,12 @@ gulp.task('release', ['clean-release','compile'], function() {
 			);
 			this.emit('data', data);
 		}))
-		.pipe(gulp.dest('./release/')),
-
-		gulp.src('src/monaco.d.ts').pipe(gulp.dest('./release/'))
+		.pipe(gulp.dest('./release/dev'))
+		.pipe(uglify({
+			preserveComments: 'some'
+		}))
+		.pipe(gulp.dest('./release/min')),
+		gulp.src('src/monaco.d.ts').pipe(gulp.dest('./release/min'))
 	);
 });
 
diff --git a/src/mode.ts b/src/cssMode.ts
similarity index 96%
rename from src/mode.ts
rename to src/cssMode.ts
index 08da000a..724f511e 100644
--- a/src/mode.ts
+++ b/src/cssMode.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import {WorkerManager} from './workerManager';
-import {CSSWorker} from './worker';
+import {CSSWorker} from './cssWorker';
 import {LanguageServiceDefaultsImpl} from './monaco.contribution';
 import * as languageFeatures from './languageFeatures';
 
diff --git a/src/worker.ts b/src/cssWorker.ts
similarity index 100%
rename from src/worker.ts
rename to src/cssWorker.ts
diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
index f1f297a1..8d20dab9 100644
--- a/src/languageFeatures.ts
+++ b/src/languageFeatures.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import {LanguageServiceDefaultsImpl} from './monaco.contribution';
-import {CSSWorker} from './worker';
+import {CSSWorker} from './cssWorker';
 
 import * as ls from 'vscode-languageserver-types';
 
diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts
index 950ace93..3cac0b1f 100644
--- a/src/monaco.contribution.ts
+++ b/src/monaco.contribution.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as mode from './mode';
+import * as mode from './cssMode';
 
 import Emitter = monaco.Emitter;
 import IEvent = monaco.IEvent;
@@ -85,7 +85,7 @@ monaco.languages.css = createAPI();
 // --- Registration to monaco editor ---
 
 function withMode(callback:(module:typeof mode)=>void): void {
-	require<typeof mode>(['vs/language/css/mode'], callback);
+	require<typeof mode>(['vs/language/css/cssMode'], callback);
 }
 
 monaco.languages.register({
diff --git a/src/workerManager.ts b/src/workerManager.ts
index 12141dbf..3638a7cb 100644
--- a/src/workerManager.ts
+++ b/src/workerManager.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import {LanguageServiceDefaultsImpl} from './monaco.contribution';
-import {CSSWorker} from './worker';
+import {CSSWorker} from './cssWorker';
 
 import Promise = monaco.Promise;
 import IDisposable = monaco.IDisposable;
@@ -62,7 +62,7 @@ export class WorkerManager {
 			this._worker = monaco.editor.createWebWorker<CSSWorker>({
 
 				// module that exports the create() method and returns a `CSSWorker` instance
-				moduleId: 'vs/language/css/worker',
+				moduleId: 'vs/language/css/cssWorker',
 
 				// passed in to the create() method
 				createData: {