diff --git a/dist/mod02/index.js b/dist/mod02/index.js
index 0624d17..2e126b4 100644
--- a/dist/mod02/index.js
+++ b/dist/mod02/index.js
@@ -1,4 +1,12 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 /* ------------------------------------------
  * This module tests the compiled TypeScript files
  * -------------------------------------------- */
@@ -15,15 +23,19 @@ let mocha = function (configArg) {
     npmts_log_1.npmtsOra.end(); // end npmtsOra for tests.
     let done = q.defer();
     let coverageSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, './dist/**/*.js')]),
+        plugins.gulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
         plugins.gulpSourcemaps.init(),
-        plugins.gulpBabel({
-            presets: [
-                require.resolve('babel-preset-es2015')
-            ]
+        plugins.gulpTypeScript({
+            target: 'ES5',
+            emitDecoratorMetadata: true,
+            experimentalDecorators: true
         }),
         plugins.gulpIstanbul({}),
         plugins.gulpSourcemaps.write(),
+        plugins.gulpFunction.forEach((file) => __awaiter(this, void 0, void 0, function* () {
+            file.path = file.path.replace(paths.tsDir, paths.distDir);
+            console.log(file.path);
+        })),
         plugins.gulpInjectModules(),
         plugins.through2.obj((file, enc, cb) => {
             cb();
@@ -32,11 +44,11 @@ let mocha = function (configArg) {
         })
     ]);
     let localSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.js')]),
-        plugins.gulpBabel({
-            presets: [
-                require.resolve('babel-preset-es2015')
-            ]
+        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.ts')]),
+        plugins.gulpTypeScript({
+            target: 'ES5',
+            emitDecoratorMetadata: true,
+            experimentalDecorators: true
         }),
         plugins.gulpInjectModules(),
         plugins.gulpMocha(),
diff --git a/dist/mod02/mod02.plugins.d.ts b/dist/mod02/mod02.plugins.d.ts
index 9d54772..25062a9 100644
--- a/dist/mod02/mod02.plugins.d.ts
+++ b/dist/mod02/mod02.plugins.d.ts
@@ -1,9 +1,9 @@
 export * from '../npmts.plugins';
 import * as gulp from 'gulp';
-import * as gulpBabel from 'gulp-babel';
-import * as gulpIstanbul from 'gulp-istanbul';
 import * as gulpFunction from 'gulp-function';
+import * as gulpIstanbul from 'gulp-istanbul';
 declare let gulpInjectModules: any;
 import * as gulpMocha from 'gulp-mocha';
 import * as gulpSourcemaps from 'gulp-sourcemaps';
-export { gulp, gulpBabel, gulpIstanbul, gulpFunction, gulpInjectModules, gulpMocha, gulpSourcemaps };
+import * as gulpTypeScript from 'gulp-typescript';
+export { gulp, gulpFunction, gulpIstanbul, gulpInjectModules, gulpMocha, gulpSourcemaps, gulpTypeScript };
diff --git a/dist/mod02/mod02.plugins.js b/dist/mod02/mod02.plugins.js
index 600da32..dabd0e0 100644
--- a/dist/mod02/mod02.plugins.js
+++ b/dist/mod02/mod02.plugins.js
@@ -5,15 +5,15 @@ function __export(m) {
 __export(require("../npmts.plugins"));
 const gulp = require("gulp");
 exports.gulp = gulp;
-const gulpBabel = require("gulp-babel");
-exports.gulpBabel = gulpBabel;
-const gulpIstanbul = require("gulp-istanbul");
-exports.gulpIstanbul = gulpIstanbul;
 const gulpFunction = require("gulp-function");
 exports.gulpFunction = gulpFunction;
+const gulpIstanbul = require("gulp-istanbul");
+exports.gulpIstanbul = gulpIstanbul;
 let gulpInjectModules = require('gulp-inject-modules');
 exports.gulpInjectModules = gulpInjectModules;
 const gulpMocha = require("gulp-mocha");
 exports.gulpMocha = gulpMocha;
 const gulpSourcemaps = require("gulp-sourcemaps");
 exports.gulpSourcemaps = gulpSourcemaps;
+const gulpTypeScript = require("gulp-typescript");
+exports.gulpTypeScript = gulpTypeScript;
diff --git a/package.json b/package.json
index bf6fd4f..621f93b 100644
--- a/package.json
+++ b/package.json
@@ -35,25 +35,24 @@
   "homepage": "https://gitlab.com/pushrocks/npmts#readme",
   "dependencies": {
     "@types/gulp": "^3.8.32",
-    "@types/gulp-babel": "^6.1.29",
     "@types/gulp-istanbul": "^0.9.30",
     "@types/gulp-mocha": "0.0.29",
+    "@types/gulp-rename": "0.0.31",
     "@types/gulp-sourcemaps": "0.0.29",
     "@types/minimatch": "^2.0.29",
     "@types/q": "^0.x.x",
     "@types/shelljs": "^0.3.33",
     "@types/through2": "^2.0.32",
-    "babel-preset-es2015": "^6.18.0",
     "beautylog": "6.0.0",
     "depcheck": "^0.6.7",
     "early": "^2.0.35",
     "gulp": "3.9.1",
-    "gulp-babel": "^6.1.2",
     "gulp-function": "^2.2.3",
     "gulp-inject-modules": "^1.0.0",
     "gulp-istanbul": "^1.1.1",
     "gulp-mocha": "^3.0.1",
     "gulp-sourcemaps": "^2.4.0",
+    "gulp-typescript": "^3.1.4",
     "lodash": "^4.17.4",
     "npmextra": "^2.0.3",
     "projectinfo": "3.0.1",
diff --git a/ts/mod02/index.ts b/ts/mod02/index.ts
index bb4456c..c59e73c 100644
--- a/ts/mod02/index.ts
+++ b/ts/mod02/index.ts
@@ -19,16 +19,20 @@ let mocha = function (configArg: INpmtsConfig) {
     let done = q.defer()
 
     let coverageSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, './dist/**/*.js')]),
+        plugins.gulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
         plugins.gulpSourcemaps.init(),
-        plugins.gulpBabel({
-            presets: [
-                require.resolve('babel-preset-es2015')
-            ]
+        plugins.gulpTypeScript({
+            target: 'ES5',
+            emitDecoratorMetadata: true,
+            experimentalDecorators: true
         }),
         plugins.gulpIstanbul({
         }),
         plugins.gulpSourcemaps.write(),
+        plugins.gulpFunction.forEach(async file => {
+            file.path = file.path.replace(paths.tsDir, paths.distDir)
+            console.log(file.path)
+        }),
         plugins.gulpInjectModules(),
         plugins.through2.obj(
             (file, enc, cb) => {
@@ -41,11 +45,11 @@ let mocha = function (configArg: INpmtsConfig) {
     ])
 
     let localSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.js')]),
-        plugins.gulpBabel({
-            presets: [
-                require.resolve('babel-preset-es2015')
-            ]
+        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.ts')]),
+        plugins.gulpTypeScript({
+            target: 'ES5',
+            emitDecoratorMetadata: true,
+            experimentalDecorators: true
         }),
         plugins.gulpInjectModules(),
         plugins.gulpMocha(),
diff --git a/ts/mod02/mod02.plugins.ts b/ts/mod02/mod02.plugins.ts
index d8cdb31..bfefe53 100644
--- a/ts/mod02/mod02.plugins.ts
+++ b/ts/mod02/mod02.plugins.ts
@@ -1,19 +1,19 @@
 export * from '../npmts.plugins'
 
 import * as gulp from 'gulp'
-import * as gulpBabel from 'gulp-babel'
-import * as gulpIstanbul from 'gulp-istanbul'
 import * as gulpFunction from 'gulp-function'
+import * as gulpIstanbul from 'gulp-istanbul'
 let gulpInjectModules = require('gulp-inject-modules')
 import * as gulpMocha from 'gulp-mocha'
 import * as gulpSourcemaps from 'gulp-sourcemaps'
+import * as gulpTypeScript from 'gulp-typescript'
 
 export {
     gulp,
-    gulpBabel,
-    gulpIstanbul,
     gulpFunction,
+    gulpIstanbul,
     gulpInjectModules,
     gulpMocha,
-    gulpSourcemaps
+    gulpSourcemaps,
+    gulpTypeScript
 }