diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
index 29cfd0b2fdc4bf1e3c7b9f67c9eea28520a787ca..54208ee9e4c3157e93ca9f0fdbb8dc5b7092978b 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
@@ -30,15 +30,17 @@ export class NsfwWatcherService implements IWatcherService {
 
 		return new TPromise<void>((c, e, p) => {
 			nsfw(request.basePath, events => {
-				if (request.verboseLogging) {
-					console.log('raw events start');
-					events.forEach(e => console.log(e));
-					console.log('raw events end');
-				}
-
 				for (let i = 0; i < events.length; i++) {
-					let absolutePath: string;
 					const e = events[i];
+
+					// Logging
+					if (request.verboseLogging) {
+						const logPath = e.action === nsfw.actions.RENAMED ? path.join(e.directory, e.oldFile) + ' -> ' + e.newFile : path.join(e.directory, e.file);
+						console.log(e.action === nsfw.actions.CREATED ? '[CREATED]' : e.action === nsfw.actions.DELETED ? '[DELETED]' : e.action === nsfw.actions.MODIFIED ? '[CHANGED]' : '[RENAMED]', logPath);
+					}
+
+					// Convert nsfw event to IRawFileChange and add to queue
+					let absolutePath: string;
 					if (e.action === nsfw.actions.RENAMED) {
 						// Rename fires when a file's name changes within a single directory
 						absolutePath = path.join(e.directory, e.oldFile);
diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
index 985f1e2281e5e26070c4243cea1f2f8ca862ec07..938b8ab2d603d3a00a62b36d889ccb87ccb82de4 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
@@ -12,9 +12,8 @@ import uri from 'vs/base/common/uri';
 import { toFileChangesEvent, IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 import { IWatcherChannel, WatcherChannelClient } from 'vs/workbench/services/files/node/watcher/unix/watcherIpc';
 import { FileChangesEvent } from 'vs/platform/files/common/files';
-import { IFileWatcher } from "vs/workbench/services/files/node/watcher/unix/watcher";
 
-export class FileWatcher implements IFileWatcher {
+export class FileWatcher {
 	private static MAX_RESTARTS = 5;
 
 	private isDisposed: boolean;