diff --git a/BuildServer/lib/builder.ts b/BuildServer/lib/builder.ts
index 5900121..acdbbaf 100644
--- a/BuildServer/lib/builder.ts
+++ b/BuildServer/lib/builder.ts
@@ -7,12 +7,12 @@ import * as JSONParse from "json-parse-safe";
 import { join } from "path";
 
 import settings from "../settings";
-import { ReportResult } from "../types";
 import { gitLoader } from "./git/loader";
 import { createGithub } from "./github-wrapper";
 import { send as sendMail } from "./mail-sender";
 import { writeReport } from "./report-processor";
 import { processTask } from "./task-processor";
+import { ReportResult } from "./types";
 
 const codePostfix = "";
 const mailLazinessLevel = 1000;
diff --git a/BuildServer/app.ts b/BuildServer/lib/index.ts
similarity index 98%
rename from BuildServer/app.ts
rename to BuildServer/lib/index.ts
index 8d60935..e74c5a9 100644
--- a/BuildServer/app.ts
+++ b/BuildServer/lib/index.ts
@@ -15,8 +15,8 @@ import { join } from "path";
 import * as serveFavicon from "serve-favicon";
 import * as serveStatic from "serve-static";
 
+import settings from "../settings";
 import * as routes from "./routes";
-import settings from "./settings";
 
 const app = express();
 
diff --git a/BuildServer/lib/report-processor.ts b/BuildServer/lib/report-processor.ts
index 394e853..bf7df51 100644
--- a/BuildServer/lib/report-processor.ts
+++ b/BuildServer/lib/report-processor.ts
@@ -8,7 +8,7 @@ import { ReadableStreamBuffer, WritableStreamBuffer } from "stream-buffers";
 import * as _ from "underscore";
 import { createGunzip, createGzip } from "zlib";
 
-import { Message, Report, ReportResult } from "../types";
+import { Message, Report, ReportResult } from "./types";
 
 const reportFilename = "report.json.gz";
 const maxAttemptsNumber = 100;
diff --git a/BuildServer/routes/artifact.ts b/BuildServer/lib/routes/artifact.ts
similarity index 100%
rename from BuildServer/routes/artifact.ts
rename to BuildServer/lib/routes/artifact.ts
diff --git a/BuildServer/routes/index.ts b/BuildServer/lib/routes/index.ts
similarity index 100%
rename from BuildServer/routes/index.ts
rename to BuildServer/lib/routes/index.ts
diff --git a/BuildServer/routes/manual.ts b/BuildServer/lib/routes/manual.ts
similarity index 92%
rename from BuildServer/routes/manual.ts
rename to BuildServer/lib/routes/manual.ts
index f868501..1cc0ffd 100644
--- a/BuildServer/routes/manual.ts
+++ b/BuildServer/lib/routes/manual.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import * as _ from "underscore";
-import { build } from "../lib/builder";
+import { build } from "../builder";
 
 export const get = (req, res) => res.render("manual");
 
diff --git a/BuildServer/routes/postreceive.ts b/BuildServer/lib/routes/postreceive.ts
similarity index 97%
rename from BuildServer/routes/postreceive.ts
rename to BuildServer/lib/routes/postreceive.ts
index 92a3546..c4b7d33 100644
--- a/BuildServer/routes/postreceive.ts
+++ b/BuildServer/lib/routes/postreceive.ts
@@ -1,8 +1,8 @@
 "use strict";
 
 import * as JSONParse from "json-parse-safe";
-import { build } from "../lib/builder";
-import { commentOnPullRequest } from "../lib/commenter";
+import { build } from "../builder";
+import { commentOnPullRequest } from "../commenter";
 
 const getBranchDescription = (options) => `${options.owner}/${options.reponame}:${options.branchname || options.branch}`;
 
diff --git a/BuildServer/routes/release.ts b/BuildServer/lib/routes/release.ts
similarity index 96%
rename from BuildServer/routes/release.ts
rename to BuildServer/lib/routes/release.ts
index 467c2b9..ca0fe7d 100644
--- a/BuildServer/routes/release.ts
+++ b/BuildServer/lib/routes/release.ts
@@ -3,7 +3,7 @@
 import { create as createArchiver } from "archiver";
 import { join } from "path";
 
-import { readReport } from "../lib/report-processor";
+import { readReport } from "../report-processor";
 
 const getDatePart = (report) => {
     if (!report.date) {
diff --git a/BuildServer/routes/status.ts b/BuildServer/lib/routes/status.ts
similarity index 98%
rename from BuildServer/routes/status.ts
rename to BuildServer/lib/routes/status.ts
index bd08225..7886484 100644
--- a/BuildServer/routes/status.ts
+++ b/BuildServer/lib/routes/status.ts
@@ -3,7 +3,7 @@
 import * as _ from "underscore";
 import { parse } from "url";
 
-import { getReport } from "../lib/status-processor";
+import { getReport } from "../status-processor";
 
 const parseOptionsFromReferer = (path, callback) => {
     const pathParts = path.split("/").filter((value) => value);
diff --git a/BuildServer/lib/task-processor.ts b/BuildServer/lib/task-processor.ts
index 1f0c874..9e35844 100644
--- a/BuildServer/lib/task-processor.ts
+++ b/BuildServer/lib/task-processor.ts
@@ -2,8 +2,8 @@
 
 import * as _ from "underscore";
 
-import { MessagesRoot, TaskInfo, TaskProcessor, TaskProcessorCallback, TaskProcessorCore } from "../types";
 import tasks from "./tasks";
+import { MessagesRoot, TaskInfo, TaskProcessor, TaskProcessorCallback, TaskProcessorCore } from "./types";
 
 // TaskProcessor does not look like EventEmitter, so no need to extend EventEmitter and use `emit' here.
 const createTaskProcessor = (task: TaskInfo, outerProcessor: TaskProcessorCore, callback: TaskProcessorCallback) => {
diff --git a/BuildServer/lib/tasks/cleanupafterdotnetbuild.ts b/BuildServer/lib/tasks/cleanupafterdotnetbuild.ts
index 3ce6a4f..79fb82d 100644
--- a/BuildServer/lib/tasks/cleanupafterdotnetbuild.ts
+++ b/BuildServer/lib/tasks/cleanupafterdotnetbuild.ts
@@ -2,7 +2,7 @@
 
 import * as glob from "glob";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => () => glob("**/obj/{Debug,Release}/*.{dll,pdb,xml}", {
     cwd: processor.context.exported,
diff --git a/BuildServer/lib/tasks/conditional.ts b/BuildServer/lib/tasks/conditional.ts
index 428bec3..814b986 100644
--- a/BuildServer/lib/tasks/conditional.ts
+++ b/BuildServer/lib/tasks/conditional.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => {
     const condition = (!params.owner || params.owner === processor.context.owner)
diff --git a/BuildServer/lib/tasks/copy.ts b/BuildServer/lib/tasks/copy.ts
index 017eb3f..c39e051 100644
--- a/BuildServer/lib/tasks/copy.ts
+++ b/BuildServer/lib/tasks/copy.ts
@@ -3,7 +3,7 @@
 import { copy } from "fs-extra";
 import { join } from "path";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => () => {
     const sourceFilePath = join(processor.context.exported, params.filename);
diff --git a/BuildServer/lib/tasks/copyglob.ts b/BuildServer/lib/tasks/copyglob.ts
index d717abe..30eb4c9 100644
--- a/BuildServer/lib/tasks/copyglob.ts
+++ b/BuildServer/lib/tasks/copyglob.ts
@@ -2,7 +2,7 @@
 
 import * as glob from "glob";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => () => glob(params.mask, {
     cwd: processor.context.exported,
diff --git a/BuildServer/lib/tasks/cssnano.ts b/BuildServer/lib/tasks/cssnano.ts
index 6e616a1..fb31287 100644
--- a/BuildServer/lib/tasks/cssnano.ts
+++ b/BuildServer/lib/tasks/cssnano.ts
@@ -4,7 +4,7 @@ import { process as cssnanoProcess } from "cssnano";
 import { readFile, writeFile } from "fs";
 import { join } from "path";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => () => {
     const filePath = join(processor.context.exported, params.filename);
diff --git a/BuildServer/lib/tasks/cssnanoall.ts b/BuildServer/lib/tasks/cssnanoall.ts
index 72e683f..6585aaf 100644
--- a/BuildServer/lib/tasks/cssnanoall.ts
+++ b/BuildServer/lib/tasks/cssnanoall.ts
@@ -2,7 +2,7 @@
 
 import * as glob from "glob";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 const flagDoneName = "cssnanoallDone";
 
diff --git a/BuildServer/lib/tasks/deletefromcode.ts b/BuildServer/lib/tasks/deletefromcode.ts
index 848dc81..504f1c4 100644
--- a/BuildServer/lib/tasks/deletefromcode.ts
+++ b/BuildServer/lib/tasks/deletefromcode.ts
@@ -3,7 +3,7 @@
 import { remove } from "fs-extra";
 import { join } from "path";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => () => {
     const sourceFilePath = join(processor.context.exported, params.filename);
diff --git a/BuildServer/lib/tasks/dotnetbuild.ts b/BuildServer/lib/tasks/dotnetbuild.ts
index 90c38cf..9f450a6 100644
--- a/BuildServer/lib/tasks/dotnetbuild.ts
+++ b/BuildServer/lib/tasks/dotnetbuild.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import sequential from "./sequential";
 
 export default ((params, processor) => sequential({
diff --git a/BuildServer/lib/tasks/dotnetbuildandtest.ts b/BuildServer/lib/tasks/dotnetbuildandtest.ts
index 247beb4..e0151c3 100644
--- a/BuildServer/lib/tasks/dotnetbuildandtest.ts
+++ b/BuildServer/lib/tasks/dotnetbuildandtest.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import sequential from "./sequential";
 
 export default ((params, processor) => sequential({
diff --git a/BuildServer/lib/tasks/dotnetbuilderwrapper.ts b/BuildServer/lib/tasks/dotnetbuilderwrapper.ts
index b65a477..1b3c4da 100644
--- a/BuildServer/lib/tasks/dotnetbuilderwrapper.ts
+++ b/BuildServer/lib/tasks/dotnetbuilderwrapper.ts
@@ -5,7 +5,7 @@ import * as JSONParse from "json-parse-safe";
 import { WritableStreamBuffer } from "stream-buffers";
 
 import settings from "../../settings";
-import { Task } from "../../types";
+import { Task } from "../types";
 
 const wrapBuilder = (builder, input, onExit) => {
     const stdoutPromise = new Promise((resolve, reject) => {
diff --git a/BuildServer/lib/tasks/dotnetbuildwithoutcleanup.ts b/BuildServer/lib/tasks/dotnetbuildwithoutcleanup.ts
index 88b2657..b1ad800 100644
--- a/BuildServer/lib/tasks/dotnetbuildwithoutcleanup.ts
+++ b/BuildServer/lib/tasks/dotnetbuildwithoutcleanup.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import sequential from "./sequential";
 
 const createTasks = function *(params) {
diff --git a/BuildServer/lib/tasks/dotnetcheckstyle.ts b/BuildServer/lib/tasks/dotnetcheckstyle.ts
index 473f009..27494ed 100644
--- a/BuildServer/lib/tasks/dotnetcheckstyle.ts
+++ b/BuildServer/lib/tasks/dotnetcheckstyle.ts
@@ -5,7 +5,7 @@ import { readFile } from "fs";
 import * as glob from "glob";
 import { join } from "path";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 const autoGeneratedMarker
     = "//------------------------------------------------------------------------------\n"
diff --git a/BuildServer/lib/tasks/dotnetcompile.ts b/BuildServer/lib/tasks/dotnetcompile.ts
index be824ac..4cba0ed 100644
--- a/BuildServer/lib/tasks/dotnetcompile.ts
+++ b/BuildServer/lib/tasks/dotnetcompile.ts
@@ -4,7 +4,7 @@ import { join } from "path";
 import * as _ from "underscore";
 
 import rawSettings from "../../settings";
-import { Settings, Task } from "../../types";
+import { Settings, Task } from "../types";
 import dotnetbuilderwrapper from "./dotnetbuilderwrapper";
 
 const settings: Settings = rawSettings;
diff --git a/BuildServer/lib/tasks/dotnetnugetpack.ts b/BuildServer/lib/tasks/dotnetnugetpack.ts
index 7b39a1c..05179b0 100644
--- a/BuildServer/lib/tasks/dotnetnugetpack.ts
+++ b/BuildServer/lib/tasks/dotnetnugetpack.ts
@@ -2,7 +2,7 @@
 
 import * as _ from "underscore";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import dotnetnugetprocessinternal from "./dotnetnugetprocessinternal";
 
 export default ((params, processor) => dotnetnugetprocessinternal({
diff --git a/BuildServer/lib/tasks/dotnetnugetprocess.ts b/BuildServer/lib/tasks/dotnetnugetprocess.ts
index 1b5042d..d33d9e2 100644
--- a/BuildServer/lib/tasks/dotnetnugetprocess.ts
+++ b/BuildServer/lib/tasks/dotnetnugetprocess.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import conditional from "./conditional";
 
 export default ((params, processor) => conditional({
diff --git a/BuildServer/lib/tasks/dotnetnugetprocessinternal.ts b/BuildServer/lib/tasks/dotnetnugetprocessinternal.ts
index 1b80e79..9e7929d 100644
--- a/BuildServer/lib/tasks/dotnetnugetprocessinternal.ts
+++ b/BuildServer/lib/tasks/dotnetnugetprocessinternal.ts
@@ -2,7 +2,7 @@
 
 import { join } from "path";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import sequential from "./sequential";
 
 const postfixLength = 16;
diff --git a/BuildServer/lib/tasks/dotnetnugetpush.ts b/BuildServer/lib/tasks/dotnetnugetpush.ts
index 147121a..226c895 100644
--- a/BuildServer/lib/tasks/dotnetnugetpush.ts
+++ b/BuildServer/lib/tasks/dotnetnugetpush.ts
@@ -2,7 +2,7 @@
 
 import * as _ from "underscore";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import dotnetnugetprocessinternal from "./dotnetnugetprocessinternal";
 
 export default ((params, processor) => dotnetnugetprocessinternal({
diff --git a/BuildServer/lib/tasks/dotnetnugetpushonly.ts b/BuildServer/lib/tasks/dotnetnugetpushonly.ts
index a18684f..11dd0b9 100644
--- a/BuildServer/lib/tasks/dotnetnugetpushonly.ts
+++ b/BuildServer/lib/tasks/dotnetnugetpushonly.ts
@@ -3,7 +3,7 @@
 import { join } from "path";
 
 import settings from "../../settings";
-import { Task } from "../../types";
+import { Task } from "../types";
 import dotnetbuilderwrapper from "./dotnetbuilderwrapper";
 
 export default ((params, processor) => dotnetbuilderwrapper({
diff --git a/BuildServer/lib/tasks/dotnetnugetrestore.ts b/BuildServer/lib/tasks/dotnetnugetrestore.ts
index 27b8e3a..1a2f69f 100644
--- a/BuildServer/lib/tasks/dotnetnugetrestore.ts
+++ b/BuildServer/lib/tasks/dotnetnugetrestore.ts
@@ -2,7 +2,7 @@
 
 import { join } from "path";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import sequential from "./sequential";
 
 export default ((params, processor) => sequential({
diff --git a/BuildServer/lib/tasks/dotnetnunit.ts b/BuildServer/lib/tasks/dotnetnunit.ts
index e1733f4..e274c37 100644
--- a/BuildServer/lib/tasks/dotnetnunit.ts
+++ b/BuildServer/lib/tasks/dotnetnunit.ts
@@ -2,7 +2,7 @@
 
 import { join } from "path";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import dotNetBuilderWrapper from "./dotnetbuilderwrapper";
 
 export default ((params, processor) => dotNetBuilderWrapper({
diff --git a/BuildServer/lib/tasks/dotnetnunitall.ts b/BuildServer/lib/tasks/dotnetnunitall.ts
index 17e743d..eb0f9f4 100644
--- a/BuildServer/lib/tasks/dotnetnunitall.ts
+++ b/BuildServer/lib/tasks/dotnetnunitall.ts
@@ -2,7 +2,7 @@
 
 import * as glob from "glob";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 const flagDoneName = "dotnetnunitallDone";
 
diff --git a/BuildServer/lib/tasks/dotnetpackwebapp.ts b/BuildServer/lib/tasks/dotnetpackwebapp.ts
index 0d1fb6a..4978dc1 100644
--- a/BuildServer/lib/tasks/dotnetpackwebapp.ts
+++ b/BuildServer/lib/tasks/dotnetpackwebapp.ts
@@ -4,7 +4,7 @@ import { readFileSync } from "fs";
 import { render } from "mustache";
 import { join } from "path";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import sequential from "./sequential";
 
 const msbuildTemplate = readFileSync(join(__dirname, "/dotnetpackwebapp.template.msbuild"), { encoding: "utf8" });
diff --git a/BuildServer/lib/tasks/dotnetrewrite.ts b/BuildServer/lib/tasks/dotnetrewrite.ts
index 0b4462d..11a49fb 100644
--- a/BuildServer/lib/tasks/dotnetrewrite.ts
+++ b/BuildServer/lib/tasks/dotnetrewrite.ts
@@ -6,7 +6,7 @@ import * as glob from "glob";
 import { join } from "path";
 
 import rawSettings from "../../settings";
-import { Settings, Task } from "../../types";
+import { Settings, Task } from "../types";
 
 const flagDoneName = "dotnetrewriterDone";
 
diff --git a/BuildServer/lib/tasks/echo.ts b/BuildServer/lib/tasks/echo.ts
index 4317b0c..fa12a7c 100644
--- a/BuildServer/lib/tasks/echo.ts
+++ b/BuildServer/lib/tasks/echo.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => () => {
     if (params.error) {
diff --git a/BuildServer/lib/tasks/eslintbrowser.ts b/BuildServer/lib/tasks/eslintbrowser.ts
index a010cb6..575b19a 100644
--- a/BuildServer/lib/tasks/eslintbrowser.ts
+++ b/BuildServer/lib/tasks/eslintbrowser.ts
@@ -4,7 +4,7 @@ import { CLIEngine } from "eslint";
 import { join } from "path";
 
 import rawSettings from "../../settings";
-import { Settings, Task } from "../../types";
+import { Settings, Task } from "../types";
 
 const settings: Settings = rawSettings;
 
diff --git a/BuildServer/lib/tasks/eslintbrowserall.ts b/BuildServer/lib/tasks/eslintbrowserall.ts
index 8f6aa08..d4a1170 100644
--- a/BuildServer/lib/tasks/eslintbrowserall.ts
+++ b/BuildServer/lib/tasks/eslintbrowserall.ts
@@ -2,7 +2,7 @@
 
 import * as glob from "glob";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 const flagDoneName = "eslintbrowserallDone";
 
diff --git a/BuildServer/lib/tasks/index.ts b/BuildServer/lib/tasks/index.ts
index d154c17..461ba89 100644
--- a/BuildServer/lib/tasks/index.ts
+++ b/BuildServer/lib/tasks/index.ts
@@ -3,7 +3,7 @@
 import { readdirSync } from "fs";
 import * as _ from "underscore";
 
-import { Tasks } from "../../types";
+import { Tasks } from "../types";
 
 const taskNames = _.unique(readdirSync(__dirname).map((file) => {
     if (file.match(/\.ts$/) !== null) {
diff --git a/BuildServer/lib/tasks/noop.ts b/BuildServer/lib/tasks/noop.ts
index c81d511..6c5eaa1 100644
--- a/BuildServer/lib/tasks/noop.ts
+++ b/BuildServer/lib/tasks/noop.ts
@@ -1,5 +1,5 @@
 "use strict";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => processor.done()) as Task;
diff --git a/BuildServer/lib/tasks/packform.ts b/BuildServer/lib/tasks/packform.ts
index efb57a1..dd67e38 100644
--- a/BuildServer/lib/tasks/packform.ts
+++ b/BuildServer/lib/tasks/packform.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 import sequential from "./sequential";
 
 export default ((params, processor) => sequential({
diff --git a/BuildServer/lib/tasks/parallel.ts b/BuildServer/lib/tasks/parallel.ts
index f7a0ee9..add34db 100644
--- a/BuildServer/lib/tasks/parallel.ts
+++ b/BuildServer/lib/tasks/parallel.ts
@@ -2,7 +2,7 @@
 
 import { parallel } from "async";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 const mapper = (processor) => (task) => (callback) => processor.processTask(task, callback);
 
diff --git a/BuildServer/lib/tasks/sequential.ts b/BuildServer/lib/tasks/sequential.ts
index 0f21987..760d25e 100644
--- a/BuildServer/lib/tasks/sequential.ts
+++ b/BuildServer/lib/tasks/sequential.ts
@@ -2,7 +2,7 @@
 
 import { series } from "async";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 const mapper = (processor) => (task) => (callback) => processor.processTask(task, callback);
 
diff --git a/BuildServer/lib/tasks/uglifyjs.ts b/BuildServer/lib/tasks/uglifyjs.ts
index 19ca352..9449fd5 100644
--- a/BuildServer/lib/tasks/uglifyjs.ts
+++ b/BuildServer/lib/tasks/uglifyjs.ts
@@ -4,7 +4,7 @@ import { writeFile } from "fs";
 import { join, normalize } from "path";
 import { minify } from "uglify-js";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => () => {
     const filePath = normalize(join(processor.context.exported, params.filename));
diff --git a/BuildServer/lib/tasks/uglifyjsall.ts b/BuildServer/lib/tasks/uglifyjsall.ts
index 859f5b6..4139707 100644
--- a/BuildServer/lib/tasks/uglifyjsall.ts
+++ b/BuildServer/lib/tasks/uglifyjsall.ts
@@ -2,7 +2,7 @@
 
 import * as glob from "glob";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 const doneFlagName = "uglifyjsallDone";
 
diff --git a/BuildServer/lib/tasks/writefile.ts b/BuildServer/lib/tasks/writefile.ts
index 60d7c1b..a230b98 100644
--- a/BuildServer/lib/tasks/writefile.ts
+++ b/BuildServer/lib/tasks/writefile.ts
@@ -3,7 +3,7 @@
 import { writeFile } from "fs";
 import { join } from "path";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => () => {
     const filePath = join(processor.context.exported, params.filename);
diff --git a/BuildServer/lib/tasks/zip.ts b/BuildServer/lib/tasks/zip.ts
index 2aceaff..9f16516 100644
--- a/BuildServer/lib/tasks/zip.ts
+++ b/BuildServer/lib/tasks/zip.ts
@@ -4,7 +4,7 @@ import { create as createArchiver } from "archiver";
 import { createWriteStream } from "fs";
 import { join, normalize } from "path";
 
-import { Task } from "../../types";
+import { Task } from "../types";
 
 export default ((params, processor) => () => {
     const sourceDirectoryPath = normalize(join(processor.context.exported, String(params.directory || "")));
diff --git a/BuildServer/types/index.ts b/BuildServer/lib/types/index.ts
similarity index 100%
rename from BuildServer/types/index.ts
rename to BuildServer/lib/types/index.ts
diff --git a/BuildServer/types/report-types.ts b/BuildServer/lib/types/report-types.ts
similarity index 100%
rename from BuildServer/types/report-types.ts
rename to BuildServer/lib/types/report-types.ts
diff --git a/BuildServer/types/settings-types.ts b/BuildServer/lib/types/settings-types.ts
similarity index 100%
rename from BuildServer/types/settings-types.ts
rename to BuildServer/lib/types/settings-types.ts
diff --git a/BuildServer/types/task-processor-types.ts b/BuildServer/lib/types/task-processor-types.ts
similarity index 100%
rename from BuildServer/types/task-processor-types.ts
rename to BuildServer/lib/types/task-processor-types.ts