diff --git a/business-rules-engine/BasicValidators.d.ts b/business-rules-engine/BasicValidators.d.ts
deleted file mode 100644
index aa176d94a2..0000000000
--- a/business-rules-engine/BasicValidators.d.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-// Type definitions for business-rules-engine - v1.0.20
-// Project: https://github.com/rsamec/form
-// Definitions by: Roman Samec <https://github.com/rsamec>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../underscore/underscore.d.ts" />
-/// <reference path="../q/Q.d.ts" />
-/// <reference path="../moment/moment.d.ts" />
-/// <reference path="../node/node.d.ts" />
-/// <reference path="business-rules-engine.d.ts" />
-declare namespace Validators {
-    class LettersOnlyValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class ZipCodeValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class EmailValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class UrlValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class RequiredValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DateValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DateISOValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class NumberValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class DigitValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class SignedDigitValidator implements Validation.IStringValidator {
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class MinLengthValidator implements Validation.IStringValidator {
-        public MinLength: number;
-        constructor(MinLength?: number);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class MaxLengthValidator implements Validation.IStringValidator {
-        public MaxLength: number;
-        constructor(MaxLength?: number);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class RangeLengthValidator implements Validation.IStringValidator {
-        public RangeLength: number[];
-        constructor(RangeLength?: number[]);
-        public isAcceptable(s: string): boolean;
-        public MinLength : number;
-        public MaxLength : number;
-        public tagName: string;
-    }
-    class MinValidator implements Validation.IPropertyValidator {
-        public Min: number;
-        constructor(Min?: number);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class MaxValidator implements Validation.IPropertyValidator {
-        public Max: number;
-        constructor(Max?: number);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class RangeValidator implements Validation.IPropertyValidator {
-        public Range: number[];
-        constructor(Range?: number[]);
-        public isAcceptable(s: any): boolean;
-        public Min : number;
-        public Max : number;
-        public tagName: string;
-    }
-    class StepValidator implements Validation.IPropertyValidator {
-        public Step: string;
-        constructor(Step?: string);
-        public isAcceptable(s: any): boolean;
-        public tagName: string;
-    }
-    class PatternValidator implements Validation.IStringValidator {
-        public Pattern: string;
-        constructor(Pattern?: string);
-        public isAcceptable(s: string): boolean;
-        public tagName: string;
-    }
-    class ContainsValidator implements Validation.IAsyncPropertyValidator {
-        public Options: Q.Promise<any[]>;
-        constructor(Options: Q.Promise<any[]>);
-        public isAcceptable(s: string): Q.Promise<boolean>;
-        public isAsync: boolean;
-        public tagName: string;
-    }
-}
-declare module "node-validators" {export = Validators;}
diff --git a/business-rules-engine/business-rules-engine-tests.ts b/business-rules-engine/business-rules-engine-tests.ts
index 5695c3b7fb..4785efe636 100644
--- a/business-rules-engine/business-rules-engine-tests.ts
+++ b/business-rules-engine/business-rules-engine-tests.ts
@@ -1,8 +1,7 @@
 /// <reference path="business-rules-engine.d.ts" />
-/// <reference path="BasicValidators.d.ts" />
+/// <reference path="node-validators.d.ts" />
 /// <reference path="../underscore/underscore.d.ts" />
 /// <reference path="../q/Q.d.ts" />
-/// <reference path="../moment/moment.d.ts" />
 
 export interface IPerson{
     Checked:boolean;
diff --git a/business-rules-engine/node-validators.d.ts b/business-rules-engine/node-validators.d.ts
new file mode 100644
index 0000000000..13cca416d6
--- /dev/null
+++ b/business-rules-engine/node-validators.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for business-rules-engine - v1.0.20
+// Project: https://github.com/rsamec/form
+// Definitions by: Roman Samec <https://github.com/rsamec>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../underscore/underscore.d.ts" />
+/// <reference path="../q/Q.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="business-rules-engine.d.ts" />
+
+export as namespace Validators;
+
+import * as moment from '../moment';
+
+export class LettersOnlyValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class ZipCodeValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class EmailValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class UrlValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class RequiredValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class DateValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class DateISOValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class NumberValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class DigitValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class SignedDigitValidator implements Validation.IStringValidator {
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class MinLengthValidator implements Validation.IStringValidator {
+    public MinLength: number;
+    constructor(MinLength?: number);
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class MaxLengthValidator implements Validation.IStringValidator {
+    public MaxLength: number;
+    constructor(MaxLength?: number);
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class RangeLengthValidator implements Validation.IStringValidator {
+    public RangeLength: number[];
+    constructor(RangeLength?: number[]);
+    public isAcceptable(s: string): boolean;
+    public MinLength : number;
+    public MaxLength : number;
+    public tagName: string;
+}
+export class MinValidator implements Validation.IPropertyValidator {
+    public Min: number;
+    constructor(Min?: number);
+    public isAcceptable(s: any): boolean;
+    public tagName: string;
+}
+export class MaxValidator implements Validation.IPropertyValidator {
+    public Max: number;
+    constructor(Max?: number);
+    public isAcceptable(s: any): boolean;
+    public tagName: string;
+}
+export class RangeValidator implements Validation.IPropertyValidator {
+    public Range: number[];
+    constructor(Range?: number[]);
+    public isAcceptable(s: any): boolean;
+    public Min : number;
+    public Max : number;
+    public tagName: string;
+}
+export class StepValidator implements Validation.IPropertyValidator {
+    public Step: string;
+    constructor(Step?: string);
+    public isAcceptable(s: any): boolean;
+    public tagName: string;
+}
+export class PatternValidator implements Validation.IStringValidator {
+    public Pattern: string;
+    constructor(Pattern?: string);
+    public isAcceptable(s: string): boolean;
+    public tagName: string;
+}
+export class ContainsValidator implements Validation.IAsyncPropertyValidator {
+    public Options: Q.Promise<any[]>;
+    constructor(Options: Q.Promise<any[]>);
+    public isAcceptable(s: string): Q.Promise<boolean>;
+    public isAsync: boolean;
+    public tagName: string;
+}