diff --git a/lib/server/commands/Mkcol.js b/lib/server/commands/Mkcol.js
index f7cd7681..68266cda 100644
--- a/lib/server/commands/Mkcol.js
+++ b/lib/server/commands/Mkcol.js
@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var WebDAVRequest_1 = require("../WebDAVRequest");
-var Resource_1 = require("../../resource/Resource");
+var IResource_1 = require("../../resource/IResource");
 var path = require("path");
 function default_1(arg, callback) {
     arg.server.getResourceFromPath(arg.path.getParent(), function (e, r) {
@@ -15,7 +15,7 @@ function default_1(arg, callback) {
             callback();
             return;
         }
-        var resource = r.fsManager.newResource(arg.uri, path.basename(arg.uri), Resource_1.ResourceType.Directory, r);
+        var resource = r.fsManager.newResource(arg.uri, path.basename(arg.uri), IResource_1.ResourceType.Directory, r);
         resource.create(function (e) {
             if (e) {
                 arg.setCode(WebDAVRequest_1.HTTPCodes.InternalServerError);
diff --git a/lib/server/commands/Propfind.js b/lib/server/commands/Propfind.js
index 765e1a8b..c8031581 100644
--- a/lib/server/commands/Propfind.js
+++ b/lib/server/commands/Propfind.js
@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var WebDAVRequest_1 = require("../WebDAVRequest");
-var Resource_1 = require("../../resource/Resource");
+var IResource_1 = require("../../resource/IResource");
 var XML_1 = require("../../helper/XML");
 function default_1(arg, callback) {
     arg.getResource(function (e, resource) {
@@ -119,7 +119,7 @@ function default_1(arg, callback) {
             });
             resource.lastModifiedDate(function (e, lastModifiedDate) {
                 if (!e) {
-                    prop.ele('D:getetag').add(Resource_1.ETag.createETag(lastModifiedDate));
+                    prop.ele('D:getetag').add(IResource_1.ETag.createETag(lastModifiedDate));
                     prop.ele('D:getlastmodified').add(new Date(lastModifiedDate).toUTCString());
                 }
                 nbOut(e);
diff --git a/lib/server/commands/Put.js b/lib/server/commands/Put.js
index cf0ac0c9..c6b865b6 100644
--- a/lib/server/commands/Put.js
+++ b/lib/server/commands/Put.js
@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var WebDAVRequest_1 = require("../WebDAVRequest");
-var Resource_1 = require("../../resource/Resource");
+var IResource_1 = require("../../resource/IResource");
 var path = require("path");
 function createResource(arg, callback, validCallback) {
     arg.server.getResourceFromPath(arg.path.getParent(), function (e, r) {
@@ -16,7 +16,7 @@ function createResource(arg, callback, validCallback) {
             return;
         }
         arg.requirePrivilege(['canAddChild'], r, function () {
-            var resource = r.fsManager.newResource(arg.uri, path.basename(arg.uri), Resource_1.ResourceType.File, r);
+            var resource = r.fsManager.newResource(arg.uri, path.basename(arg.uri), IResource_1.ResourceType.File, r);
             arg.requirePrivilege(['canCreate', 'canWrite'], resource, function () {
                 resource.create(function (e) {
                     if (e) {
diff --git a/src/server/commands/Copy.ts b/src/server/commands/Copy.ts
index 7b69cf16..d71c490d 100644
--- a/src/server/commands/Copy.ts
+++ b/src/server/commands/Copy.ts
@@ -1,5 +1,5 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
-import { IResource, ResourceType, SimpleCallback } from '../../resource/Resource'
+import { IResource, ResourceType, SimpleCallback } from '../../resource/IResource'
 import { FSPath } from '../../manager/FSManager'
 
 function copyAllProperties(source : IResource, destination : IResource, callback : SimpleCallback)
diff --git a/src/server/commands/Delete.ts b/src/server/commands/Delete.ts
index 6f3136e8..70fa983f 100644
--- a/src/server/commands/Delete.ts
+++ b/src/server/commands/Delete.ts
@@ -1,5 +1,5 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
-import { IResource } from '../../resource/Resource'
+import { IResource } from '../../resource/IResource'
 
 export default function(arg : MethodCallArgs, callback)
 {
diff --git a/src/server/commands/Get.ts b/src/server/commands/Get.ts
index 4a523255..430c3b9a 100644
--- a/src/server/commands/Get.ts
+++ b/src/server/commands/Get.ts
@@ -1,5 +1,5 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
-import { IResource } from '../../resource/Resource'
+import { IResource } from '../../resource/IResource'
 
 export default function(arg : MethodCallArgs, callback)
 {
diff --git a/src/server/commands/Head.ts b/src/server/commands/Head.ts
index 897ec35e..55fa5072 100644
--- a/src/server/commands/Head.ts
+++ b/src/server/commands/Head.ts
@@ -1,5 +1,5 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
-import { IResource } from '../../resource/Resource'
+import { IResource } from '../../resource/IResource'
 
 export default function(arg : MethodCallArgs, callback)
 {
diff --git a/src/server/commands/Lock.ts b/src/server/commands/Lock.ts
index a9ce2022..9cdc8e52 100644
--- a/src/server/commands/Lock.ts
+++ b/src/server/commands/Lock.ts
@@ -1,6 +1,6 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
 import { STATUS_CODES } from 'http'
-import { IResource } from '../../resource/Resource'
+import { IResource } from '../../resource/IResource'
 import { Lock } from '../../resource/lock/Lock'
 import { LockKind } from '../../resource/lock/LockKind'
 import { LockScope } from '../../resource/lock/LockScope'
diff --git a/src/server/commands/Mkcol.ts b/src/server/commands/Mkcol.ts
index fb817891..5faac573 100644
--- a/src/server/commands/Mkcol.ts
+++ b/src/server/commands/Mkcol.ts
@@ -1,5 +1,5 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
-import { IResource, ResourceType } from '../../resource/Resource'
+import { IResource, ResourceType } from '../../resource/IResource'
 import { FSPath } from '../../manager/FSManager'
 import * as path from 'path'
 
diff --git a/src/server/commands/Move.ts b/src/server/commands/Move.ts
index e3359110..c17b3922 100644
--- a/src/server/commands/Move.ts
+++ b/src/server/commands/Move.ts
@@ -1,5 +1,5 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
-import { IResource, ResourceType } from '../../resource/Resource'
+import { IResource, ResourceType } from '../../resource/IResource'
 import { FSPath } from '../../manager/FSManager'
 
 export default function(arg : MethodCallArgs, callback)
diff --git a/src/server/commands/NotImplemented.ts b/src/server/commands/NotImplemented.ts
index fac8dd6e..1bb2902a 100644
--- a/src/server/commands/NotImplemented.ts
+++ b/src/server/commands/NotImplemented.ts
@@ -1,5 +1,5 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
-import { IResource } from '../../resource/Resource'
+import { IResource } from '../../resource/IResource'
 
 export default function(arg : MethodCallArgs, callback)
 {
diff --git a/src/server/commands/Propfind.ts b/src/server/commands/Propfind.ts
index 824fec74..4b823c6f 100644
--- a/src/server/commands/Propfind.ts
+++ b/src/server/commands/Propfind.ts
@@ -1,5 +1,5 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
-import { IResource, ETag } from '../../resource/Resource'
+import { IResource, ETag } from '../../resource/IResource'
 import { XML } from '../../helper/XML'
 
 export default function(arg : MethodCallArgs, callback)
diff --git a/src/server/commands/Proppatch.ts b/src/server/commands/Proppatch.ts
index d1d34a69..f52593fe 100644
--- a/src/server/commands/Proppatch.ts
+++ b/src/server/commands/Proppatch.ts
@@ -1,6 +1,6 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
 import { STATUS_CODES } from 'http'
-import { IResource } from '../../resource/Resource'
+import { IResource } from '../../resource/IResource'
 import { XML } from '../../helper/XML'
 
 export default function(arg : MethodCallArgs, callback)
diff --git a/src/server/commands/Put.ts b/src/server/commands/Put.ts
index 3b808576..e646738c 100644
--- a/src/server/commands/Put.ts
+++ b/src/server/commands/Put.ts
@@ -1,5 +1,5 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
-import { IResource, ResourceType } from '../../resource/Resource'
+import { IResource, ResourceType } from '../../resource/IResource'
 import * as path from 'path'
 
 function createResource(arg : MethodCallArgs, callback, validCallback : (resource : IResource) => void)
diff --git a/src/server/commands/Unlock.ts b/src/server/commands/Unlock.ts
index ed4c55f0..db5b44df 100644
--- a/src/server/commands/Unlock.ts
+++ b/src/server/commands/Unlock.ts
@@ -1,6 +1,6 @@
 import { HTTPCodes, MethodCallArgs, WebDAVRequest } from '../WebDAVRequest'
 import { STATUS_CODES } from 'http'
-import { IResource } from '../../resource/Resource'
+import { IResource } from '../../resource/IResource'
 import { Lock } from '../../resource/lock/Lock'
 import { LockKind } from '../../resource/lock/LockKind'
 import { LockScope } from '../../resource/lock/LockScope'