diff --git a/.gitignore b/.gitignore
index 8fb48c7f..0841ed31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,3 @@
-.nyc_output
 dist
-coverage
-docs/.bundle
-docs/_site
-docs/vendor
 node_modules
-package-lock.json
-tmp
\ No newline at end of file
+package-lock.json
\ No newline at end of file
diff --git a/.nycrc.json b/.nycrc.json
index 13b1994d..186f89c6 100644
--- a/.nycrc.json
+++ b/.nycrc.json
@@ -29,7 +29,7 @@
     "html"
   ],
   "include": [
-    "**/src/**"
+    "**/main/**"
   ],
   "exclude": []
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index c650d2f8..74d5bf99 100644
--- a/README.md
+++ b/README.md
@@ -39,22 +39,22 @@ npm run test:browser
 
 ### Writing and executing tests
 
-Assuming one want to execute the test located in `test/tests/integration/comparison/to-array.ts`, one would run:
+Assuming one want to execute the test located in `src/test/tests/integration/comparison/to-array.ts`, one would run:
 
 ```shell
-ts-node test/tests/integration/comparison/to-array.ts
+ts-node src/test/tests/integration/comparison/to-array.ts
 ```
 
 It is even possible - and recommended - to track the coverage while writing tests:
 
 ```shell
-nyc ts-node test/tests/integration/comparison/to-array.ts
+nyc ts-node src/test/tests/integration/comparison/to-array.ts
 ```
 
 Of course, it is also perfectly possible to pipe the result of the test to your favorite tap formatter:
 
 ```shell
-test/tests/integration/comparison$ ts-node . | tap-nyan
+src/test/tests/integration/comparison$ ts-node . | tap-nyan
  9   -_-_-_-_-_,------,
  0   -_-_-_-_-_|   /\_/\ 
  0   -_-_-_-_-^|__( ^ .^) 
diff --git a/package.json b/package.json
index 812b2074..40fcbf89 100644
--- a/package.json
+++ b/package.json
@@ -34,9 +34,9 @@
     "test": "node dist/test",
     "test:browser": "browserify dist/test/index.js | tape-run --sandbox=false",
     "build": "npm run build:cjs && npm run build:types && npm run bundle",
-    "build:cjs": "rimraf dist/cjs && tsc --project . --module commonjs --outDir dist/cjs",
-    "build:test": "rimraf dist && tsc --project test --outDir dist",
-    "build:types": "rimraf dist/types && tsc --project . --declaration true --emitDeclarationOnly true --outDir dist/types",
+    "build:cjs": "rimraf dist/cjs && tsc --project src/main --module commonjs --outDir dist/cjs",
+    "build:test": "rimraf dist && tsc --project src/test --outDir dist",
+    "build:types": "rimraf dist/types && tsc --project src/main --declaration true --emitDeclarationOnly true --outDir dist/types",
     "bundle": "browserify dist/cjs/lib.js -g uglifyify -s Twing -o dist/lib.min.js"
   },
   "dependencies": {
diff --git a/src/README.md b/src/main/README.md
similarity index 100%
rename from src/README.md
rename to src/main/README.md
diff --git a/src/lib.ts b/src/main/lib.ts
similarity index 99%
rename from src/lib.ts
rename to src/main/lib.ts
index 94c0e031..9c0df6a1 100644
--- a/src/lib.ts
+++ b/src/main/lib.ts
@@ -265,7 +265,7 @@ export {createWithTagHandler} from "./lib/tag-handler/with";
 export type {
     TwingCallable, TwingCallableArgument, TwingCallableWrapperOptions, TwingCallableWrapper
 } from "./lib/callable-wrapper";
-export type {TwingContext} from "./lib/context";
+export {type TwingContext, createContext} from "./lib/context";
 export type {TwingEnvironment, TwingEnvironmentOptions, TwingNumberFormat} from "./lib/environment";
 export type {
     TwingEscapingStrategy, TwingEscapingStrategyHandler, TwingEscapingStrategyResolver
@@ -280,7 +280,7 @@ export type {TwingNodeVisitor} from "./lib/node-visitor";
 export type {
     TwingOperator, TwingOperatorAssociativity, TwingOperatorType, TwingOperatorExpressionFactory
 } from "./lib/operator";
-export type {TwingOutputBuffer} from "./lib/output-buffer";
+export {type TwingOutputBuffer, createOutputBuffer} from "./lib/output-buffer";
 export type {TwingParser, TwingParserOptions} from "./lib/parser";
 export type {TwingSandboxSecurityPolicy} from "./lib/sandbox/security-policy";
 export type {TwingSource} from "./lib/source";
diff --git a/src/lib/cache.ts b/src/main/lib/cache.ts
similarity index 100%
rename from src/lib/cache.ts
rename to src/main/lib/cache.ts
diff --git a/src/lib/callable-wrapper.ts b/src/main/lib/callable-wrapper.ts
similarity index 100%
rename from src/lib/callable-wrapper.ts
rename to src/main/lib/callable-wrapper.ts
diff --git a/src/lib/context.ts b/src/main/lib/context.ts
similarity index 100%
rename from src/lib/context.ts
rename to src/main/lib/context.ts
diff --git a/src/lib/environment.ts b/src/main/lib/environment.ts
similarity index 100%
rename from src/lib/environment.ts
rename to src/main/lib/environment.ts
diff --git a/src/lib/error.ts b/src/main/lib/error.ts
similarity index 100%
rename from src/lib/error.ts
rename to src/main/lib/error.ts
diff --git a/src/lib/error/base.ts b/src/main/lib/error/base.ts
similarity index 100%
rename from src/lib/error/base.ts
rename to src/main/lib/error/base.ts
diff --git a/src/lib/error/loader.ts b/src/main/lib/error/loader.ts
similarity index 100%
rename from src/lib/error/loader.ts
rename to src/main/lib/error/loader.ts
diff --git a/src/lib/error/parsing.ts b/src/main/lib/error/parsing.ts
similarity index 100%
rename from src/lib/error/parsing.ts
rename to src/main/lib/error/parsing.ts
diff --git a/src/lib/error/runtime.ts b/src/main/lib/error/runtime.ts
similarity index 100%
rename from src/lib/error/runtime.ts
rename to src/main/lib/error/runtime.ts
diff --git a/src/lib/escaping-stragegy/css.ts b/src/main/lib/escaping-stragegy/css.ts
similarity index 100%
rename from src/lib/escaping-stragegy/css.ts
rename to src/main/lib/escaping-stragegy/css.ts
diff --git a/src/lib/escaping-stragegy/html-attribute.ts b/src/main/lib/escaping-stragegy/html-attribute.ts
similarity index 100%
rename from src/lib/escaping-stragegy/html-attribute.ts
rename to src/main/lib/escaping-stragegy/html-attribute.ts
diff --git a/src/lib/escaping-stragegy/html.ts b/src/main/lib/escaping-stragegy/html.ts
similarity index 100%
rename from src/lib/escaping-stragegy/html.ts
rename to src/main/lib/escaping-stragegy/html.ts
diff --git a/src/lib/escaping-stragegy/js.ts b/src/main/lib/escaping-stragegy/js.ts
similarity index 100%
rename from src/lib/escaping-stragegy/js.ts
rename to src/main/lib/escaping-stragegy/js.ts
diff --git a/src/lib/escaping-stragegy/url.ts b/src/main/lib/escaping-stragegy/url.ts
similarity index 100%
rename from src/lib/escaping-stragegy/url.ts
rename to src/main/lib/escaping-stragegy/url.ts
diff --git a/src/lib/escaping-strategy.ts b/src/main/lib/escaping-strategy.ts
similarity index 100%
rename from src/lib/escaping-strategy.ts
rename to src/main/lib/escaping-strategy.ts
diff --git a/src/lib/execution-context.ts b/src/main/lib/execution-context.ts
similarity index 100%
rename from src/lib/execution-context.ts
rename to src/main/lib/execution-context.ts
diff --git a/src/lib/extension-set.ts b/src/main/lib/extension-set.ts
similarity index 100%
rename from src/lib/extension-set.ts
rename to src/main/lib/extension-set.ts
diff --git a/src/lib/extension.ts b/src/main/lib/extension.ts
similarity index 100%
rename from src/lib/extension.ts
rename to src/main/lib/extension.ts
diff --git a/src/lib/extension/core.ts b/src/main/lib/extension/core.ts
similarity index 100%
rename from src/lib/extension/core.ts
rename to src/main/lib/extension/core.ts
diff --git a/src/lib/extension/core/filters/abs.ts b/src/main/lib/extension/core/filters/abs.ts
similarity index 100%
rename from src/lib/extension/core/filters/abs.ts
rename to src/main/lib/extension/core/filters/abs.ts
diff --git a/src/lib/extension/core/filters/batch.ts b/src/main/lib/extension/core/filters/batch.ts
similarity index 100%
rename from src/lib/extension/core/filters/batch.ts
rename to src/main/lib/extension/core/filters/batch.ts
diff --git a/src/lib/extension/core/filters/capitalize.ts b/src/main/lib/extension/core/filters/capitalize.ts
similarity index 100%
rename from src/lib/extension/core/filters/capitalize.ts
rename to src/main/lib/extension/core/filters/capitalize.ts
diff --git a/src/lib/extension/core/filters/column.ts b/src/main/lib/extension/core/filters/column.ts
similarity index 100%
rename from src/lib/extension/core/filters/column.ts
rename to src/main/lib/extension/core/filters/column.ts
diff --git a/src/lib/extension/core/filters/convert-encoding.ts b/src/main/lib/extension/core/filters/convert-encoding.ts
similarity index 100%
rename from src/lib/extension/core/filters/convert-encoding.ts
rename to src/main/lib/extension/core/filters/convert-encoding.ts
diff --git a/src/lib/extension/core/filters/date-modify.ts b/src/main/lib/extension/core/filters/date-modify.ts
similarity index 100%
rename from src/lib/extension/core/filters/date-modify.ts
rename to src/main/lib/extension/core/filters/date-modify.ts
diff --git a/src/lib/extension/core/filters/date.ts b/src/main/lib/extension/core/filters/date.ts
similarity index 100%
rename from src/lib/extension/core/filters/date.ts
rename to src/main/lib/extension/core/filters/date.ts
diff --git a/src/lib/extension/core/filters/default.ts b/src/main/lib/extension/core/filters/default.ts
similarity index 100%
rename from src/lib/extension/core/filters/default.ts
rename to src/main/lib/extension/core/filters/default.ts
diff --git a/src/lib/extension/core/filters/escape.ts b/src/main/lib/extension/core/filters/escape.ts
similarity index 100%
rename from src/lib/extension/core/filters/escape.ts
rename to src/main/lib/extension/core/filters/escape.ts
diff --git a/src/lib/extension/core/filters/filter.ts b/src/main/lib/extension/core/filters/filter.ts
similarity index 100%
rename from src/lib/extension/core/filters/filter.ts
rename to src/main/lib/extension/core/filters/filter.ts
diff --git a/src/lib/extension/core/filters/first.ts b/src/main/lib/extension/core/filters/first.ts
similarity index 100%
rename from src/lib/extension/core/filters/first.ts
rename to src/main/lib/extension/core/filters/first.ts
diff --git a/src/lib/extension/core/filters/format.ts b/src/main/lib/extension/core/filters/format.ts
similarity index 100%
rename from src/lib/extension/core/filters/format.ts
rename to src/main/lib/extension/core/filters/format.ts
diff --git a/src/lib/extension/core/filters/join.ts b/src/main/lib/extension/core/filters/join.ts
similarity index 100%
rename from src/lib/extension/core/filters/join.ts
rename to src/main/lib/extension/core/filters/join.ts
diff --git a/src/lib/extension/core/filters/json-encode.ts b/src/main/lib/extension/core/filters/json-encode.ts
similarity index 100%
rename from src/lib/extension/core/filters/json-encode.ts
rename to src/main/lib/extension/core/filters/json-encode.ts
diff --git a/src/lib/extension/core/filters/keys.ts b/src/main/lib/extension/core/filters/keys.ts
similarity index 100%
rename from src/lib/extension/core/filters/keys.ts
rename to src/main/lib/extension/core/filters/keys.ts
diff --git a/src/lib/extension/core/filters/last.ts b/src/main/lib/extension/core/filters/last.ts
similarity index 100%
rename from src/lib/extension/core/filters/last.ts
rename to src/main/lib/extension/core/filters/last.ts
diff --git a/src/lib/extension/core/filters/length.ts b/src/main/lib/extension/core/filters/length.ts
similarity index 100%
rename from src/lib/extension/core/filters/length.ts
rename to src/main/lib/extension/core/filters/length.ts
diff --git a/src/lib/extension/core/filters/lower.ts b/src/main/lib/extension/core/filters/lower.ts
similarity index 100%
rename from src/lib/extension/core/filters/lower.ts
rename to src/main/lib/extension/core/filters/lower.ts
diff --git a/src/lib/extension/core/filters/map.ts b/src/main/lib/extension/core/filters/map.ts
similarity index 100%
rename from src/lib/extension/core/filters/map.ts
rename to src/main/lib/extension/core/filters/map.ts
diff --git a/src/lib/extension/core/filters/merge.ts b/src/main/lib/extension/core/filters/merge.ts
similarity index 100%
rename from src/lib/extension/core/filters/merge.ts
rename to src/main/lib/extension/core/filters/merge.ts
diff --git a/src/lib/extension/core/filters/nl2br.ts b/src/main/lib/extension/core/filters/nl2br.ts
similarity index 100%
rename from src/lib/extension/core/filters/nl2br.ts
rename to src/main/lib/extension/core/filters/nl2br.ts
diff --git a/src/lib/extension/core/filters/number_format.ts b/src/main/lib/extension/core/filters/number_format.ts
similarity index 100%
rename from src/lib/extension/core/filters/number_format.ts
rename to src/main/lib/extension/core/filters/number_format.ts
diff --git a/src/lib/extension/core/filters/raw.ts b/src/main/lib/extension/core/filters/raw.ts
similarity index 100%
rename from src/lib/extension/core/filters/raw.ts
rename to src/main/lib/extension/core/filters/raw.ts
diff --git a/src/lib/extension/core/filters/reduce.ts b/src/main/lib/extension/core/filters/reduce.ts
similarity index 100%
rename from src/lib/extension/core/filters/reduce.ts
rename to src/main/lib/extension/core/filters/reduce.ts
diff --git a/src/lib/extension/core/filters/replace.ts b/src/main/lib/extension/core/filters/replace.ts
similarity index 100%
rename from src/lib/extension/core/filters/replace.ts
rename to src/main/lib/extension/core/filters/replace.ts
diff --git a/src/lib/extension/core/filters/reverse.ts b/src/main/lib/extension/core/filters/reverse.ts
similarity index 100%
rename from src/lib/extension/core/filters/reverse.ts
rename to src/main/lib/extension/core/filters/reverse.ts
diff --git a/src/lib/extension/core/filters/round.ts b/src/main/lib/extension/core/filters/round.ts
similarity index 100%
rename from src/lib/extension/core/filters/round.ts
rename to src/main/lib/extension/core/filters/round.ts
diff --git a/src/lib/extension/core/filters/slice.ts b/src/main/lib/extension/core/filters/slice.ts
similarity index 100%
rename from src/lib/extension/core/filters/slice.ts
rename to src/main/lib/extension/core/filters/slice.ts
diff --git a/src/lib/extension/core/filters/sort.ts b/src/main/lib/extension/core/filters/sort.ts
similarity index 100%
rename from src/lib/extension/core/filters/sort.ts
rename to src/main/lib/extension/core/filters/sort.ts
diff --git a/src/lib/extension/core/filters/spaceless.ts b/src/main/lib/extension/core/filters/spaceless.ts
similarity index 100%
rename from src/lib/extension/core/filters/spaceless.ts
rename to src/main/lib/extension/core/filters/spaceless.ts
diff --git a/src/lib/extension/core/filters/split.ts b/src/main/lib/extension/core/filters/split.ts
similarity index 100%
rename from src/lib/extension/core/filters/split.ts
rename to src/main/lib/extension/core/filters/split.ts
diff --git a/src/lib/extension/core/filters/striptags.ts b/src/main/lib/extension/core/filters/striptags.ts
similarity index 100%
rename from src/lib/extension/core/filters/striptags.ts
rename to src/main/lib/extension/core/filters/striptags.ts
diff --git a/src/lib/extension/core/filters/title.ts b/src/main/lib/extension/core/filters/title.ts
similarity index 100%
rename from src/lib/extension/core/filters/title.ts
rename to src/main/lib/extension/core/filters/title.ts
diff --git a/src/lib/extension/core/filters/trim.ts b/src/main/lib/extension/core/filters/trim.ts
similarity index 100%
rename from src/lib/extension/core/filters/trim.ts
rename to src/main/lib/extension/core/filters/trim.ts
diff --git a/src/lib/extension/core/filters/upper.ts b/src/main/lib/extension/core/filters/upper.ts
similarity index 100%
rename from src/lib/extension/core/filters/upper.ts
rename to src/main/lib/extension/core/filters/upper.ts
diff --git a/src/lib/extension/core/filters/url_encode.ts b/src/main/lib/extension/core/filters/url_encode.ts
similarity index 100%
rename from src/lib/extension/core/filters/url_encode.ts
rename to src/main/lib/extension/core/filters/url_encode.ts
diff --git a/src/lib/extension/core/functions/constant.ts b/src/main/lib/extension/core/functions/constant.ts
similarity index 100%
rename from src/lib/extension/core/functions/constant.ts
rename to src/main/lib/extension/core/functions/constant.ts
diff --git a/src/lib/extension/core/functions/cycle.ts b/src/main/lib/extension/core/functions/cycle.ts
similarity index 100%
rename from src/lib/extension/core/functions/cycle.ts
rename to src/main/lib/extension/core/functions/cycle.ts
diff --git a/src/lib/extension/core/functions/date.ts b/src/main/lib/extension/core/functions/date.ts
similarity index 100%
rename from src/lib/extension/core/functions/date.ts
rename to src/main/lib/extension/core/functions/date.ts
diff --git a/src/lib/extension/core/functions/dump.ts b/src/main/lib/extension/core/functions/dump.ts
similarity index 100%
rename from src/lib/extension/core/functions/dump.ts
rename to src/main/lib/extension/core/functions/dump.ts
diff --git a/src/lib/extension/core/functions/include.ts b/src/main/lib/extension/core/functions/include.ts
similarity index 100%
rename from src/lib/extension/core/functions/include.ts
rename to src/main/lib/extension/core/functions/include.ts
diff --git a/src/lib/extension/core/functions/max.ts b/src/main/lib/extension/core/functions/max.ts
similarity index 100%
rename from src/lib/extension/core/functions/max.ts
rename to src/main/lib/extension/core/functions/max.ts
diff --git a/src/lib/extension/core/functions/min.ts b/src/main/lib/extension/core/functions/min.ts
similarity index 100%
rename from src/lib/extension/core/functions/min.ts
rename to src/main/lib/extension/core/functions/min.ts
diff --git a/src/lib/extension/core/functions/random.ts b/src/main/lib/extension/core/functions/random.ts
similarity index 100%
rename from src/lib/extension/core/functions/random.ts
rename to src/main/lib/extension/core/functions/random.ts
diff --git a/src/lib/extension/core/functions/range.ts b/src/main/lib/extension/core/functions/range.ts
similarity index 100%
rename from src/lib/extension/core/functions/range.ts
rename to src/main/lib/extension/core/functions/range.ts
diff --git a/src/lib/extension/core/functions/source.ts b/src/main/lib/extension/core/functions/source.ts
similarity index 100%
rename from src/lib/extension/core/functions/source.ts
rename to src/main/lib/extension/core/functions/source.ts
diff --git a/src/lib/extension/core/functions/template-from-string.ts b/src/main/lib/extension/core/functions/template-from-string.ts
similarity index 100%
rename from src/lib/extension/core/functions/template-from-string.ts
rename to src/main/lib/extension/core/functions/template-from-string.ts
diff --git a/src/lib/extension/core/tests/is-constant.ts b/src/main/lib/extension/core/tests/is-constant.ts
similarity index 100%
rename from src/lib/extension/core/tests/is-constant.ts
rename to src/main/lib/extension/core/tests/is-constant.ts
diff --git a/src/lib/extension/core/tests/is-defined.ts b/src/main/lib/extension/core/tests/is-defined.ts
similarity index 100%
rename from src/lib/extension/core/tests/is-defined.ts
rename to src/main/lib/extension/core/tests/is-defined.ts
diff --git a/src/lib/extension/core/tests/is-divisible-by.ts b/src/main/lib/extension/core/tests/is-divisible-by.ts
similarity index 100%
rename from src/lib/extension/core/tests/is-divisible-by.ts
rename to src/main/lib/extension/core/tests/is-divisible-by.ts
diff --git a/src/lib/extension/core/tests/is-empty.ts b/src/main/lib/extension/core/tests/is-empty.ts
similarity index 100%
rename from src/lib/extension/core/tests/is-empty.ts
rename to src/main/lib/extension/core/tests/is-empty.ts
diff --git a/src/lib/extension/core/tests/is-even.ts b/src/main/lib/extension/core/tests/is-even.ts
similarity index 100%
rename from src/lib/extension/core/tests/is-even.ts
rename to src/main/lib/extension/core/tests/is-even.ts
diff --git a/src/lib/extension/core/tests/is-iterable.ts b/src/main/lib/extension/core/tests/is-iterable.ts
similarity index 100%
rename from src/lib/extension/core/tests/is-iterable.ts
rename to src/main/lib/extension/core/tests/is-iterable.ts
diff --git a/src/lib/extension/core/tests/is-null.ts b/src/main/lib/extension/core/tests/is-null.ts
similarity index 100%
rename from src/lib/extension/core/tests/is-null.ts
rename to src/main/lib/extension/core/tests/is-null.ts
diff --git a/src/lib/extension/core/tests/is-odd.ts b/src/main/lib/extension/core/tests/is-odd.ts
similarity index 100%
rename from src/lib/extension/core/tests/is-odd.ts
rename to src/main/lib/extension/core/tests/is-odd.ts
diff --git a/src/lib/extension/core/tests/is-same-as.ts b/src/main/lib/extension/core/tests/is-same-as.ts
similarity index 100%
rename from src/lib/extension/core/tests/is-same-as.ts
rename to src/main/lib/extension/core/tests/is-same-as.ts
diff --git a/src/lib/filter.ts b/src/main/lib/filter.ts
similarity index 100%
rename from src/lib/filter.ts
rename to src/main/lib/filter.ts
diff --git a/src/lib/function.ts b/src/main/lib/function.ts
similarity index 100%
rename from src/lib/function.ts
rename to src/main/lib/function.ts
diff --git a/src/lib/helpers/asort.ts b/src/main/lib/helpers/asort.ts
similarity index 100%
rename from src/lib/helpers/asort.ts
rename to src/main/lib/helpers/asort.ts
diff --git a/src/lib/helpers/chunk.ts b/src/main/lib/helpers/chunk.ts
similarity index 100%
rename from src/lib/helpers/chunk.ts
rename to src/main/lib/helpers/chunk.ts
diff --git a/src/lib/helpers/clone-map.ts b/src/main/lib/helpers/clone-map.ts
similarity index 100%
rename from src/lib/helpers/clone-map.ts
rename to src/main/lib/helpers/clone-map.ts
diff --git a/src/lib/helpers/compare.ts b/src/main/lib/helpers/compare.ts
similarity index 100%
rename from src/lib/helpers/compare.ts
rename to src/main/lib/helpers/compare.ts
diff --git a/src/lib/helpers/concatenate.ts b/src/main/lib/helpers/concatenate.ts
similarity index 100%
rename from src/lib/helpers/concatenate.ts
rename to src/main/lib/helpers/concatenate.ts
diff --git a/src/lib/helpers/count.ts b/src/main/lib/helpers/count.ts
similarity index 100%
rename from src/lib/helpers/count.ts
rename to src/main/lib/helpers/count.ts
diff --git a/src/lib/helpers/create-range.ts b/src/main/lib/helpers/create-range.ts
similarity index 100%
rename from src/lib/helpers/create-range.ts
rename to src/main/lib/helpers/create-range.ts
diff --git a/src/lib/helpers/ensure-traversable.ts b/src/main/lib/helpers/ensure-traversable.ts
similarity index 100%
rename from src/lib/helpers/ensure-traversable.ts
rename to src/main/lib/helpers/ensure-traversable.ts
diff --git a/src/lib/helpers/escape-value.ts b/src/main/lib/helpers/escape-value.ts
similarity index 100%
rename from src/lib/helpers/escape-value.ts
rename to src/main/lib/helpers/escape-value.ts
diff --git a/src/lib/helpers/evaluate.ts b/src/main/lib/helpers/evaluate.ts
similarity index 100%
rename from src/lib/helpers/evaluate.ts
rename to src/main/lib/helpers/evaluate.ts
diff --git a/src/lib/helpers/examine-object.ts b/src/main/lib/helpers/examine-object.ts
similarity index 100%
rename from src/lib/helpers/examine-object.ts
rename to src/main/lib/helpers/examine-object.ts
diff --git a/src/lib/helpers/fill-map.ts b/src/main/lib/helpers/fill-map.ts
similarity index 100%
rename from src/lib/helpers/fill-map.ts
rename to src/main/lib/helpers/fill-map.ts
diff --git a/src/lib/helpers/format-date-time.ts b/src/main/lib/helpers/format-date-time.ts
similarity index 100%
rename from src/lib/helpers/format-date-time.ts
rename to src/main/lib/helpers/format-date-time.ts
diff --git a/src/lib/helpers/format-duration.ts b/src/main/lib/helpers/format-duration.ts
similarity index 100%
rename from src/lib/helpers/format-duration.ts
rename to src/main/lib/helpers/format-duration.ts
diff --git a/src/lib/helpers/get-attribute.ts b/src/main/lib/helpers/get-attribute.ts
similarity index 100%
rename from src/lib/helpers/get-attribute.ts
rename to src/main/lib/helpers/get-attribute.ts
diff --git a/src/lib/helpers/get-constant.ts b/src/main/lib/helpers/get-constant.ts
similarity index 100%
rename from src/lib/helpers/get-constant.ts
rename to src/main/lib/helpers/get-constant.ts
diff --git a/src/lib/helpers/get-context-value.ts b/src/main/lib/helpers/get-context-value.ts
similarity index 100%
rename from src/lib/helpers/get-context-value.ts
rename to src/main/lib/helpers/get-context-value.ts
diff --git a/src/lib/helpers/get-filter.ts b/src/main/lib/helpers/get-filter.ts
similarity index 100%
rename from src/lib/helpers/get-filter.ts
rename to src/main/lib/helpers/get-filter.ts
diff --git a/src/lib/helpers/get-first-value.ts b/src/main/lib/helpers/get-first-value.ts
similarity index 100%
rename from src/lib/helpers/get-first-value.ts
rename to src/main/lib/helpers/get-first-value.ts
diff --git a/src/lib/helpers/get-function.ts b/src/main/lib/helpers/get-function.ts
similarity index 100%
rename from src/lib/helpers/get-function.ts
rename to src/main/lib/helpers/get-function.ts
diff --git a/src/lib/helpers/get-key-value-pairs.ts b/src/main/lib/helpers/get-key-value-pairs.ts
similarity index 100%
rename from src/lib/helpers/get-key-value-pairs.ts
rename to src/main/lib/helpers/get-key-value-pairs.ts
diff --git a/src/lib/helpers/get-test.ts b/src/main/lib/helpers/get-test.ts
similarity index 100%
rename from src/lib/helpers/get-test.ts
rename to src/main/lib/helpers/get-test.ts
diff --git a/src/lib/helpers/get.ts b/src/main/lib/helpers/get.ts
similarity index 100%
rename from src/lib/helpers/get.ts
rename to src/main/lib/helpers/get.ts
diff --git a/src/lib/helpers/iconv.ts b/src/main/lib/helpers/iconv.ts
similarity index 100%
rename from src/lib/helpers/iconv.ts
rename to src/main/lib/helpers/iconv.ts
diff --git a/src/lib/helpers/includes.ts b/src/main/lib/helpers/includes.ts
similarity index 100%
rename from src/lib/helpers/includes.ts
rename to src/main/lib/helpers/includes.ts
diff --git a/src/lib/helpers/is-in.ts b/src/main/lib/helpers/is-in.ts
similarity index 100%
rename from src/lib/helpers/is-in.ts
rename to src/main/lib/helpers/is-in.ts
diff --git a/src/lib/helpers/is-made-of-whitespace-only.ts b/src/main/lib/helpers/is-made-of-whitespace-only.ts
similarity index 100%
rename from src/lib/helpers/is-made-of-whitespace-only.ts
rename to src/main/lib/helpers/is-made-of-whitespace-only.ts
diff --git a/src/lib/helpers/is-plain-object.ts b/src/main/lib/helpers/is-plain-object.ts
similarity index 100%
rename from src/lib/helpers/is-plain-object.ts
rename to src/main/lib/helpers/is-plain-object.ts
diff --git a/src/lib/helpers/is-traversable.ts b/src/main/lib/helpers/is-traversable.ts
similarity index 100%
rename from src/lib/helpers/is-traversable.ts
rename to src/main/lib/helpers/is-traversable.ts
diff --git a/src/lib/helpers/iterate.ts b/src/main/lib/helpers/iterate.ts
similarity index 100%
rename from src/lib/helpers/iterate.ts
rename to src/main/lib/helpers/iterate.ts
diff --git a/src/lib/helpers/iterator-to-array.ts b/src/main/lib/helpers/iterator-to-array.ts
similarity index 100%
rename from src/lib/helpers/iterator-to-array.ts
rename to src/main/lib/helpers/iterator-to-array.ts
diff --git a/src/lib/helpers/iterator-to-hash.ts b/src/main/lib/helpers/iterator-to-hash.ts
similarity index 100%
rename from src/lib/helpers/iterator-to-hash.ts
rename to src/main/lib/helpers/iterator-to-hash.ts
diff --git a/src/lib/helpers/iterator-to-map.ts b/src/main/lib/helpers/iterator-to-map.ts
similarity index 100%
rename from src/lib/helpers/iterator-to-map.ts
rename to src/main/lib/helpers/iterator-to-map.ts
diff --git a/src/lib/helpers/ksort.ts b/src/main/lib/helpers/ksort.ts
similarity index 100%
rename from src/lib/helpers/ksort.ts
rename to src/main/lib/helpers/ksort.ts
diff --git a/src/lib/helpers/map-like.ts b/src/main/lib/helpers/map-like.ts
similarity index 100%
rename from src/lib/helpers/map-like.ts
rename to src/main/lib/helpers/map-like.ts
diff --git a/src/lib/helpers/merge-iterables.ts b/src/main/lib/helpers/merge-iterables.ts
similarity index 100%
rename from src/lib/helpers/merge-iterables.ts
rename to src/main/lib/helpers/merge-iterables.ts
diff --git a/src/lib/helpers/modify-date.ts b/src/main/lib/helpers/modify-date.ts
similarity index 100%
rename from src/lib/helpers/modify-date.ts
rename to src/main/lib/helpers/modify-date.ts
diff --git a/src/lib/helpers/parse-regular-expression.ts b/src/main/lib/helpers/parse-regular-expression.ts
similarity index 100%
rename from src/lib/helpers/parse-regular-expression.ts
rename to src/main/lib/helpers/parse-regular-expression.ts
diff --git a/src/lib/helpers/php.ts b/src/main/lib/helpers/php.ts
similarity index 100%
rename from src/lib/helpers/php.ts
rename to src/main/lib/helpers/php.ts
diff --git a/src/lib/helpers/record.ts b/src/main/lib/helpers/record.ts
similarity index 100%
rename from src/lib/helpers/record.ts
rename to src/main/lib/helpers/record.ts
diff --git a/src/lib/helpers/reverse.ts b/src/main/lib/helpers/reverse.ts
similarity index 100%
rename from src/lib/helpers/reverse.ts
rename to src/main/lib/helpers/reverse.ts
diff --git a/src/lib/helpers/slice-map.ts b/src/main/lib/helpers/slice-map.ts
similarity index 100%
rename from src/lib/helpers/slice-map.ts
rename to src/main/lib/helpers/slice-map.ts
diff --git a/src/lib/helpers/sort.ts b/src/main/lib/helpers/sort.ts
similarity index 100%
rename from src/lib/helpers/sort.ts
rename to src/main/lib/helpers/sort.ts
diff --git a/src/lib/helpers/traceable-method.ts b/src/main/lib/helpers/traceable-method.ts
similarity index 100%
rename from src/lib/helpers/traceable-method.ts
rename to src/main/lib/helpers/traceable-method.ts
diff --git a/src/lib/lexer.ts b/src/main/lib/lexer.ts
similarity index 100%
rename from src/lib/lexer.ts
rename to src/main/lib/lexer.ts
diff --git a/src/lib/loader.ts b/src/main/lib/loader.ts
similarity index 100%
rename from src/lib/loader.ts
rename to src/main/lib/loader.ts
diff --git a/src/lib/loader/array.ts b/src/main/lib/loader/array.ts
similarity index 100%
rename from src/lib/loader/array.ts
rename to src/main/lib/loader/array.ts
diff --git a/src/lib/loader/chain.ts b/src/main/lib/loader/chain.ts
similarity index 100%
rename from src/lib/loader/chain.ts
rename to src/main/lib/loader/chain.ts
diff --git a/src/lib/loader/filesystem.ts b/src/main/lib/loader/filesystem.ts
similarity index 100%
rename from src/lib/loader/filesystem.ts
rename to src/main/lib/loader/filesystem.ts
diff --git a/src/lib/markup.ts b/src/main/lib/markup.ts
similarity index 100%
rename from src/lib/markup.ts
rename to src/main/lib/markup.ts
diff --git a/src/lib/node-executor.ts b/src/main/lib/node-executor.ts
similarity index 100%
rename from src/lib/node-executor.ts
rename to src/main/lib/node-executor.ts
diff --git a/src/lib/node-executor/apply.ts b/src/main/lib/node-executor/apply.ts
similarity index 100%
rename from src/lib/node-executor/apply.ts
rename to src/main/lib/node-executor/apply.ts
diff --git a/src/lib/node-executor/base.ts b/src/main/lib/node-executor/base.ts
similarity index 100%
rename from src/lib/node-executor/base.ts
rename to src/main/lib/node-executor/base.ts
diff --git a/src/lib/node-executor/block-reference.ts b/src/main/lib/node-executor/block-reference.ts
similarity index 100%
rename from src/lib/node-executor/block-reference.ts
rename to src/main/lib/node-executor/block-reference.ts
diff --git a/src/lib/node-executor/check-security.ts b/src/main/lib/node-executor/check-security.ts
similarity index 100%
rename from src/lib/node-executor/check-security.ts
rename to src/main/lib/node-executor/check-security.ts
diff --git a/src/lib/node-executor/check-to-string.ts b/src/main/lib/node-executor/check-to-string.ts
similarity index 100%
rename from src/lib/node-executor/check-to-string.ts
rename to src/main/lib/node-executor/check-to-string.ts
diff --git a/src/lib/node-executor/comment.ts b/src/main/lib/node-executor/comment.ts
similarity index 100%
rename from src/lib/node-executor/comment.ts
rename to src/main/lib/node-executor/comment.ts
diff --git a/src/lib/node-executor/constant.ts b/src/main/lib/node-executor/constant.ts
similarity index 100%
rename from src/lib/node-executor/constant.ts
rename to src/main/lib/node-executor/constant.ts
diff --git a/src/lib/node-executor/deprecated.ts b/src/main/lib/node-executor/deprecated.ts
similarity index 100%
rename from src/lib/node-executor/deprecated.ts
rename to src/main/lib/node-executor/deprecated.ts
diff --git a/src/lib/node-executor/do.ts b/src/main/lib/node-executor/do.ts
similarity index 100%
rename from src/lib/node-executor/do.ts
rename to src/main/lib/node-executor/do.ts
diff --git a/src/lib/node-executor/expression/array.ts b/src/main/lib/node-executor/expression/array.ts
similarity index 100%
rename from src/lib/node-executor/expression/array.ts
rename to src/main/lib/node-executor/expression/array.ts
diff --git a/src/lib/node-executor/expression/arrow-function.ts b/src/main/lib/node-executor/expression/arrow-function.ts
similarity index 100%
rename from src/lib/node-executor/expression/arrow-function.ts
rename to src/main/lib/node-executor/expression/arrow-function.ts
diff --git a/src/lib/node-executor/expression/assignment.ts b/src/main/lib/node-executor/expression/assignment.ts
similarity index 100%
rename from src/lib/node-executor/expression/assignment.ts
rename to src/main/lib/node-executor/expression/assignment.ts
diff --git a/src/lib/node-executor/expression/attribute-accessor.ts b/src/main/lib/node-executor/expression/attribute-accessor.ts
similarity index 100%
rename from src/lib/node-executor/expression/attribute-accessor.ts
rename to src/main/lib/node-executor/expression/attribute-accessor.ts
diff --git a/src/lib/node-executor/expression/binary.ts b/src/main/lib/node-executor/expression/binary.ts
similarity index 100%
rename from src/lib/node-executor/expression/binary.ts
rename to src/main/lib/node-executor/expression/binary.ts
diff --git a/src/lib/node-executor/expression/block-function.ts b/src/main/lib/node-executor/expression/block-function.ts
similarity index 100%
rename from src/lib/node-executor/expression/block-function.ts
rename to src/main/lib/node-executor/expression/block-function.ts
diff --git a/src/lib/node-executor/expression/call.ts b/src/main/lib/node-executor/expression/call.ts
similarity index 100%
rename from src/lib/node-executor/expression/call.ts
rename to src/main/lib/node-executor/expression/call.ts
diff --git a/src/lib/node-executor/expression/conditional.ts b/src/main/lib/node-executor/expression/conditional.ts
similarity index 100%
rename from src/lib/node-executor/expression/conditional.ts
rename to src/main/lib/node-executor/expression/conditional.ts
diff --git a/src/lib/node-executor/expression/escape.ts b/src/main/lib/node-executor/expression/escape.ts
similarity index 100%
rename from src/lib/node-executor/expression/escape.ts
rename to src/main/lib/node-executor/expression/escape.ts
diff --git a/src/lib/node-executor/expression/hash.ts b/src/main/lib/node-executor/expression/hash.ts
similarity index 100%
rename from src/lib/node-executor/expression/hash.ts
rename to src/main/lib/node-executor/expression/hash.ts
diff --git a/src/lib/node-executor/expression/method-call.ts b/src/main/lib/node-executor/expression/method-call.ts
similarity index 100%
rename from src/lib/node-executor/expression/method-call.ts
rename to src/main/lib/node-executor/expression/method-call.ts
diff --git a/src/lib/node-executor/expression/name.ts b/src/main/lib/node-executor/expression/name.ts
similarity index 100%
rename from src/lib/node-executor/expression/name.ts
rename to src/main/lib/node-executor/expression/name.ts
diff --git a/src/lib/node-executor/expression/parent-function.ts b/src/main/lib/node-executor/expression/parent-function.ts
similarity index 100%
rename from src/lib/node-executor/expression/parent-function.ts
rename to src/main/lib/node-executor/expression/parent-function.ts
diff --git a/src/lib/node-executor/expression/spread.ts b/src/main/lib/node-executor/expression/spread.ts
similarity index 100%
rename from src/lib/node-executor/expression/spread.ts
rename to src/main/lib/node-executor/expression/spread.ts
diff --git a/src/lib/node-executor/expression/unary.ts b/src/main/lib/node-executor/expression/unary.ts
similarity index 100%
rename from src/lib/node-executor/expression/unary.ts
rename to src/main/lib/node-executor/expression/unary.ts
diff --git a/src/lib/node-executor/flush.ts b/src/main/lib/node-executor/flush.ts
similarity index 100%
rename from src/lib/node-executor/flush.ts
rename to src/main/lib/node-executor/flush.ts
diff --git a/src/lib/node-executor/for-loop.ts b/src/main/lib/node-executor/for-loop.ts
similarity index 100%
rename from src/lib/node-executor/for-loop.ts
rename to src/main/lib/node-executor/for-loop.ts
diff --git a/src/lib/node-executor/for.ts b/src/main/lib/node-executor/for.ts
similarity index 100%
rename from src/lib/node-executor/for.ts
rename to src/main/lib/node-executor/for.ts
diff --git a/src/lib/node-executor/if.ts b/src/main/lib/node-executor/if.ts
similarity index 100%
rename from src/lib/node-executor/if.ts
rename to src/main/lib/node-executor/if.ts
diff --git a/src/lib/node-executor/import.ts b/src/main/lib/node-executor/import.ts
similarity index 100%
rename from src/lib/node-executor/import.ts
rename to src/main/lib/node-executor/import.ts
diff --git a/src/lib/node-executor/include.ts b/src/main/lib/node-executor/include.ts
similarity index 100%
rename from src/lib/node-executor/include.ts
rename to src/main/lib/node-executor/include.ts
diff --git a/src/lib/node-executor/include/embed.ts b/src/main/lib/node-executor/include/embed.ts
similarity index 100%
rename from src/lib/node-executor/include/embed.ts
rename to src/main/lib/node-executor/include/embed.ts
diff --git a/src/lib/node-executor/include/include.ts b/src/main/lib/node-executor/include/include.ts
similarity index 100%
rename from src/lib/node-executor/include/include.ts
rename to src/main/lib/node-executor/include/include.ts
diff --git a/src/lib/node-executor/line.ts b/src/main/lib/node-executor/line.ts
similarity index 100%
rename from src/lib/node-executor/line.ts
rename to src/main/lib/node-executor/line.ts
diff --git a/src/lib/node-executor/print.ts b/src/main/lib/node-executor/print.ts
similarity index 100%
rename from src/lib/node-executor/print.ts
rename to src/main/lib/node-executor/print.ts
diff --git a/src/lib/node-executor/sandbox.ts b/src/main/lib/node-executor/sandbox.ts
similarity index 100%
rename from src/lib/node-executor/sandbox.ts
rename to src/main/lib/node-executor/sandbox.ts
diff --git a/src/lib/node-executor/set.ts b/src/main/lib/node-executor/set.ts
similarity index 100%
rename from src/lib/node-executor/set.ts
rename to src/main/lib/node-executor/set.ts
diff --git a/src/lib/node-executor/spaceless.ts b/src/main/lib/node-executor/spaceless.ts
similarity index 100%
rename from src/lib/node-executor/spaceless.ts
rename to src/main/lib/node-executor/spaceless.ts
diff --git a/src/lib/node-executor/template.ts b/src/main/lib/node-executor/template.ts
similarity index 100%
rename from src/lib/node-executor/template.ts
rename to src/main/lib/node-executor/template.ts
diff --git a/src/lib/node-executor/text.ts b/src/main/lib/node-executor/text.ts
similarity index 100%
rename from src/lib/node-executor/text.ts
rename to src/main/lib/node-executor/text.ts
diff --git a/src/lib/node-executor/with.ts b/src/main/lib/node-executor/with.ts
similarity index 100%
rename from src/lib/node-executor/with.ts
rename to src/main/lib/node-executor/with.ts
diff --git a/src/lib/node-traverser.ts b/src/main/lib/node-traverser.ts
similarity index 100%
rename from src/lib/node-traverser.ts
rename to src/main/lib/node-traverser.ts
diff --git a/src/lib/node-visitor.ts b/src/main/lib/node-visitor.ts
similarity index 100%
rename from src/lib/node-visitor.ts
rename to src/main/lib/node-visitor.ts
diff --git a/src/lib/node-visitor/core.ts b/src/main/lib/node-visitor/core.ts
similarity index 100%
rename from src/lib/node-visitor/core.ts
rename to src/main/lib/node-visitor/core.ts
diff --git a/src/lib/node-visitor/escaper.ts b/src/main/lib/node-visitor/escaper.ts
similarity index 100%
rename from src/lib/node-visitor/escaper.ts
rename to src/main/lib/node-visitor/escaper.ts
diff --git a/src/lib/node-visitor/sandbox.ts b/src/main/lib/node-visitor/sandbox.ts
similarity index 100%
rename from src/lib/node-visitor/sandbox.ts
rename to src/main/lib/node-visitor/sandbox.ts
diff --git a/src/lib/node.ts b/src/main/lib/node.ts
similarity index 100%
rename from src/lib/node.ts
rename to src/main/lib/node.ts
diff --git a/src/lib/node/apply.ts b/src/main/lib/node/apply.ts
similarity index 100%
rename from src/lib/node/apply.ts
rename to src/main/lib/node/apply.ts
diff --git a/src/lib/node/auto-escape.ts b/src/main/lib/node/auto-escape.ts
similarity index 100%
rename from src/lib/node/auto-escape.ts
rename to src/main/lib/node/auto-escape.ts
diff --git a/src/lib/node/block-reference.ts b/src/main/lib/node/block-reference.ts
similarity index 100%
rename from src/lib/node/block-reference.ts
rename to src/main/lib/node/block-reference.ts
diff --git a/src/lib/node/block.ts b/src/main/lib/node/block.ts
similarity index 100%
rename from src/lib/node/block.ts
rename to src/main/lib/node/block.ts
diff --git a/src/lib/node/check-security.ts b/src/main/lib/node/check-security.ts
similarity index 100%
rename from src/lib/node/check-security.ts
rename to src/main/lib/node/check-security.ts
diff --git a/src/lib/node/check-to-string.ts b/src/main/lib/node/check-to-string.ts
similarity index 100%
rename from src/lib/node/check-to-string.ts
rename to src/main/lib/node/check-to-string.ts
diff --git a/src/lib/node/comment.ts b/src/main/lib/node/comment.ts
similarity index 100%
rename from src/lib/node/comment.ts
rename to src/main/lib/node/comment.ts
diff --git a/src/lib/node/deprecated.ts b/src/main/lib/node/deprecated.ts
similarity index 100%
rename from src/lib/node/deprecated.ts
rename to src/main/lib/node/deprecated.ts
diff --git a/src/lib/node/do.ts b/src/main/lib/node/do.ts
similarity index 100%
rename from src/lib/node/do.ts
rename to src/main/lib/node/do.ts
diff --git a/src/lib/node/expression.ts b/src/main/lib/node/expression.ts
similarity index 100%
rename from src/lib/node/expression.ts
rename to src/main/lib/node/expression.ts
diff --git a/src/lib/node/expression/array.ts b/src/main/lib/node/expression/array.ts
similarity index 100%
rename from src/lib/node/expression/array.ts
rename to src/main/lib/node/expression/array.ts
diff --git a/src/lib/node/expression/arrow-function.ts b/src/main/lib/node/expression/arrow-function.ts
similarity index 100%
rename from src/lib/node/expression/arrow-function.ts
rename to src/main/lib/node/expression/arrow-function.ts
diff --git a/src/lib/node/expression/assignment.ts b/src/main/lib/node/expression/assignment.ts
similarity index 100%
rename from src/lib/node/expression/assignment.ts
rename to src/main/lib/node/expression/assignment.ts
diff --git a/src/lib/node/expression/attribute-accessor.ts b/src/main/lib/node/expression/attribute-accessor.ts
similarity index 100%
rename from src/lib/node/expression/attribute-accessor.ts
rename to src/main/lib/node/expression/attribute-accessor.ts
diff --git a/src/lib/node/expression/binary.ts b/src/main/lib/node/expression/binary.ts
similarity index 100%
rename from src/lib/node/expression/binary.ts
rename to src/main/lib/node/expression/binary.ts
diff --git a/src/lib/node/expression/binary/add.ts b/src/main/lib/node/expression/binary/add.ts
similarity index 100%
rename from src/lib/node/expression/binary/add.ts
rename to src/main/lib/node/expression/binary/add.ts
diff --git a/src/lib/node/expression/binary/and.ts b/src/main/lib/node/expression/binary/and.ts
similarity index 100%
rename from src/lib/node/expression/binary/and.ts
rename to src/main/lib/node/expression/binary/and.ts
diff --git a/src/lib/node/expression/binary/bitwise-and.ts b/src/main/lib/node/expression/binary/bitwise-and.ts
similarity index 100%
rename from src/lib/node/expression/binary/bitwise-and.ts
rename to src/main/lib/node/expression/binary/bitwise-and.ts
diff --git a/src/lib/node/expression/binary/bitwise-or.ts b/src/main/lib/node/expression/binary/bitwise-or.ts
similarity index 100%
rename from src/lib/node/expression/binary/bitwise-or.ts
rename to src/main/lib/node/expression/binary/bitwise-or.ts
diff --git a/src/lib/node/expression/binary/bitwise-xor.ts b/src/main/lib/node/expression/binary/bitwise-xor.ts
similarity index 100%
rename from src/lib/node/expression/binary/bitwise-xor.ts
rename to src/main/lib/node/expression/binary/bitwise-xor.ts
diff --git a/src/lib/node/expression/binary/concatenate.ts b/src/main/lib/node/expression/binary/concatenate.ts
similarity index 100%
rename from src/lib/node/expression/binary/concatenate.ts
rename to src/main/lib/node/expression/binary/concatenate.ts
diff --git a/src/lib/node/expression/binary/divide-and-floor.ts b/src/main/lib/node/expression/binary/divide-and-floor.ts
similarity index 100%
rename from src/lib/node/expression/binary/divide-and-floor.ts
rename to src/main/lib/node/expression/binary/divide-and-floor.ts
diff --git a/src/lib/node/expression/binary/divide.ts b/src/main/lib/node/expression/binary/divide.ts
similarity index 100%
rename from src/lib/node/expression/binary/divide.ts
rename to src/main/lib/node/expression/binary/divide.ts
diff --git a/src/lib/node/expression/binary/ends-with.ts b/src/main/lib/node/expression/binary/ends-with.ts
similarity index 100%
rename from src/lib/node/expression/binary/ends-with.ts
rename to src/main/lib/node/expression/binary/ends-with.ts
diff --git a/src/lib/node/expression/binary/has-every.ts b/src/main/lib/node/expression/binary/has-every.ts
similarity index 100%
rename from src/lib/node/expression/binary/has-every.ts
rename to src/main/lib/node/expression/binary/has-every.ts
diff --git a/src/lib/node/expression/binary/has-some.ts b/src/main/lib/node/expression/binary/has-some.ts
similarity index 100%
rename from src/lib/node/expression/binary/has-some.ts
rename to src/main/lib/node/expression/binary/has-some.ts
diff --git a/src/lib/node/expression/binary/is-equal-to.ts b/src/main/lib/node/expression/binary/is-equal-to.ts
similarity index 100%
rename from src/lib/node/expression/binary/is-equal-to.ts
rename to src/main/lib/node/expression/binary/is-equal-to.ts
diff --git a/src/lib/node/expression/binary/is-greater-than-or-equal-to.ts b/src/main/lib/node/expression/binary/is-greater-than-or-equal-to.ts
similarity index 100%
rename from src/lib/node/expression/binary/is-greater-than-or-equal-to.ts
rename to src/main/lib/node/expression/binary/is-greater-than-or-equal-to.ts
diff --git a/src/lib/node/expression/binary/is-greater-than.ts b/src/main/lib/node/expression/binary/is-greater-than.ts
similarity index 100%
rename from src/lib/node/expression/binary/is-greater-than.ts
rename to src/main/lib/node/expression/binary/is-greater-than.ts
diff --git a/src/lib/node/expression/binary/is-in.ts b/src/main/lib/node/expression/binary/is-in.ts
similarity index 100%
rename from src/lib/node/expression/binary/is-in.ts
rename to src/main/lib/node/expression/binary/is-in.ts
diff --git a/src/lib/node/expression/binary/is-less-than-or-equal-to.ts b/src/main/lib/node/expression/binary/is-less-than-or-equal-to.ts
similarity index 100%
rename from src/lib/node/expression/binary/is-less-than-or-equal-to.ts
rename to src/main/lib/node/expression/binary/is-less-than-or-equal-to.ts
diff --git a/src/lib/node/expression/binary/is-less-than.ts b/src/main/lib/node/expression/binary/is-less-than.ts
similarity index 100%
rename from src/lib/node/expression/binary/is-less-than.ts
rename to src/main/lib/node/expression/binary/is-less-than.ts
diff --git a/src/lib/node/expression/binary/is-not-equal-to.ts b/src/main/lib/node/expression/binary/is-not-equal-to.ts
similarity index 100%
rename from src/lib/node/expression/binary/is-not-equal-to.ts
rename to src/main/lib/node/expression/binary/is-not-equal-to.ts
diff --git a/src/lib/node/expression/binary/is-not-in.ts b/src/main/lib/node/expression/binary/is-not-in.ts
similarity index 100%
rename from src/lib/node/expression/binary/is-not-in.ts
rename to src/main/lib/node/expression/binary/is-not-in.ts
diff --git a/src/lib/node/expression/binary/matches.ts b/src/main/lib/node/expression/binary/matches.ts
similarity index 100%
rename from src/lib/node/expression/binary/matches.ts
rename to src/main/lib/node/expression/binary/matches.ts
diff --git a/src/lib/node/expression/binary/modulo.ts b/src/main/lib/node/expression/binary/modulo.ts
similarity index 100%
rename from src/lib/node/expression/binary/modulo.ts
rename to src/main/lib/node/expression/binary/modulo.ts
diff --git a/src/lib/node/expression/binary/multiply.ts b/src/main/lib/node/expression/binary/multiply.ts
similarity index 100%
rename from src/lib/node/expression/binary/multiply.ts
rename to src/main/lib/node/expression/binary/multiply.ts
diff --git a/src/lib/node/expression/binary/or.ts b/src/main/lib/node/expression/binary/or.ts
similarity index 100%
rename from src/lib/node/expression/binary/or.ts
rename to src/main/lib/node/expression/binary/or.ts
diff --git a/src/lib/node/expression/binary/power.ts b/src/main/lib/node/expression/binary/power.ts
similarity index 100%
rename from src/lib/node/expression/binary/power.ts
rename to src/main/lib/node/expression/binary/power.ts
diff --git a/src/lib/node/expression/binary/range.ts b/src/main/lib/node/expression/binary/range.ts
similarity index 100%
rename from src/lib/node/expression/binary/range.ts
rename to src/main/lib/node/expression/binary/range.ts
diff --git a/src/lib/node/expression/binary/spaceship.ts b/src/main/lib/node/expression/binary/spaceship.ts
similarity index 100%
rename from src/lib/node/expression/binary/spaceship.ts
rename to src/main/lib/node/expression/binary/spaceship.ts
diff --git a/src/lib/node/expression/binary/starts-with.ts b/src/main/lib/node/expression/binary/starts-with.ts
similarity index 100%
rename from src/lib/node/expression/binary/starts-with.ts
rename to src/main/lib/node/expression/binary/starts-with.ts
diff --git a/src/lib/node/expression/binary/subtract.ts b/src/main/lib/node/expression/binary/subtract.ts
similarity index 100%
rename from src/lib/node/expression/binary/subtract.ts
rename to src/main/lib/node/expression/binary/subtract.ts
diff --git a/src/lib/node/expression/block-function.ts b/src/main/lib/node/expression/block-function.ts
similarity index 100%
rename from src/lib/node/expression/block-function.ts
rename to src/main/lib/node/expression/block-function.ts
diff --git a/src/lib/node/expression/call.ts b/src/main/lib/node/expression/call.ts
similarity index 100%
rename from src/lib/node/expression/call.ts
rename to src/main/lib/node/expression/call.ts
diff --git a/src/lib/node/expression/call/filter.ts b/src/main/lib/node/expression/call/filter.ts
similarity index 100%
rename from src/lib/node/expression/call/filter.ts
rename to src/main/lib/node/expression/call/filter.ts
diff --git a/src/lib/node/expression/call/function.ts b/src/main/lib/node/expression/call/function.ts
similarity index 100%
rename from src/lib/node/expression/call/function.ts
rename to src/main/lib/node/expression/call/function.ts
diff --git a/src/lib/node/expression/call/test.ts b/src/main/lib/node/expression/call/test.ts
similarity index 100%
rename from src/lib/node/expression/call/test.ts
rename to src/main/lib/node/expression/call/test.ts
diff --git a/src/lib/node/expression/conditional.ts b/src/main/lib/node/expression/conditional.ts
similarity index 100%
rename from src/lib/node/expression/conditional.ts
rename to src/main/lib/node/expression/conditional.ts
diff --git a/src/lib/node/expression/constant.ts b/src/main/lib/node/expression/constant.ts
similarity index 100%
rename from src/lib/node/expression/constant.ts
rename to src/main/lib/node/expression/constant.ts
diff --git a/src/lib/node/expression/escape.ts b/src/main/lib/node/expression/escape.ts
similarity index 100%
rename from src/lib/node/expression/escape.ts
rename to src/main/lib/node/expression/escape.ts
diff --git a/src/lib/node/expression/hash.ts b/src/main/lib/node/expression/hash.ts
similarity index 100%
rename from src/lib/node/expression/hash.ts
rename to src/main/lib/node/expression/hash.ts
diff --git a/src/lib/node/expression/method-call.ts b/src/main/lib/node/expression/method-call.ts
similarity index 100%
rename from src/lib/node/expression/method-call.ts
rename to src/main/lib/node/expression/method-call.ts
diff --git a/src/lib/node/expression/name.ts b/src/main/lib/node/expression/name.ts
similarity index 100%
rename from src/lib/node/expression/name.ts
rename to src/main/lib/node/expression/name.ts
diff --git a/src/lib/node/expression/nullish-coalescing.ts b/src/main/lib/node/expression/nullish-coalescing.ts
similarity index 100%
rename from src/lib/node/expression/nullish-coalescing.ts
rename to src/main/lib/node/expression/nullish-coalescing.ts
diff --git a/src/lib/node/expression/parent-function.ts b/src/main/lib/node/expression/parent-function.ts
similarity index 100%
rename from src/lib/node/expression/parent-function.ts
rename to src/main/lib/node/expression/parent-function.ts
diff --git a/src/lib/node/expression/spread.ts b/src/main/lib/node/expression/spread.ts
similarity index 100%
rename from src/lib/node/expression/spread.ts
rename to src/main/lib/node/expression/spread.ts
diff --git a/src/lib/node/expression/unary.ts b/src/main/lib/node/expression/unary.ts
similarity index 100%
rename from src/lib/node/expression/unary.ts
rename to src/main/lib/node/expression/unary.ts
diff --git a/src/lib/node/expression/unary/negative.ts b/src/main/lib/node/expression/unary/negative.ts
similarity index 100%
rename from src/lib/node/expression/unary/negative.ts
rename to src/main/lib/node/expression/unary/negative.ts
diff --git a/src/lib/node/expression/unary/not.ts b/src/main/lib/node/expression/unary/not.ts
similarity index 100%
rename from src/lib/node/expression/unary/not.ts
rename to src/main/lib/node/expression/unary/not.ts
diff --git a/src/lib/node/expression/unary/positive.ts b/src/main/lib/node/expression/unary/positive.ts
similarity index 100%
rename from src/lib/node/expression/unary/positive.ts
rename to src/main/lib/node/expression/unary/positive.ts
diff --git a/src/lib/node/flush.ts b/src/main/lib/node/flush.ts
similarity index 100%
rename from src/lib/node/flush.ts
rename to src/main/lib/node/flush.ts
diff --git a/src/lib/node/for-loop.ts b/src/main/lib/node/for-loop.ts
similarity index 100%
rename from src/lib/node/for-loop.ts
rename to src/main/lib/node/for-loop.ts
diff --git a/src/lib/node/for.ts b/src/main/lib/node/for.ts
similarity index 100%
rename from src/lib/node/for.ts
rename to src/main/lib/node/for.ts
diff --git a/src/lib/node/if.ts b/src/main/lib/node/if.ts
similarity index 100%
rename from src/lib/node/if.ts
rename to src/main/lib/node/if.ts
diff --git a/src/lib/node/import.ts b/src/main/lib/node/import.ts
similarity index 100%
rename from src/lib/node/import.ts
rename to src/main/lib/node/import.ts
diff --git a/src/lib/node/include.ts b/src/main/lib/node/include.ts
similarity index 100%
rename from src/lib/node/include.ts
rename to src/main/lib/node/include.ts
diff --git a/src/lib/node/include/embed.ts b/src/main/lib/node/include/embed.ts
similarity index 100%
rename from src/lib/node/include/embed.ts
rename to src/main/lib/node/include/embed.ts
diff --git a/src/lib/node/include/include.ts b/src/main/lib/node/include/include.ts
similarity index 100%
rename from src/lib/node/include/include.ts
rename to src/main/lib/node/include/include.ts
diff --git a/src/lib/node/line.ts b/src/main/lib/node/line.ts
similarity index 100%
rename from src/lib/node/line.ts
rename to src/main/lib/node/line.ts
diff --git a/src/lib/node/macro.ts b/src/main/lib/node/macro.ts
similarity index 100%
rename from src/lib/node/macro.ts
rename to src/main/lib/node/macro.ts
diff --git a/src/lib/node/print.ts b/src/main/lib/node/print.ts
similarity index 100%
rename from src/lib/node/print.ts
rename to src/main/lib/node/print.ts
diff --git a/src/lib/node/sandbox.ts b/src/main/lib/node/sandbox.ts
similarity index 100%
rename from src/lib/node/sandbox.ts
rename to src/main/lib/node/sandbox.ts
diff --git a/src/lib/node/set.ts b/src/main/lib/node/set.ts
similarity index 100%
rename from src/lib/node/set.ts
rename to src/main/lib/node/set.ts
diff --git a/src/lib/node/spaceless.ts b/src/main/lib/node/spaceless.ts
similarity index 100%
rename from src/lib/node/spaceless.ts
rename to src/main/lib/node/spaceless.ts
diff --git a/src/lib/node/template.ts b/src/main/lib/node/template.ts
similarity index 100%
rename from src/lib/node/template.ts
rename to src/main/lib/node/template.ts
diff --git a/src/lib/node/text.ts b/src/main/lib/node/text.ts
similarity index 100%
rename from src/lib/node/text.ts
rename to src/main/lib/node/text.ts
diff --git a/src/lib/node/trait.ts b/src/main/lib/node/trait.ts
similarity index 100%
rename from src/lib/node/trait.ts
rename to src/main/lib/node/trait.ts
diff --git a/src/lib/node/use.ts b/src/main/lib/node/use.ts
similarity index 100%
rename from src/lib/node/use.ts
rename to src/main/lib/node/use.ts
diff --git a/src/lib/node/verbatim.ts b/src/main/lib/node/verbatim.ts
similarity index 100%
rename from src/lib/node/verbatim.ts
rename to src/main/lib/node/verbatim.ts
diff --git a/src/lib/node/with.ts b/src/main/lib/node/with.ts
similarity index 100%
rename from src/lib/node/with.ts
rename to src/main/lib/node/with.ts
diff --git a/src/lib/operator.ts b/src/main/lib/operator.ts
similarity index 100%
rename from src/lib/operator.ts
rename to src/main/lib/operator.ts
diff --git a/src/lib/output-buffer.ts b/src/main/lib/output-buffer.ts
similarity index 100%
rename from src/lib/output-buffer.ts
rename to src/main/lib/output-buffer.ts
diff --git a/src/lib/parser.ts b/src/main/lib/parser.ts
similarity index 100%
rename from src/lib/parser.ts
rename to src/main/lib/parser.ts
diff --git a/src/lib/sandbox/security-policy.ts b/src/main/lib/sandbox/security-policy.ts
similarity index 100%
rename from src/lib/sandbox/security-policy.ts
rename to src/main/lib/sandbox/security-policy.ts
diff --git a/src/lib/source-map-runtime.ts b/src/main/lib/source-map-runtime.ts
similarity index 100%
rename from src/lib/source-map-runtime.ts
rename to src/main/lib/source-map-runtime.ts
diff --git a/src/lib/source.ts b/src/main/lib/source.ts
similarity index 100%
rename from src/lib/source.ts
rename to src/main/lib/source.ts
diff --git a/src/lib/tag-handler.ts b/src/main/lib/tag-handler.ts
similarity index 100%
rename from src/lib/tag-handler.ts
rename to src/main/lib/tag-handler.ts
diff --git a/src/lib/tag-handler/apply.ts b/src/main/lib/tag-handler/apply.ts
similarity index 100%
rename from src/lib/tag-handler/apply.ts
rename to src/main/lib/tag-handler/apply.ts
diff --git a/src/lib/tag-handler/auto-escape.ts b/src/main/lib/tag-handler/auto-escape.ts
similarity index 100%
rename from src/lib/tag-handler/auto-escape.ts
rename to src/main/lib/tag-handler/auto-escape.ts
diff --git a/src/lib/tag-handler/block.ts b/src/main/lib/tag-handler/block.ts
similarity index 100%
rename from src/lib/tag-handler/block.ts
rename to src/main/lib/tag-handler/block.ts
diff --git a/src/lib/tag-handler/deprecated.ts b/src/main/lib/tag-handler/deprecated.ts
similarity index 100%
rename from src/lib/tag-handler/deprecated.ts
rename to src/main/lib/tag-handler/deprecated.ts
diff --git a/src/lib/tag-handler/do.ts b/src/main/lib/tag-handler/do.ts
similarity index 100%
rename from src/lib/tag-handler/do.ts
rename to src/main/lib/tag-handler/do.ts
diff --git a/src/lib/tag-handler/embed.ts b/src/main/lib/tag-handler/embed.ts
similarity index 100%
rename from src/lib/tag-handler/embed.ts
rename to src/main/lib/tag-handler/embed.ts
diff --git a/src/lib/tag-handler/extends.ts b/src/main/lib/tag-handler/extends.ts
similarity index 100%
rename from src/lib/tag-handler/extends.ts
rename to src/main/lib/tag-handler/extends.ts
diff --git a/src/lib/tag-handler/filter.ts b/src/main/lib/tag-handler/filter.ts
similarity index 100%
rename from src/lib/tag-handler/filter.ts
rename to src/main/lib/tag-handler/filter.ts
diff --git a/src/lib/tag-handler/flush.ts b/src/main/lib/tag-handler/flush.ts
similarity index 100%
rename from src/lib/tag-handler/flush.ts
rename to src/main/lib/tag-handler/flush.ts
diff --git a/src/lib/tag-handler/for.ts b/src/main/lib/tag-handler/for.ts
similarity index 100%
rename from src/lib/tag-handler/for.ts
rename to src/main/lib/tag-handler/for.ts
diff --git a/src/lib/tag-handler/from.ts b/src/main/lib/tag-handler/from.ts
similarity index 100%
rename from src/lib/tag-handler/from.ts
rename to src/main/lib/tag-handler/from.ts
diff --git a/src/lib/tag-handler/if.ts b/src/main/lib/tag-handler/if.ts
similarity index 100%
rename from src/lib/tag-handler/if.ts
rename to src/main/lib/tag-handler/if.ts
diff --git a/src/lib/tag-handler/import.ts b/src/main/lib/tag-handler/import.ts
similarity index 100%
rename from src/lib/tag-handler/import.ts
rename to src/main/lib/tag-handler/import.ts
diff --git a/src/lib/tag-handler/include.ts b/src/main/lib/tag-handler/include.ts
similarity index 100%
rename from src/lib/tag-handler/include.ts
rename to src/main/lib/tag-handler/include.ts
diff --git a/src/lib/tag-handler/line.ts b/src/main/lib/tag-handler/line.ts
similarity index 100%
rename from src/lib/tag-handler/line.ts
rename to src/main/lib/tag-handler/line.ts
diff --git a/src/lib/tag-handler/macro.ts b/src/main/lib/tag-handler/macro.ts
similarity index 100%
rename from src/lib/tag-handler/macro.ts
rename to src/main/lib/tag-handler/macro.ts
diff --git a/src/lib/tag-handler/sandbox.ts b/src/main/lib/tag-handler/sandbox.ts
similarity index 100%
rename from src/lib/tag-handler/sandbox.ts
rename to src/main/lib/tag-handler/sandbox.ts
diff --git a/src/lib/tag-handler/set.ts b/src/main/lib/tag-handler/set.ts
similarity index 100%
rename from src/lib/tag-handler/set.ts
rename to src/main/lib/tag-handler/set.ts
diff --git a/src/lib/tag-handler/spaceless.ts b/src/main/lib/tag-handler/spaceless.ts
similarity index 100%
rename from src/lib/tag-handler/spaceless.ts
rename to src/main/lib/tag-handler/spaceless.ts
diff --git a/src/lib/tag-handler/use.ts b/src/main/lib/tag-handler/use.ts
similarity index 100%
rename from src/lib/tag-handler/use.ts
rename to src/main/lib/tag-handler/use.ts
diff --git a/src/lib/tag-handler/verbatim.ts b/src/main/lib/tag-handler/verbatim.ts
similarity index 100%
rename from src/lib/tag-handler/verbatim.ts
rename to src/main/lib/tag-handler/verbatim.ts
diff --git a/src/lib/tag-handler/with.ts b/src/main/lib/tag-handler/with.ts
similarity index 100%
rename from src/lib/tag-handler/with.ts
rename to src/main/lib/tag-handler/with.ts
diff --git a/src/lib/template-loader.ts b/src/main/lib/template-loader.ts
similarity index 93%
rename from src/lib/template-loader.ts
rename to src/main/lib/template-loader.ts
index 11142735..cd5e5527 100644
--- a/src/lib/template-loader.ts
+++ b/src/main/lib/template-loader.ts
@@ -8,12 +8,12 @@ import type {TwingEnvironment} from "./environment";
  * @param name The name of the template to load
  * @param from The name of the template that requested the load
  */
-export type TwingTemplateLoader = (name: string, from?: string | null) => Promise<TwingTemplate | null>;
+export type TwingTemplateLoader = (name: string, from: string | null) => Promise<TwingTemplate | null>;
 
 export const createTemplateLoader = (environment: TwingEnvironment): TwingTemplateLoader => {
     const registry: Map<string, TwingTemplate> = new Map();
 
-    return async (name, from = null) => {
+    return async (name, from) => {
         const {loader} = environment;
 
         let templateFqn = await loader.resolve(name, from) || name;
diff --git a/src/lib/template.ts b/src/main/lib/template.ts
similarity index 99%
rename from src/lib/template.ts
rename to src/main/lib/template.ts
index fa402399..0afb21a9 100644
--- a/src/lib/template.ts
+++ b/src/main/lib/template.ts
@@ -81,7 +81,7 @@ export interface TwingTemplate {
              * When set to `true`, accessing invalid variables triggers an error.
              */
             strict?: boolean;
-            templateLoader?: TwingTemplateLoader
+            templateLoader?: TwingTemplateLoader;
         }
     ): Promise<void>;
 
@@ -121,6 +121,7 @@ export interface TwingTemplate {
              * When set to `true`, accessing invalid variables triggers an error.
              */
             strict?: boolean;
+            templateLoader?: TwingTemplateLoader;
         }
     ): Promise<string>;
 }
diff --git a/src/lib/test.ts b/src/main/lib/test.ts
similarity index 100%
rename from src/lib/test.ts
rename to src/main/lib/test.ts
diff --git a/src/lib/token-stream.ts b/src/main/lib/token-stream.ts
similarity index 100%
rename from src/lib/token-stream.ts
rename to src/main/lib/token-stream.ts
diff --git a/src/main/tsconfig.json b/src/main/tsconfig.json
new file mode 100644
index 00000000..8be62d5a
--- /dev/null
+++ b/src/main/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "lib.ts"
+  ]
+}
\ No newline at end of file
diff --git a/test/helpers/node.ts b/src/test/helpers/node.ts
similarity index 98%
rename from test/helpers/node.ts
rename to src/test/helpers/node.ts
index 0409ec53..61d326ce 100644
--- a/test/helpers/node.ts
+++ b/src/test/helpers/node.ts
@@ -1,4 +1,4 @@
-import {getChildren, getChildrenCount, TwingBaseNode} from "../../src/lib/node";
+import {getChildren, getChildrenCount, TwingBaseNode} from "../../main/lib/node";
 
 const var_export = require('locutus/php/var/var_export');
 
diff --git a/test/helpers/string.ts b/src/test/helpers/string.ts
similarity index 100%
rename from test/helpers/string.ts
rename to src/test/helpers/string.ts
diff --git a/test/index.ts b/src/test/index.ts
similarity index 100%
rename from test/index.ts
rename to src/test/index.ts
diff --git a/test/tests/index.ts b/src/test/tests/index.ts
similarity index 100%
rename from test/tests/index.ts
rename to src/test/tests/index.ts
diff --git a/test/tests/integration/TestBase.ts b/src/test/tests/integration/TestBase.ts
similarity index 94%
rename from test/tests/integration/TestBase.ts
rename to src/test/tests/integration/TestBase.ts
index 15cb0a45..b4a62814 100644
--- a/test/tests/integration/TestBase.ts
+++ b/src/test/tests/integration/TestBase.ts
@@ -1,21 +1,21 @@
 import * as tape from 'tape';
 import {SinonStub, stub} from 'sinon';
-import {createEnvironment, TwingEnvironmentOptions} from "../../../src/lib/environment";
-import {createPrintNode} from "../../../src/lib/node/print";
-import {createConstantNode} from "../../../src/lib/node/expression/constant";
-import {TwingExtension} from "../../../src/lib/extension";
-import {createFilter} from "../../../src/lib/filter";
-import {createFunction} from "../../../src/lib/function";
-import {createTest} from "../../../src/lib/test";
-import {createSandboxSecurityPolicy} from "../../../src/lib/sandbox/security-policy";
-import {createArrayLoader} from "../../../src/lib/loader/array";
-import {escape} from "../../../src/lib/extension/core/filters/escape";
+import {createEnvironment, TwingEnvironmentOptions} from "../../../main/lib/environment";
+import {createPrintNode} from "../../../main/lib/node/print";
+import {createConstantNode} from "../../../main/lib/node/expression/constant";
+import {TwingExtension} from "../../../main/lib/extension";
+import {createFilter} from "../../../main/lib/filter";
+import {createFunction} from "../../../main/lib/function";
+import {createTest} from "../../../main/lib/test";
+import {createSandboxSecurityPolicy} from "../../../main/lib/sandbox/security-policy";
+import {createArrayLoader} from "../../../main/lib/loader/array";
+import {escape} from "../../../main/lib/extension/core/filters/escape";
 import {IntegrationTest} from "./test";
-import {TwingTagHandler} from "../../../src/lib/tag-handler";
+import {TwingTagHandler} from "../../../main/lib/tag-handler";
 import {MappingItem, RawSourceMap, SourceMapConsumer} from "source-map";
-import {TwingLoader} from "../../../src/lib/loader";
+import {TwingLoader} from "../../../main/lib/loader";
 import {Settings} from "luxon";
-import type {TwingExecutionContext} from "../../../src/lib/execution-context";
+import type {TwingExecutionContext} from "../../../main/lib/execution-context";
 
 const createSectionTokenParser = (): TwingTagHandler => {
     return {
diff --git a/test/tests/integration/comments/empty.ts b/src/test/tests/integration/comments/empty.ts
similarity index 100%
rename from test/tests/integration/comments/empty.ts
rename to src/test/tests/integration/comments/empty.ts
diff --git a/test/tests/integration/comments/index.ts b/src/test/tests/integration/comments/index.ts
similarity index 100%
rename from test/tests/integration/comments/index.ts
rename to src/test/tests/integration/comments/index.ts
diff --git a/test/tests/integration/comments/non-empty.ts b/src/test/tests/integration/comments/non-empty.ts
similarity index 100%
rename from test/tests/integration/comments/non-empty.ts
rename to src/test/tests/integration/comments/non-empty.ts
diff --git a/test/tests/integration/comparison/index.ts b/src/test/tests/integration/comparison/index.ts
similarity index 100%
rename from test/tests/integration/comparison/index.ts
rename to src/test/tests/integration/comparison/index.ts
diff --git a/test/tests/integration/comparison/to-array.ts b/src/test/tests/integration/comparison/to-array.ts
similarity index 100%
rename from test/tests/integration/comparison/to-array.ts
rename to src/test/tests/integration/comparison/to-array.ts
diff --git a/test/tests/integration/comparison/to-boolean.ts b/src/test/tests/integration/comparison/to-boolean.ts
similarity index 100%
rename from test/tests/integration/comparison/to-boolean.ts
rename to src/test/tests/integration/comparison/to-boolean.ts
diff --git a/test/tests/integration/comparison/to-buffer.ts b/src/test/tests/integration/comparison/to-buffer.ts
similarity index 100%
rename from test/tests/integration/comparison/to-buffer.ts
rename to src/test/tests/integration/comparison/to-buffer.ts
diff --git a/test/tests/integration/comparison/to-datetime.ts b/src/test/tests/integration/comparison/to-datetime.ts
similarity index 100%
rename from test/tests/integration/comparison/to-datetime.ts
rename to src/test/tests/integration/comparison/to-datetime.ts
diff --git a/test/tests/integration/comparison/to-markup.ts b/src/test/tests/integration/comparison/to-markup.ts
similarity index 100%
rename from test/tests/integration/comparison/to-markup.ts
rename to src/test/tests/integration/comparison/to-markup.ts
diff --git a/test/tests/integration/comparison/to-null.ts b/src/test/tests/integration/comparison/to-null.ts
similarity index 100%
rename from test/tests/integration/comparison/to-null.ts
rename to src/test/tests/integration/comparison/to-null.ts
diff --git a/test/tests/integration/comparison/to-number.ts b/src/test/tests/integration/comparison/to-number.ts
similarity index 100%
rename from test/tests/integration/comparison/to-number.ts
rename to src/test/tests/integration/comparison/to-number.ts
diff --git a/test/tests/integration/comparison/to-object.ts b/src/test/tests/integration/comparison/to-object.ts
similarity index 100%
rename from test/tests/integration/comparison/to-object.ts
rename to src/test/tests/integration/comparison/to-object.ts
diff --git a/test/tests/integration/comparison/to-string.ts b/src/test/tests/integration/comparison/to-string.ts
similarity index 100%
rename from test/tests/integration/comparison/to-string.ts
rename to src/test/tests/integration/comparison/to-string.ts
diff --git a/test/tests/integration/compatibility/backtick.ts b/src/test/tests/integration/compatibility/backtick.ts
similarity index 100%
rename from test/tests/integration/compatibility/backtick.ts
rename to src/test/tests/integration/compatibility/backtick.ts
diff --git a/test/tests/integration/compatibility/bypass_nodes_containing_only_a_bom.ts b/src/test/tests/integration/compatibility/bypass_nodes_containing_only_a_bom.ts
similarity index 100%
rename from test/tests/integration/compatibility/bypass_nodes_containing_only_a_bom.ts
rename to src/test/tests/integration/compatibility/bypass_nodes_containing_only_a_bom.ts
diff --git a/test/tests/integration/compatibility/escaped_characters.ts b/src/test/tests/integration/compatibility/escaped_characters.ts
similarity index 100%
rename from test/tests/integration/compatibility/escaped_characters.ts
rename to src/test/tests/integration/compatibility/escaped_characters.ts
diff --git a/test/tests/integration/compatibility/index.ts b/src/test/tests/integration/compatibility/index.ts
similarity index 100%
rename from test/tests/integration/compatibility/index.ts
rename to src/test/tests/integration/compatibility/index.ts
diff --git a/test/tests/integration/compatibility/new_lines.ts b/src/test/tests/integration/compatibility/new_lines.ts
similarity index 100%
rename from test/tests/integration/compatibility/new_lines.ts
rename to src/test/tests/integration/compatibility/new_lines.ts
diff --git a/test/tests/integration/deprecation/deprecated-filter.ts b/src/test/tests/integration/deprecation/deprecated-filter.ts
similarity index 96%
rename from test/tests/integration/deprecation/deprecated-filter.ts
rename to src/test/tests/integration/deprecation/deprecated-filter.ts
index 57c1d4c2..c439784e 100644
--- a/test/tests/integration/deprecation/deprecated-filter.ts
+++ b/src/test/tests/integration/deprecation/deprecated-filter.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {createFilter} from "../../../../src/lib/filter";
+import {createFilter} from "../../../../main/lib/filter";
 
 runTest({
     description: 'deprecated filter',
diff --git a/test/tests/integration/deprecation/deprecated-function.ts b/src/test/tests/integration/deprecation/deprecated-function.ts
similarity index 95%
rename from test/tests/integration/deprecation/deprecated-function.ts
rename to src/test/tests/integration/deprecation/deprecated-function.ts
index 66857605..22a94ad9 100644
--- a/test/tests/integration/deprecation/deprecated-function.ts
+++ b/src/test/tests/integration/deprecation/deprecated-function.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {createFunction} from "../../../../src/lib/function";
+import {createFunction} from "../../../../main/lib/function";
 
 runTest({
     description: 'deprecated function',
diff --git a/test/tests/integration/deprecation/index.ts b/src/test/tests/integration/deprecation/index.ts
similarity index 100%
rename from test/tests/integration/deprecation/index.ts
rename to src/test/tests/integration/deprecation/index.ts
diff --git a/test/tests/integration/errors/child_contents_outside_blocks.ts b/src/test/tests/integration/errors/child_contents_outside_blocks.ts
similarity index 100%
rename from test/tests/integration/errors/child_contents_outside_blocks.ts
rename to src/test/tests/integration/errors/child_contents_outside_blocks.ts
diff --git a/test/tests/integration/errors/default_value_is_not_a_constant.ts b/src/test/tests/integration/errors/default_value_is_not_a_constant.ts
similarity index 100%
rename from test/tests/integration/errors/default_value_is_not_a_constant.ts
rename to src/test/tests/integration/errors/default_value_is_not_a_constant.ts
diff --git a/test/tests/integration/errors/index.ts b/src/test/tests/integration/errors/index.ts
similarity index 100%
rename from test/tests/integration/errors/index.ts
rename to src/test/tests/integration/errors/index.ts
diff --git a/test/tests/integration/errors/malformed_arguments.ts b/src/test/tests/integration/errors/malformed_arguments.ts
similarity index 100%
rename from test/tests/integration/errors/malformed_arguments.ts
rename to src/test/tests/integration/errors/malformed_arguments.ts
diff --git a/test/tests/integration/errors/multiline_array_with_undefined_variable.ts b/src/test/tests/integration/errors/multiline_array_with_undefined_variable.ts
similarity index 100%
rename from test/tests/integration/errors/multiline_array_with_undefined_variable.ts
rename to src/test/tests/integration/errors/multiline_array_with_undefined_variable.ts
diff --git a/test/tests/integration/errors/multiline_array_with_undefined_variable_again.ts b/src/test/tests/integration/errors/multiline_array_with_undefined_variable_again.ts
similarity index 100%
rename from test/tests/integration/errors/multiline_array_with_undefined_variable_again.ts
rename to src/test/tests/integration/errors/multiline_array_with_undefined_variable_again.ts
diff --git a/test/tests/integration/errors/multiline_function_with_undefined_variable.ts b/src/test/tests/integration/errors/multiline_function_with_undefined_variable.ts
similarity index 100%
rename from test/tests/integration/errors/multiline_function_with_undefined_variable.ts
rename to src/test/tests/integration/errors/multiline_function_with_undefined_variable.ts
diff --git a/test/tests/integration/errors/multiline_function_with_unknown_argument.ts b/src/test/tests/integration/errors/multiline_function_with_unknown_argument.ts
similarity index 100%
rename from test/tests/integration/errors/multiline_function_with_unknown_argument.ts
rename to src/test/tests/integration/errors/multiline_function_with_unknown_argument.ts
diff --git a/test/tests/integration/errors/multiline_tag_with_undefined_variable.ts b/src/test/tests/integration/errors/multiline_tag_with_undefined_variable.ts
similarity index 100%
rename from test/tests/integration/errors/multiline_tag_with_undefined_variable.ts
rename to src/test/tests/integration/errors/multiline_tag_with_undefined_variable.ts
diff --git a/test/tests/integration/errors/parent-block-called-with-no-parent.ts b/src/test/tests/integration/errors/parent-block-called-with-no-parent.ts
similarity index 100%
rename from test/tests/integration/errors/parent-block-called-with-no-parent.ts
rename to src/test/tests/integration/errors/parent-block-called-with-no-parent.ts
diff --git a/test/tests/integration/errors/strict_comparison_operator_equal.ts b/src/test/tests/integration/errors/strict_comparison_operator_equal.ts
similarity index 100%
rename from test/tests/integration/errors/strict_comparison_operator_equal.ts
rename to src/test/tests/integration/errors/strict_comparison_operator_equal.ts
diff --git a/test/tests/integration/errors/strict_comparison_operator_not_equal.ts b/src/test/tests/integration/errors/strict_comparison_operator_not_equal.ts
similarity index 100%
rename from test/tests/integration/errors/strict_comparison_operator_not_equal.ts
rename to src/test/tests/integration/errors/strict_comparison_operator_not_equal.ts
diff --git a/test/tests/integration/errors/syntax_error_in_reused_template.ts b/src/test/tests/integration/errors/syntax_error_in_reused_template.ts
similarity index 100%
rename from test/tests/integration/errors/syntax_error_in_reused_template.ts
rename to src/test/tests/integration/errors/syntax_error_in_reused_template.ts
diff --git a/test/tests/integration/errors/syntax_error_unknown_function.ts b/src/test/tests/integration/errors/syntax_error_unknown_function.ts
similarity index 100%
rename from test/tests/integration/errors/syntax_error_unknown_function.ts
rename to src/test/tests/integration/errors/syntax_error_unknown_function.ts
diff --git a/test/tests/integration/errors/syntax_error_unknown_tag.ts b/src/test/tests/integration/errors/syntax_error_unknown_tag.ts
similarity index 100%
rename from test/tests/integration/errors/syntax_error_unknown_tag.ts
rename to src/test/tests/integration/errors/syntax_error_unknown_tag.ts
diff --git a/test/tests/integration/errors/unclosed_tag.ts b/src/test/tests/integration/errors/unclosed_tag.ts
similarity index 100%
rename from test/tests/integration/errors/unclosed_tag.ts
rename to src/test/tests/integration/errors/unclosed_tag.ts
diff --git a/test/tests/integration/errors/undefined_parent.ts b/src/test/tests/integration/errors/undefined_parent.ts
similarity index 100%
rename from test/tests/integration/errors/undefined_parent.ts
rename to src/test/tests/integration/errors/undefined_parent.ts
diff --git a/test/tests/integration/errors/undefined_template_in_child_template.ts b/src/test/tests/integration/errors/undefined_template_in_child_template.ts
similarity index 100%
rename from test/tests/integration/errors/undefined_template_in_child_template.ts
rename to src/test/tests/integration/errors/undefined_template_in_child_template.ts
diff --git a/test/tests/integration/errors/undefined_trait.ts b/src/test/tests/integration/errors/undefined_trait.ts
similarity index 100%
rename from test/tests/integration/errors/undefined_trait.ts
rename to src/test/tests/integration/errors/undefined_trait.ts
diff --git a/test/tests/integration/exceptions/index.ts b/src/test/tests/integration/exceptions/index.ts
similarity index 100%
rename from test/tests/integration/exceptions/index.ts
rename to src/test/tests/integration/exceptions/index.ts
diff --git a/test/tests/integration/exceptions/method-exceptions-are-caught.ts b/src/test/tests/integration/exceptions/method-exceptions-are-caught.ts
similarity index 100%
rename from test/tests/integration/exceptions/method-exceptions-are-caught.ts
rename to src/test/tests/integration/exceptions/method-exceptions-are-caught.ts
diff --git a/test/tests/integration/expressions/_self.ts b/src/test/tests/integration/expressions/_self.ts
similarity index 100%
rename from test/tests/integration/expressions/_self.ts
rename to src/test/tests/integration/expressions/_self.ts
diff --git a/test/tests/integration/expressions/array-call/array-call.ts b/src/test/tests/integration/expressions/array-call/array-call.ts
similarity index 100%
rename from test/tests/integration/expressions/array-call/array-call.ts
rename to src/test/tests/integration/expressions/array-call/array-call.ts
diff --git a/test/tests/integration/expressions/array-call/honors-runtime-strict-variables-setting.ts b/src/test/tests/integration/expressions/array-call/honors-runtime-strict-variables-setting.ts
similarity index 94%
rename from test/tests/integration/expressions/array-call/honors-runtime-strict-variables-setting.ts
rename to src/test/tests/integration/expressions/array-call/honors-runtime-strict-variables-setting.ts
index 16802a3f..12794cae 100644
--- a/test/tests/integration/expressions/array-call/honors-runtime-strict-variables-setting.ts
+++ b/src/test/tests/integration/expressions/array-call/honors-runtime-strict-variables-setting.ts
@@ -1,6 +1,6 @@
 import {runTest} from "../../TestBase";
-import {TwingCache} from "../../../../../src/lib/cache";
-import {TwingTemplateNode} from "../../../../../src/lib/node/template";
+import {TwingCache} from "../../../../../main/lib/cache";
+import {TwingTemplateNode} from "../../../../../main/lib/node/template";
 
 const createCache = (): TwingCache => {
     const container = new Map<string, TwingTemplateNode>();
diff --git a/test/tests/integration/expressions/array-call/index.ts b/src/test/tests/integration/expressions/array-call/index.ts
similarity index 100%
rename from test/tests/integration/expressions/array-call/index.ts
rename to src/test/tests/integration/expressions/array-call/index.ts
diff --git a/test/tests/integration/expressions/array-call/with-boolean-as-attribute.ts b/src/test/tests/integration/expressions/array-call/with-boolean-as-attribute.ts
similarity index 100%
rename from test/tests/integration/expressions/array-call/with-boolean-as-attribute.ts
rename to src/test/tests/integration/expressions/array-call/with-boolean-as-attribute.ts
diff --git a/test/tests/integration/expressions/array-call/with-float-as-attribute.ts b/src/test/tests/integration/expressions/array-call/with-float-as-attribute.ts
similarity index 100%
rename from test/tests/integration/expressions/array-call/with-float-as-attribute.ts
rename to src/test/tests/integration/expressions/array-call/with-float-as-attribute.ts
diff --git a/test/tests/integration/expressions/array.ts b/src/test/tests/integration/expressions/array.ts
similarity index 100%
rename from test/tests/integration/expressions/array.ts
rename to src/test/tests/integration/expressions/array.ts
diff --git a/test/tests/integration/expressions/array/index.ts b/src/test/tests/integration/expressions/array/index.ts
similarity index 100%
rename from test/tests/integration/expressions/array/index.ts
rename to src/test/tests/integration/expressions/array/index.ts
diff --git a/test/tests/integration/expressions/array/nested.ts b/src/test/tests/integration/expressions/array/nested.ts
similarity index 100%
rename from test/tests/integration/expressions/array/nested.ts
rename to src/test/tests/integration/expressions/array/nested.ts
diff --git a/test/tests/integration/expressions/arrow/index.ts b/src/test/tests/integration/expressions/arrow/index.ts
similarity index 100%
rename from test/tests/integration/expressions/arrow/index.ts
rename to src/test/tests/integration/expressions/arrow/index.ts
diff --git a/test/tests/integration/expressions/arrow/long-syntax.ts b/src/test/tests/integration/expressions/arrow/long-syntax.ts
similarity index 100%
rename from test/tests/integration/expressions/arrow/long-syntax.ts
rename to src/test/tests/integration/expressions/arrow/long-syntax.ts
diff --git a/test/tests/integration/expressions/arrow/short-syntax.ts b/src/test/tests/integration/expressions/arrow/short-syntax.ts
similarity index 100%
rename from test/tests/integration/expressions/arrow/short-syntax.ts
rename to src/test/tests/integration/expressions/arrow/short-syntax.ts
diff --git a/test/tests/integration/expressions/attribute-call/as-a-defined-test-operand.ts b/src/test/tests/integration/expressions/attribute-call/as-a-defined-test-operand.ts
similarity index 100%
rename from test/tests/integration/expressions/attribute-call/as-a-defined-test-operand.ts
rename to src/test/tests/integration/expressions/attribute-call/as-a-defined-test-operand.ts
diff --git a/test/tests/integration/expressions/attribute-call/class-instance-getter.ts b/src/test/tests/integration/expressions/attribute-call/class-instance-getter.ts
similarity index 100%
rename from test/tests/integration/expressions/attribute-call/class-instance-getter.ts
rename to src/test/tests/integration/expressions/attribute-call/class-instance-getter.ts
diff --git a/test/tests/integration/expressions/attribute-call/honors-runtime-sandbox-setting.ts b/src/test/tests/integration/expressions/attribute-call/honors-runtime-sandbox-setting.ts
similarity index 86%
rename from test/tests/integration/expressions/attribute-call/honors-runtime-sandbox-setting.ts
rename to src/test/tests/integration/expressions/attribute-call/honors-runtime-sandbox-setting.ts
index febb52b1..774853d9 100644
--- a/test/tests/integration/expressions/attribute-call/honors-runtime-sandbox-setting.ts
+++ b/src/test/tests/integration/expressions/attribute-call/honors-runtime-sandbox-setting.ts
@@ -1,7 +1,7 @@
 import {runTest} from "../../TestBase";
-import {TwingCache} from "../../../../../src/lib/cache";
-import {createSandboxSecurityPolicy} from "../../../../../src/lib/sandbox/security-policy";
-import {TwingTemplateNode} from "../../../../../src/lib/node/template";
+import {TwingCache} from "../../../../../main/lib/cache";
+import {createSandboxSecurityPolicy} from "../../../../../main/lib/sandbox/security-policy";
+import {TwingTemplateNode} from "../../../../../main/lib/node/template";
 
 const createCache = (): TwingCache => {
     const container = new Map<string, TwingTemplateNode>();
diff --git a/test/tests/integration/expressions/attribute-call/honors-runtime-strict-variables-setting.ts b/src/test/tests/integration/expressions/attribute-call/honors-runtime-strict-variables-setting.ts
similarity index 95%
rename from test/tests/integration/expressions/attribute-call/honors-runtime-strict-variables-setting.ts
rename to src/test/tests/integration/expressions/attribute-call/honors-runtime-strict-variables-setting.ts
index f98f07e9..ea306b6f 100644
--- a/test/tests/integration/expressions/attribute-call/honors-runtime-strict-variables-setting.ts
+++ b/src/test/tests/integration/expressions/attribute-call/honors-runtime-strict-variables-setting.ts
@@ -1,6 +1,6 @@
 import {runTest} from "../../TestBase";
-import {TwingCache} from "../../../../../src/lib/cache";
-import {TwingTemplateNode} from "../../../../../src/lib";
+import {TwingCache} from "../../../../../main/lib/cache";
+import {TwingTemplateNode} from "../../../../../main/lib";
 
 const createCache = (): TwingCache => {
     const container = new Map<string, TwingTemplateNode>();
diff --git a/test/tests/integration/expressions/attribute-call/index.ts b/src/test/tests/integration/expressions/attribute-call/index.ts
similarity index 100%
rename from test/tests/integration/expressions/attribute-call/index.ts
rename to src/test/tests/integration/expressions/attribute-call/index.ts
diff --git a/test/tests/integration/expressions/attribute-call/on-context-when-missing.ts b/src/test/tests/integration/expressions/attribute-call/on-context-when-missing.ts
similarity index 100%
rename from test/tests/integration/expressions/attribute-call/on-context-when-missing.ts
rename to src/test/tests/integration/expressions/attribute-call/on-context-when-missing.ts
diff --git a/test/tests/integration/expressions/attribute-call/on-hash-when-missing.ts b/src/test/tests/integration/expressions/attribute-call/on-hash-when-missing.ts
similarity index 100%
rename from test/tests/integration/expressions/attribute-call/on-hash-when-missing.ts
rename to src/test/tests/integration/expressions/attribute-call/on-hash-when-missing.ts
diff --git a/test/tests/integration/expressions/binary.ts b/src/test/tests/integration/expressions/binary.ts
similarity index 100%
rename from test/tests/integration/expressions/binary.ts
rename to src/test/tests/integration/expressions/binary.ts
diff --git a/test/tests/integration/expressions/bitwise.ts b/src/test/tests/integration/expressions/bitwise.ts
similarity index 100%
rename from test/tests/integration/expressions/bitwise.ts
rename to src/test/tests/integration/expressions/bitwise.ts
diff --git a/test/tests/integration/expressions/comparison.ts b/src/test/tests/integration/expressions/comparison.ts
similarity index 100%
rename from test/tests/integration/expressions/comparison.ts
rename to src/test/tests/integration/expressions/comparison.ts
diff --git a/test/tests/integration/expressions/concatenation.ts b/src/test/tests/integration/expressions/concatenation.ts
similarity index 100%
rename from test/tests/integration/expressions/concatenation.ts
rename to src/test/tests/integration/expressions/concatenation.ts
diff --git a/test/tests/integration/expressions/divisibleby.ts b/src/test/tests/integration/expressions/divisibleby.ts
similarity index 100%
rename from test/tests/integration/expressions/divisibleby.ts
rename to src/test/tests/integration/expressions/divisibleby.ts
diff --git a/test/tests/integration/expressions/dotdot.ts b/src/test/tests/integration/expressions/dotdot.ts
similarity index 100%
rename from test/tests/integration/expressions/dotdot.ts
rename to src/test/tests/integration/expressions/dotdot.ts
diff --git a/test/tests/integration/expressions/ends_with.ts b/src/test/tests/integration/expressions/ends_with.ts
similarity index 100%
rename from test/tests/integration/expressions/ends_with.ts
rename to src/test/tests/integration/expressions/ends_with.ts
diff --git a/test/tests/integration/expressions/grouping.ts b/src/test/tests/integration/expressions/grouping.ts
similarity index 100%
rename from test/tests/integration/expressions/grouping.ts
rename to src/test/tests/integration/expressions/grouping.ts
diff --git a/test/tests/integration/expressions/hash/hash.ts b/src/test/tests/integration/expressions/hash/hash.ts
similarity index 100%
rename from test/tests/integration/expressions/hash/hash.ts
rename to src/test/tests/integration/expressions/hash/hash.ts
diff --git a/test/tests/integration/expressions/hash/index.ts b/src/test/tests/integration/expressions/hash/index.ts
similarity index 100%
rename from test/tests/integration/expressions/hash/index.ts
rename to src/test/tests/integration/expressions/hash/index.ts
diff --git a/test/tests/integration/expressions/hash/invalid-key.ts b/src/test/tests/integration/expressions/hash/invalid-key.ts
similarity index 100%
rename from test/tests/integration/expressions/hash/invalid-key.ts
rename to src/test/tests/integration/expressions/hash/invalid-key.ts
diff --git a/test/tests/integration/expressions/hash/with-value-only.ts b/src/test/tests/integration/expressions/hash/with-value-only.ts
similarity index 100%
rename from test/tests/integration/expressions/hash/with-value-only.ts
rename to src/test/tests/integration/expressions/hash/with-value-only.ts
diff --git a/test/tests/integration/expressions/index.ts b/src/test/tests/integration/expressions/index.ts
similarity index 100%
rename from test/tests/integration/expressions/index.ts
rename to src/test/tests/integration/expressions/index.ts
diff --git a/test/tests/integration/expressions/literals.ts b/src/test/tests/integration/expressions/literals.ts
similarity index 100%
rename from test/tests/integration/expressions/literals.ts
rename to src/test/tests/integration/expressions/literals.ts
diff --git a/test/tests/integration/expressions/matches.ts b/src/test/tests/integration/expressions/matches.ts
similarity index 100%
rename from test/tests/integration/expressions/matches.ts
rename to src/test/tests/integration/expressions/matches.ts
diff --git a/test/tests/integration/expressions/method-call/as-a-defined-test-operand.ts b/src/test/tests/integration/expressions/method-call/as-a-defined-test-operand.ts
similarity index 100%
rename from test/tests/integration/expressions/method-call/as-a-defined-test-operand.ts
rename to src/test/tests/integration/expressions/method-call/as-a-defined-test-operand.ts
diff --git a/test/tests/integration/expressions/method-call/honors-runtime-sandbox-setting.ts b/src/test/tests/integration/expressions/method-call/honors-runtime-sandbox-setting.ts
similarity index 86%
rename from test/tests/integration/expressions/method-call/honors-runtime-sandbox-setting.ts
rename to src/test/tests/integration/expressions/method-call/honors-runtime-sandbox-setting.ts
index 09194a0a..62fcd040 100644
--- a/test/tests/integration/expressions/method-call/honors-runtime-sandbox-setting.ts
+++ b/src/test/tests/integration/expressions/method-call/honors-runtime-sandbox-setting.ts
@@ -1,7 +1,7 @@
 import {runTest} from "../../TestBase";
-import {TwingCache} from "../../../../../src/lib/cache";
-import {createSandboxSecurityPolicy} from "../../../../../src/lib/sandbox/security-policy";
-import {TwingTemplateNode} from "../../../../../src/lib/node/template";
+import {TwingCache} from "../../../../../main/lib/cache";
+import {createSandboxSecurityPolicy} from "../../../../../main/lib/sandbox/security-policy";
+import {TwingTemplateNode} from "../../../../../main/lib/node/template";
 
 const createCache = (): TwingCache => {
     const container = new Map<string, TwingTemplateNode>();
diff --git a/test/tests/integration/expressions/method-call/honors-runtime-strict-variables-setting.ts b/src/test/tests/integration/expressions/method-call/honors-runtime-strict-variables-setting.ts
similarity index 93%
rename from test/tests/integration/expressions/method-call/honors-runtime-strict-variables-setting.ts
rename to src/test/tests/integration/expressions/method-call/honors-runtime-strict-variables-setting.ts
index 69b0092f..c507c07f 100644
--- a/test/tests/integration/expressions/method-call/honors-runtime-strict-variables-setting.ts
+++ b/src/test/tests/integration/expressions/method-call/honors-runtime-strict-variables-setting.ts
@@ -1,6 +1,6 @@
 import {runTest} from "../../TestBase";
-import {TwingCache} from "../../../../../src/lib/cache";
-import {TwingTemplateNode} from "../../../../../src/lib/node/template";
+import {TwingCache} from "../../../../../main/lib/cache";
+import {TwingTemplateNode} from "../../../../../main/lib/node/template";
 
 const createCache = (): TwingCache => {
     const container = new Map<string, TwingTemplateNode>();
diff --git a/test/tests/integration/expressions/method-call/index.ts b/src/test/tests/integration/expressions/method-call/index.ts
similarity index 100%
rename from test/tests/integration/expressions/method-call/index.ts
rename to src/test/tests/integration/expressions/method-call/index.ts
diff --git a/test/tests/integration/expressions/method-call/method-call.ts b/src/test/tests/integration/expressions/method-call/method-call.ts
similarity index 100%
rename from test/tests/integration/expressions/method-call/method-call.ts
rename to src/test/tests/integration/expressions/method-call/method-call.ts
diff --git a/test/tests/integration/expressions/negative_numbers.ts b/src/test/tests/integration/expressions/negative_numbers.ts
similarity index 100%
rename from test/tests/integration/expressions/negative_numbers.ts
rename to src/test/tests/integration/expressions/negative_numbers.ts
diff --git a/test/tests/integration/expressions/nullish_coalescing.ts b/src/test/tests/integration/expressions/nullish_coalescing.ts
similarity index 100%
rename from test/tests/integration/expressions/nullish_coalescing.ts
rename to src/test/tests/integration/expressions/nullish_coalescing.ts
diff --git a/test/tests/integration/expressions/operators_as_variables.ts b/src/test/tests/integration/expressions/operators_as_variables.ts
similarity index 100%
rename from test/tests/integration/expressions/operators_as_variables.ts
rename to src/test/tests/integration/expressions/operators_as_variables.ts
diff --git a/test/tests/integration/expressions/postfix.ts b/src/test/tests/integration/expressions/postfix.ts
similarity index 100%
rename from test/tests/integration/expressions/postfix.ts
rename to src/test/tests/integration/expressions/postfix.ts
diff --git a/test/tests/integration/expressions/power.ts b/src/test/tests/integration/expressions/power.ts
similarity index 100%
rename from test/tests/integration/expressions/power.ts
rename to src/test/tests/integration/expressions/power.ts
diff --git a/test/tests/integration/expressions/same_as.ts b/src/test/tests/integration/expressions/same_as.ts
similarity index 100%
rename from test/tests/integration/expressions/same_as.ts
rename to src/test/tests/integration/expressions/same_as.ts
diff --git a/test/tests/integration/expressions/spread-operator/does-not-spread-in-other-contexts.ts b/src/test/tests/integration/expressions/spread-operator/does-not-spread-in-other-contexts.ts
similarity index 100%
rename from test/tests/integration/expressions/spread-operator/does-not-spread-in-other-contexts.ts
rename to src/test/tests/integration/expressions/spread-operator/does-not-spread-in-other-contexts.ts
diff --git a/test/tests/integration/expressions/spread-operator/index.ts b/src/test/tests/integration/expressions/spread-operator/index.ts
similarity index 100%
rename from test/tests/integration/expressions/spread-operator/index.ts
rename to src/test/tests/integration/expressions/spread-operator/index.ts
diff --git a/test/tests/integration/expressions/spread-operator/spreads-into-arrays.ts b/src/test/tests/integration/expressions/spread-operator/spreads-into-arrays.ts
similarity index 100%
rename from test/tests/integration/expressions/spread-operator/spreads-into-arrays.ts
rename to src/test/tests/integration/expressions/spread-operator/spreads-into-arrays.ts
diff --git a/test/tests/integration/expressions/spread-operator/spreads-into-hashes.ts b/src/test/tests/integration/expressions/spread-operator/spreads-into-hashes.ts
similarity index 100%
rename from test/tests/integration/expressions/spread-operator/spreads-into-hashes.ts
rename to src/test/tests/integration/expressions/spread-operator/spreads-into-hashes.ts
diff --git a/test/tests/integration/expressions/starts_with.ts b/src/test/tests/integration/expressions/starts_with.ts
similarity index 100%
rename from test/tests/integration/expressions/starts_with.ts
rename to src/test/tests/integration/expressions/starts_with.ts
diff --git a/test/tests/integration/expressions/string_operator_as_var_assignment.ts b/src/test/tests/integration/expressions/string_operator_as_var_assignment.ts
similarity index 100%
rename from test/tests/integration/expressions/string_operator_as_var_assignment.ts
rename to src/test/tests/integration/expressions/string_operator_as_var_assignment.ts
diff --git a/test/tests/integration/expressions/strings.ts b/src/test/tests/integration/expressions/strings.ts
similarity index 100%
rename from test/tests/integration/expressions/strings.ts
rename to src/test/tests/integration/expressions/strings.ts
diff --git a/test/tests/integration/expressions/subscript/index.ts b/src/test/tests/integration/expressions/subscript/index.ts
similarity index 100%
rename from test/tests/integration/expressions/subscript/index.ts
rename to src/test/tests/integration/expressions/subscript/index.ts
diff --git a/test/tests/integration/expressions/subscript/missing-sub-part.ts b/src/test/tests/integration/expressions/subscript/missing-sub-part.ts
similarity index 100%
rename from test/tests/integration/expressions/subscript/missing-sub-part.ts
rename to src/test/tests/integration/expressions/subscript/missing-sub-part.ts
diff --git a/test/tests/integration/expressions/ternary/index.ts b/src/test/tests/integration/expressions/ternary/index.ts
similarity index 100%
rename from test/tests/integration/expressions/ternary/index.ts
rename to src/test/tests/integration/expressions/ternary/index.ts
diff --git a/test/tests/integration/expressions/ternary/ternary_operator.ts b/src/test/tests/integration/expressions/ternary/ternary_operator.ts
similarity index 100%
rename from test/tests/integration/expressions/ternary/ternary_operator.ts
rename to src/test/tests/integration/expressions/ternary/ternary_operator.ts
diff --git a/test/tests/integration/expressions/ternary/ternary_operator_noelse.ts b/src/test/tests/integration/expressions/ternary/ternary_operator_noelse.ts
similarity index 100%
rename from test/tests/integration/expressions/ternary/ternary_operator_noelse.ts
rename to src/test/tests/integration/expressions/ternary/ternary_operator_noelse.ts
diff --git a/test/tests/integration/expressions/ternary/ternary_operator_nothen.ts b/src/test/tests/integration/expressions/ternary/ternary_operator_nothen.ts
similarity index 100%
rename from test/tests/integration/expressions/ternary/ternary_operator_nothen.ts
rename to src/test/tests/integration/expressions/ternary/ternary_operator_nothen.ts
diff --git a/test/tests/integration/expressions/two_words_operators_as_variables.ts b/src/test/tests/integration/expressions/two_words_operators_as_variables.ts
similarity index 100%
rename from test/tests/integration/expressions/two_words_operators_as_variables.ts
rename to src/test/tests/integration/expressions/two_words_operators_as_variables.ts
diff --git a/test/tests/integration/expressions/unary.ts b/src/test/tests/integration/expressions/unary.ts
similarity index 100%
rename from test/tests/integration/expressions/unary.ts
rename to src/test/tests/integration/expressions/unary.ts
diff --git a/test/tests/integration/expressions/unary_macro_arguments.ts b/src/test/tests/integration/expressions/unary_macro_arguments.ts
similarity index 100%
rename from test/tests/integration/expressions/unary_macro_arguments.ts
rename to src/test/tests/integration/expressions/unary_macro_arguments.ts
diff --git a/test/tests/integration/expressions/unary_precedence.ts b/src/test/tests/integration/expressions/unary_precedence.ts
similarity index 100%
rename from test/tests/integration/expressions/unary_precedence.ts
rename to src/test/tests/integration/expressions/unary_precedence.ts
diff --git a/test/tests/integration/extensions/anonymous_functions.ts b/src/test/tests/integration/extensions/anonymous_functions.ts
similarity index 100%
rename from test/tests/integration/extensions/anonymous_functions.ts
rename to src/test/tests/integration/extensions/anonymous_functions.ts
diff --git a/test/tests/integration/extensions/index.ts b/src/test/tests/integration/extensions/index.ts
similarity index 100%
rename from test/tests/integration/extensions/index.ts
rename to src/test/tests/integration/extensions/index.ts
diff --git a/test/tests/integration/extensions/node-visitor.ts b/src/test/tests/integration/extensions/node-visitor.ts
similarity index 91%
rename from test/tests/integration/extensions/node-visitor.ts
rename to src/test/tests/integration/extensions/node-visitor.ts
index ebcf9852..e773322d 100644
--- a/test/tests/integration/extensions/node-visitor.ts
+++ b/src/test/tests/integration/extensions/node-visitor.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {TwingNode} from "../../../../src/lib/node";
+import {TwingNode} from "../../../../main/lib/node";
 
 runTest({
     description: "Supports custom node visitors",
diff --git a/test/tests/integration/filters/abs/abs.ts b/src/test/tests/integration/filters/abs/abs.ts
similarity index 100%
rename from test/tests/integration/filters/abs/abs.ts
rename to src/test/tests/integration/filters/abs/abs.ts
diff --git a/test/tests/integration/filters/abs/index.ts b/src/test/tests/integration/filters/abs/index.ts
similarity index 100%
rename from test/tests/integration/filters/abs/index.ts
rename to src/test/tests/integration/filters/abs/index.ts
diff --git a/test/tests/integration/filters/batch/batch.ts b/src/test/tests/integration/filters/batch/batch.ts
similarity index 100%
rename from test/tests/integration/filters/batch/batch.ts
rename to src/test/tests/integration/filters/batch/batch.ts
diff --git a/test/tests/integration/filters/batch/batch_float.ts b/src/test/tests/integration/filters/batch/batch_float.ts
similarity index 100%
rename from test/tests/integration/filters/batch/batch_float.ts
rename to src/test/tests/integration/filters/batch/batch_float.ts
diff --git a/test/tests/integration/filters/batch/batch_on_undefined.ts b/src/test/tests/integration/filters/batch/batch_on_undefined.ts
similarity index 100%
rename from test/tests/integration/filters/batch/batch_on_undefined.ts
rename to src/test/tests/integration/filters/batch/batch_on_undefined.ts
diff --git a/test/tests/integration/filters/batch/batch_with_empty_fill.ts b/src/test/tests/integration/filters/batch/batch_with_empty_fill.ts
similarity index 100%
rename from test/tests/integration/filters/batch/batch_with_empty_fill.ts
rename to src/test/tests/integration/filters/batch/batch_with_empty_fill.ts
diff --git a/test/tests/integration/filters/batch/batch_with_exact_elements.ts b/src/test/tests/integration/filters/batch/batch_with_exact_elements.ts
similarity index 100%
rename from test/tests/integration/filters/batch/batch_with_exact_elements.ts
rename to src/test/tests/integration/filters/batch/batch_with_exact_elements.ts
diff --git a/test/tests/integration/filters/batch/batch_with_fill.ts b/src/test/tests/integration/filters/batch/batch_with_fill.ts
similarity index 100%
rename from test/tests/integration/filters/batch/batch_with_fill.ts
rename to src/test/tests/integration/filters/batch/batch_with_fill.ts
diff --git a/test/tests/integration/filters/batch/batch_with_keys.ts b/src/test/tests/integration/filters/batch/batch_with_keys.ts
similarity index 100%
rename from test/tests/integration/filters/batch/batch_with_keys.ts
rename to src/test/tests/integration/filters/batch/batch_with_keys.ts
diff --git a/test/tests/integration/filters/batch/batch_with_more_elements.ts b/src/test/tests/integration/filters/batch/batch_with_more_elements.ts
similarity index 100%
rename from test/tests/integration/filters/batch/batch_with_more_elements.ts
rename to src/test/tests/integration/filters/batch/batch_with_more_elements.ts
diff --git a/test/tests/integration/filters/batch/batch_with_zero_elements.ts b/src/test/tests/integration/filters/batch/batch_with_zero_elements.ts
similarity index 100%
rename from test/tests/integration/filters/batch/batch_with_zero_elements.ts
rename to src/test/tests/integration/filters/batch/batch_with_zero_elements.ts
diff --git a/test/tests/integration/filters/batch/index.ts b/src/test/tests/integration/filters/batch/index.ts
similarity index 100%
rename from test/tests/integration/filters/batch/index.ts
rename to src/test/tests/integration/filters/batch/index.ts
diff --git a/test/tests/integration/filters/capitalize.ts b/src/test/tests/integration/filters/capitalize.ts
similarity index 100%
rename from test/tests/integration/filters/capitalize.ts
rename to src/test/tests/integration/filters/capitalize.ts
diff --git a/test/tests/integration/filters/column/basic.ts b/src/test/tests/integration/filters/column/basic.ts
similarity index 100%
rename from test/tests/integration/filters/column/basic.ts
rename to src/test/tests/integration/filters/column/basic.ts
diff --git a/test/tests/integration/filters/column/index.ts b/src/test/tests/integration/filters/column/index.ts
similarity index 100%
rename from test/tests/integration/filters/column/index.ts
rename to src/test/tests/integration/filters/column/index.ts
diff --git a/test/tests/integration/filters/column/only-works-with-arrays-or-traversable.ts b/src/test/tests/integration/filters/column/only-works-with-arrays-or-traversable.ts
similarity index 100%
rename from test/tests/integration/filters/column/only-works-with-arrays-or-traversable.ts
rename to src/test/tests/integration/filters/column/only-works-with-arrays-or-traversable.ts
diff --git a/test/tests/integration/filters/convert_encoding/basic.ts b/src/test/tests/integration/filters/convert_encoding/basic.ts
similarity index 100%
rename from test/tests/integration/filters/convert_encoding/basic.ts
rename to src/test/tests/integration/filters/convert_encoding/basic.ts
diff --git a/test/tests/integration/filters/convert_encoding/index.ts b/src/test/tests/integration/filters/convert_encoding/index.ts
similarity index 100%
rename from test/tests/integration/filters/convert_encoding/index.ts
rename to src/test/tests/integration/filters/convert_encoding/index.ts
diff --git a/test/tests/integration/filters/date/date.ts b/src/test/tests/integration/filters/date/date.ts
similarity index 97%
rename from test/tests/integration/filters/date/date.ts
rename to src/test/tests/integration/filters/date/date.ts
index 2ed82d5d..f8dd0734 100644
--- a/test/tests/integration/filters/date/date.ts
+++ b/src/test/tests/integration/filters/date/date.ts
@@ -1,6 +1,6 @@
 import TestBase, {runTest} from "../../TestBase";
 import {createIntegrationTest} from "../../test";
-import {TwingEnvironmentOptions} from "../../../../../src/lib/environment";
+import {TwingEnvironmentOptions} from "../../../../../main/lib/environment";
 
 class Test extends TestBase {
     getDescription() {
diff --git a/test/tests/integration/filters/date/date_default_format.ts b/src/test/tests/integration/filters/date/date_default_format.ts
similarity index 89%
rename from test/tests/integration/filters/date/date_default_format.ts
rename to src/test/tests/integration/filters/date/date_default_format.ts
index 695e28b4..dbb2cd94 100644
--- a/test/tests/integration/filters/date/date_default_format.ts
+++ b/src/test/tests/integration/filters/date/date_default_format.ts
@@ -1,6 +1,6 @@
 import TestBase, {runTest} from "../../TestBase";
 import {createIntegrationTest} from "../../test";
-import {TwingEnvironmentOptions} from "../../../../../src/lib/environment";
+import {TwingEnvironmentOptions} from "../../../../../main/lib/environment";
 
 class Test extends TestBase {
     getDescription() {
diff --git a/test/tests/integration/filters/date/date_default_format_interval.ts b/src/test/tests/integration/filters/date/date_default_format_interval.ts
similarity index 91%
rename from test/tests/integration/filters/date/date_default_format_interval.ts
rename to src/test/tests/integration/filters/date/date_default_format_interval.ts
index b343d3f5..c427edda 100644
--- a/test/tests/integration/filters/date/date_default_format_interval.ts
+++ b/src/test/tests/integration/filters/date/date_default_format_interval.ts
@@ -1,6 +1,6 @@
 import TestBase, {runTest} from "../../TestBase";
 import {createIntegrationTest} from "../../test";
-import {TwingEnvironmentOptions} from "../../../../../src/lib/environment";
+import {TwingEnvironmentOptions} from "../../../../../main/lib/environment";
 
 let Luxon = require('luxon');
 
diff --git a/test/tests/integration/filters/date/date_immutable.ts b/src/test/tests/integration/filters/date/date_immutable.ts
similarity index 94%
rename from test/tests/integration/filters/date/date_immutable.ts
rename to src/test/tests/integration/filters/date/date_immutable.ts
index 4764d382..97d22440 100644
--- a/test/tests/integration/filters/date/date_immutable.ts
+++ b/src/test/tests/integration/filters/date/date_immutable.ts
@@ -1,6 +1,6 @@
 import TestBase, {runTest} from "../../TestBase";
 import {createIntegrationTest} from "../../test";
-import {TwingEnvironmentOptions} from "../../../../../src/lib/environment";
+import {TwingEnvironmentOptions} from "../../../../../main/lib/environment";
 
 class Test extends TestBase {
     getDescription() {
diff --git a/test/tests/integration/filters/date/date_interval.ts b/src/test/tests/integration/filters/date/date_interval.ts
similarity index 100%
rename from test/tests/integration/filters/date/date_interval.ts
rename to src/test/tests/integration/filters/date/date_interval.ts
diff --git a/test/tests/integration/filters/date/date_invalid.ts b/src/test/tests/integration/filters/date/date_invalid.ts
similarity index 100%
rename from test/tests/integration/filters/date/date_invalid.ts
rename to src/test/tests/integration/filters/date/date_invalid.ts
diff --git a/test/tests/integration/filters/date/date_namedargs.ts b/src/test/tests/integration/filters/date/date_namedargs.ts
similarity index 100%
rename from test/tests/integration/filters/date/date_namedargs.ts
rename to src/test/tests/integration/filters/date/date_namedargs.ts
diff --git a/test/tests/integration/filters/date/index.ts b/src/test/tests/integration/filters/date/index.ts
similarity index 100%
rename from test/tests/integration/filters/date/index.ts
rename to src/test/tests/integration/filters/date/index.ts
diff --git a/test/tests/integration/filters/date_modify.ts b/src/test/tests/integration/filters/date_modify.ts
similarity index 100%
rename from test/tests/integration/filters/date_modify.ts
rename to src/test/tests/integration/filters/date_modify.ts
diff --git a/test/tests/integration/filters/default/default.ts b/src/test/tests/integration/filters/default/default.ts
similarity index 100%
rename from test/tests/integration/filters/default/default.ts
rename to src/test/tests/integration/filters/default/default.ts
diff --git a/test/tests/integration/filters/default/index.ts b/src/test/tests/integration/filters/default/index.ts
similarity index 100%
rename from test/tests/integration/filters/default/index.ts
rename to src/test/tests/integration/filters/default/index.ts
diff --git a/test/tests/integration/filters/default/with-no-argument.ts b/src/test/tests/integration/filters/default/with-no-argument.ts
similarity index 100%
rename from test/tests/integration/filters/default/with-no-argument.ts
rename to src/test/tests/integration/filters/default/with-no-argument.ts
diff --git a/test/tests/integration/filters/dynamic_filter.ts b/src/test/tests/integration/filters/dynamic_filter.ts
similarity index 100%
rename from test/tests/integration/filters/dynamic_filter.ts
rename to src/test/tests/integration/filters/dynamic_filter.ts
diff --git a/test/tests/integration/filters/escape/escape.ts b/src/test/tests/integration/filters/escape/escape.ts
similarity index 100%
rename from test/tests/integration/filters/escape/escape.ts
rename to src/test/tests/integration/filters/escape/escape.ts
diff --git a/test/tests/integration/filters/escape/escape_html_attr.ts b/src/test/tests/integration/filters/escape/escape_html_attr.ts
similarity index 100%
rename from test/tests/integration/filters/escape/escape_html_attr.ts
rename to src/test/tests/integration/filters/escape/escape_html_attr.ts
diff --git a/test/tests/integration/filters/escape/escape_javascript.ts b/src/test/tests/integration/filters/escape/escape_javascript.ts
similarity index 100%
rename from test/tests/integration/filters/escape/escape_javascript.ts
rename to src/test/tests/integration/filters/escape/escape_javascript.ts
diff --git a/test/tests/integration/filters/escape/escape_non_supported_charset.ts b/src/test/tests/integration/filters/escape/escape_non_supported_charset.ts
similarity index 100%
rename from test/tests/integration/filters/escape/escape_non_supported_charset.ts
rename to src/test/tests/integration/filters/escape/escape_non_supported_charset.ts
diff --git a/test/tests/integration/filters/escape/escape_with_variable_as_strategy.ts b/src/test/tests/integration/filters/escape/escape_with_variable_as_strategy.ts
similarity index 100%
rename from test/tests/integration/filters/escape/escape_with_variable_as_strategy.ts
rename to src/test/tests/integration/filters/escape/escape_with_variable_as_strategy.ts
diff --git a/test/tests/integration/filters/escape/index.ts b/src/test/tests/integration/filters/escape/index.ts
similarity index 100%
rename from test/tests/integration/filters/escape/index.ts
rename to src/test/tests/integration/filters/escape/index.ts
diff --git a/test/tests/integration/filters/escape/on-a-boolean.ts b/src/test/tests/integration/filters/escape/on-a-boolean.ts
similarity index 100%
rename from test/tests/integration/filters/escape/on-a-boolean.ts
rename to src/test/tests/integration/filters/escape/on-a-boolean.ts
diff --git a/test/tests/integration/filters/escape/with-a-custom-strategy.ts b/src/test/tests/integration/filters/escape/with-a-custom-strategy.ts
similarity index 100%
rename from test/tests/integration/filters/escape/with-a-custom-strategy.ts
rename to src/test/tests/integration/filters/escape/with-a-custom-strategy.ts
diff --git a/test/tests/integration/filters/escape/with-a-markup-and-autoescape.ts b/src/test/tests/integration/filters/escape/with-a-markup-and-autoescape.ts
similarity index 84%
rename from test/tests/integration/filters/escape/with-a-markup-and-autoescape.ts
rename to src/test/tests/integration/filters/escape/with-a-markup-and-autoescape.ts
index 61712ba8..8e27a32b 100644
--- a/test/tests/integration/filters/escape/with-a-markup-and-autoescape.ts
+++ b/src/test/tests/integration/filters/escape/with-a-markup-and-autoescape.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../../TestBase";
-import {createMarkup} from "../../../../../src/lib/markup";
+import {createMarkup} from "../../../../../main/lib/markup";
 
 runTest({
     description: '"escape" filter with a markup and autoescape',
diff --git a/test/tests/integration/filters/escape/with-a-non-supported-strategy.ts b/src/test/tests/integration/filters/escape/with-a-non-supported-strategy.ts
similarity index 100%
rename from test/tests/integration/filters/escape/with-a-non-supported-strategy.ts
rename to src/test/tests/integration/filters/escape/with-a-non-supported-strategy.ts
diff --git a/test/tests/integration/filters/escape/with-css-strategy.ts b/src/test/tests/integration/filters/escape/with-css-strategy.ts
similarity index 100%
rename from test/tests/integration/filters/escape/with-css-strategy.ts
rename to src/test/tests/integration/filters/escape/with-css-strategy.ts
diff --git a/test/tests/integration/filters/escape/with-html_attr-strategy.ts b/src/test/tests/integration/filters/escape/with-html_attr-strategy.ts
similarity index 100%
rename from test/tests/integration/filters/escape/with-html_attr-strategy.ts
rename to src/test/tests/integration/filters/escape/with-html_attr-strategy.ts
diff --git a/test/tests/integration/filters/escape/with-js-strategy.ts b/src/test/tests/integration/filters/escape/with-js-strategy.ts
similarity index 100%
rename from test/tests/integration/filters/escape/with-js-strategy.ts
rename to src/test/tests/integration/filters/escape/with-js-strategy.ts
diff --git a/test/tests/integration/filters/escape/with-url-strategy.ts b/src/test/tests/integration/filters/escape/with-url-strategy.ts
similarity index 100%
rename from test/tests/integration/filters/escape/with-url-strategy.ts
rename to src/test/tests/integration/filters/escape/with-url-strategy.ts
diff --git a/test/tests/integration/filters/filter.ts b/src/test/tests/integration/filters/filter.ts
similarity index 100%
rename from test/tests/integration/filters/filter.ts
rename to src/test/tests/integration/filters/filter.ts
diff --git a/test/tests/integration/filters/first.ts b/src/test/tests/integration/filters/first.ts
similarity index 100%
rename from test/tests/integration/filters/first.ts
rename to src/test/tests/integration/filters/first.ts
diff --git a/test/tests/integration/filters/force_escape.ts b/src/test/tests/integration/filters/force_escape.ts
similarity index 100%
rename from test/tests/integration/filters/force_escape.ts
rename to src/test/tests/integration/filters/force_escape.ts
diff --git a/test/tests/integration/filters/format.ts b/src/test/tests/integration/filters/format.ts
similarity index 100%
rename from test/tests/integration/filters/format.ts
rename to src/test/tests/integration/filters/format.ts
diff --git a/test/tests/integration/filters/index.ts b/src/test/tests/integration/filters/index.ts
similarity index 100%
rename from test/tests/integration/filters/index.ts
rename to src/test/tests/integration/filters/index.ts
diff --git a/test/tests/integration/filters/join/index.ts b/src/test/tests/integration/filters/join/index.ts
similarity index 100%
rename from test/tests/integration/filters/join/index.ts
rename to src/test/tests/integration/filters/join/index.ts
diff --git a/test/tests/integration/filters/join/join.ts b/src/test/tests/integration/filters/join/join.ts
similarity index 100%
rename from test/tests/integration/filters/join/join.ts
rename to src/test/tests/integration/filters/join/join.ts
diff --git a/test/tests/integration/filters/join/join_on_undefined_variable.ts b/src/test/tests/integration/filters/join/join_on_undefined_variable.ts
similarity index 100%
rename from test/tests/integration/filters/join/join_on_undefined_variable.ts
rename to src/test/tests/integration/filters/join/join_on_undefined_variable.ts
diff --git a/test/tests/integration/filters/join/on-array.ts b/src/test/tests/integration/filters/join/on-array.ts
similarity index 100%
rename from test/tests/integration/filters/join/on-array.ts
rename to src/test/tests/integration/filters/join/on-array.ts
diff --git a/test/tests/integration/filters/join/with-a-boolean.ts b/src/test/tests/integration/filters/join/with-a-boolean.ts
similarity index 100%
rename from test/tests/integration/filters/join/with-a-boolean.ts
rename to src/test/tests/integration/filters/join/with-a-boolean.ts
diff --git a/test/tests/integration/filters/join/with-a-non-traversable.ts b/src/test/tests/integration/filters/join/with-a-non-traversable.ts
similarity index 100%
rename from test/tests/integration/filters/join/with-a-non-traversable.ts
rename to src/test/tests/integration/filters/join/with-a-non-traversable.ts
diff --git a/test/tests/integration/filters/json_encode.ts b/src/test/tests/integration/filters/json_encode.ts
similarity index 94%
rename from test/tests/integration/filters/json_encode.ts
rename to src/test/tests/integration/filters/json_encode.ts
index fdac8e9f..8d21c230 100644
--- a/test/tests/integration/filters/json_encode.ts
+++ b/src/test/tests/integration/filters/json_encode.ts
@@ -1,5 +1,5 @@
 import TestBase, {runTest} from "../TestBase";
-import {createMarkup} from "../../../../src/lib/markup";
+import {createMarkup} from "../../../../main/lib/markup";
 import {createIntegrationTest} from "../test";
 
 class Test extends TestBase {
diff --git a/test/tests/integration/filters/keys/index.ts b/src/test/tests/integration/filters/keys/index.ts
similarity index 100%
rename from test/tests/integration/filters/keys/index.ts
rename to src/test/tests/integration/filters/keys/index.ts
diff --git a/test/tests/integration/filters/keys/keys.ts b/src/test/tests/integration/filters/keys/keys.ts
similarity index 100%
rename from test/tests/integration/filters/keys/keys.ts
rename to src/test/tests/integration/filters/keys/keys.ts
diff --git a/test/tests/integration/filters/keys/with-null.ts b/src/test/tests/integration/filters/keys/with-null.ts
similarity index 100%
rename from test/tests/integration/filters/keys/with-null.ts
rename to src/test/tests/integration/filters/keys/with-null.ts
diff --git a/test/tests/integration/filters/last.ts b/src/test/tests/integration/filters/last.ts
similarity index 100%
rename from test/tests/integration/filters/last.ts
rename to src/test/tests/integration/filters/last.ts
diff --git a/test/tests/integration/filters/last/basic.ts b/src/test/tests/integration/filters/last/basic.ts
similarity index 100%
rename from test/tests/integration/filters/last/basic.ts
rename to src/test/tests/integration/filters/last/basic.ts
diff --git a/test/tests/integration/filters/last/index.ts b/src/test/tests/integration/filters/last/index.ts
similarity index 100%
rename from test/tests/integration/filters/last/index.ts
rename to src/test/tests/integration/filters/last/index.ts
diff --git a/test/tests/integration/filters/length/index.ts b/src/test/tests/integration/filters/length/index.ts
similarity index 100%
rename from test/tests/integration/filters/length/index.ts
rename to src/test/tests/integration/filters/length/index.ts
diff --git a/test/tests/integration/filters/length/length.ts b/src/test/tests/integration/filters/length/length.ts
similarity index 100%
rename from test/tests/integration/filters/length/length.ts
rename to src/test/tests/integration/filters/length/length.ts
diff --git a/test/tests/integration/filters/length/length_utf8.ts b/src/test/tests/integration/filters/length/length_utf8.ts
similarity index 90%
rename from test/tests/integration/filters/length/length_utf8.ts
rename to src/test/tests/integration/filters/length/length_utf8.ts
index 7e0775f4..63313020 100644
--- a/test/tests/integration/filters/length/length_utf8.ts
+++ b/src/test/tests/integration/filters/length/length_utf8.ts
@@ -1,5 +1,5 @@
 import TestBase, {runTest} from "../../TestBase";
-import {createMarkup} from "../../../../../src/lib/markup";
+import {createMarkup} from "../../../../../main/lib/markup";
 import {createIntegrationTest} from "../../test";
 
 class Test extends TestBase {
diff --git a/test/tests/integration/filters/length/on-array.ts b/src/test/tests/integration/filters/length/on-array.ts
similarity index 100%
rename from test/tests/integration/filters/length/on-array.ts
rename to src/test/tests/integration/filters/length/on-array.ts
diff --git a/test/tests/integration/filters/length/on-hash.ts b/src/test/tests/integration/filters/length/on-hash.ts
similarity index 100%
rename from test/tests/integration/filters/length/on-hash.ts
rename to src/test/tests/integration/filters/length/on-hash.ts
diff --git a/test/tests/integration/filters/lower/basic.ts b/src/test/tests/integration/filters/lower/basic.ts
similarity index 83%
rename from test/tests/integration/filters/lower/basic.ts
rename to src/test/tests/integration/filters/lower/basic.ts
index cd042a07..2dba551d 100644
--- a/test/tests/integration/filters/lower/basic.ts
+++ b/src/test/tests/integration/filters/lower/basic.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../../TestBase";
-import {createMarkup} from "../../../../../src/lib/markup";
+import {createMarkup} from "../../../../../main/lib/markup";
 
 runTest({
     description: '"lower" filter',
diff --git a/test/tests/integration/filters/lower/index.ts b/src/test/tests/integration/filters/lower/index.ts
similarity index 100%
rename from test/tests/integration/filters/lower/index.ts
rename to src/test/tests/integration/filters/lower/index.ts
diff --git a/test/tests/integration/filters/map.ts b/src/test/tests/integration/filters/map.ts
similarity index 100%
rename from test/tests/integration/filters/map.ts
rename to src/test/tests/integration/filters/map.ts
diff --git a/test/tests/integration/filters/map_on_object.ts b/src/test/tests/integration/filters/map_on_object.ts
similarity index 100%
rename from test/tests/integration/filters/map_on_object.ts
rename to src/test/tests/integration/filters/map_on_object.ts
diff --git a/test/tests/integration/filters/merge/basic.ts b/src/test/tests/integration/filters/merge/basic.ts
similarity index 100%
rename from test/tests/integration/filters/merge/basic.ts
rename to src/test/tests/integration/filters/merge/basic.ts
diff --git a/test/tests/integration/filters/merge/index.ts b/src/test/tests/integration/filters/merge/index.ts
similarity index 100%
rename from test/tests/integration/filters/merge/index.ts
rename to src/test/tests/integration/filters/merge/index.ts
diff --git a/test/tests/integration/filters/merge/with-named-arguments.ts b/src/test/tests/integration/filters/merge/with-named-arguments.ts
similarity index 100%
rename from test/tests/integration/filters/merge/with-named-arguments.ts
rename to src/test/tests/integration/filters/merge/with-named-arguments.ts
diff --git a/test/tests/integration/filters/merge/with-non-traversable-object.ts b/src/test/tests/integration/filters/merge/with-non-traversable-object.ts
similarity index 100%
rename from test/tests/integration/filters/merge/with-non-traversable-object.ts
rename to src/test/tests/integration/filters/merge/with-non-traversable-object.ts
diff --git a/test/tests/integration/filters/merge/with-null-or-undefined.ts b/src/test/tests/integration/filters/merge/with-null-or-undefined.ts
similarity index 100%
rename from test/tests/integration/filters/merge/with-null-or-undefined.ts
rename to src/test/tests/integration/filters/merge/with-null-or-undefined.ts
diff --git a/test/tests/integration/filters/nl2br/index.ts b/src/test/tests/integration/filters/nl2br/index.ts
similarity index 100%
rename from test/tests/integration/filters/nl2br/index.ts
rename to src/test/tests/integration/filters/nl2br/index.ts
diff --git a/test/tests/integration/filters/nl2br/nl2br.ts b/src/test/tests/integration/filters/nl2br/nl2br.ts
similarity index 100%
rename from test/tests/integration/filters/nl2br/nl2br.ts
rename to src/test/tests/integration/filters/nl2br/nl2br.ts
diff --git a/test/tests/integration/filters/number_format/index.ts b/src/test/tests/integration/filters/number_format/index.ts
similarity index 100%
rename from test/tests/integration/filters/number_format/index.ts
rename to src/test/tests/integration/filters/number_format/index.ts
diff --git a/test/tests/integration/filters/number_format/number_format.ts b/src/test/tests/integration/filters/number_format/number_format.ts
similarity index 100%
rename from test/tests/integration/filters/number_format/number_format.ts
rename to src/test/tests/integration/filters/number_format/number_format.ts
diff --git a/test/tests/integration/filters/number_format/number_format_default.ts b/src/test/tests/integration/filters/number_format/number_format_default.ts
similarity index 92%
rename from test/tests/integration/filters/number_format/number_format_default.ts
rename to src/test/tests/integration/filters/number_format/number_format_default.ts
index eb629630..1e0f85cb 100644
--- a/test/tests/integration/filters/number_format/number_format_default.ts
+++ b/src/test/tests/integration/filters/number_format/number_format_default.ts
@@ -1,6 +1,6 @@
 import TestBase, {runTest} from "../../TestBase";
 import {createIntegrationTest} from "../../test";
-import {TwingEnvironmentOptions} from "../../../../../src/lib/environment";
+import {TwingEnvironmentOptions} from "../../../../../main/lib/environment";
 
 class Test extends TestBase {
     getDescription() {
diff --git a/test/tests/integration/filters/raw.ts b/src/test/tests/integration/filters/raw.ts
similarity index 100%
rename from test/tests/integration/filters/raw.ts
rename to src/test/tests/integration/filters/raw.ts
diff --git a/test/tests/integration/filters/raw_on_undefined_variable.ts b/src/test/tests/integration/filters/raw_on_undefined_variable.ts
similarity index 100%
rename from test/tests/integration/filters/raw_on_undefined_variable.ts
rename to src/test/tests/integration/filters/raw_on_undefined_variable.ts
diff --git a/test/tests/integration/filters/reduce.ts b/src/test/tests/integration/filters/reduce.ts
similarity index 100%
rename from test/tests/integration/filters/reduce.ts
rename to src/test/tests/integration/filters/reduce.ts
diff --git a/test/tests/integration/filters/replace/index.ts b/src/test/tests/integration/filters/replace/index.ts
similarity index 100%
rename from test/tests/integration/filters/replace/index.ts
rename to src/test/tests/integration/filters/replace/index.ts
diff --git a/test/tests/integration/filters/replace/on-null.ts b/src/test/tests/integration/filters/replace/on-null.ts
similarity index 100%
rename from test/tests/integration/filters/replace/on-null.ts
rename to src/test/tests/integration/filters/replace/on-null.ts
diff --git a/test/tests/integration/filters/replace/replace.ts b/src/test/tests/integration/filters/replace/replace.ts
similarity index 100%
rename from test/tests/integration/filters/replace/replace.ts
rename to src/test/tests/integration/filters/replace/replace.ts
diff --git a/test/tests/integration/filters/replace/replace_invalid_arg.ts b/src/test/tests/integration/filters/replace/replace_invalid_arg.ts
similarity index 100%
rename from test/tests/integration/filters/replace/replace_invalid_arg.ts
rename to src/test/tests/integration/filters/replace/replace_invalid_arg.ts
diff --git a/test/tests/integration/filters/replace/with-null.ts b/src/test/tests/integration/filters/replace/with-null.ts
similarity index 100%
rename from test/tests/integration/filters/replace/with-null.ts
rename to src/test/tests/integration/filters/replace/with-null.ts
diff --git a/test/tests/integration/filters/reverse.ts b/src/test/tests/integration/filters/reverse.ts
similarity index 100%
rename from test/tests/integration/filters/reverse.ts
rename to src/test/tests/integration/filters/reverse.ts
diff --git a/test/tests/integration/filters/round/basic.ts b/src/test/tests/integration/filters/round/basic.ts
similarity index 100%
rename from test/tests/integration/filters/round/basic.ts
rename to src/test/tests/integration/filters/round/basic.ts
diff --git a/test/tests/integration/filters/round/index.ts b/src/test/tests/integration/filters/round/index.ts
similarity index 100%
rename from test/tests/integration/filters/round/index.ts
rename to src/test/tests/integration/filters/round/index.ts
diff --git a/test/tests/integration/filters/round/with-an-unsupported-method.ts b/src/test/tests/integration/filters/round/with-an-unsupported-method.ts
similarity index 100%
rename from test/tests/integration/filters/round/with-an-unsupported-method.ts
rename to src/test/tests/integration/filters/round/with-an-unsupported-method.ts
diff --git a/test/tests/integration/filters/slice.ts b/src/test/tests/integration/filters/slice.ts
similarity index 100%
rename from test/tests/integration/filters/slice.ts
rename to src/test/tests/integration/filters/slice.ts
diff --git a/test/tests/integration/filters/sort/basic.ts b/src/test/tests/integration/filters/sort/basic.ts
similarity index 100%
rename from test/tests/integration/filters/sort/basic.ts
rename to src/test/tests/integration/filters/sort/basic.ts
diff --git a/test/tests/integration/filters/sort/index.ts b/src/test/tests/integration/filters/sort/index.ts
similarity index 100%
rename from test/tests/integration/filters/sort/index.ts
rename to src/test/tests/integration/filters/sort/index.ts
diff --git a/test/tests/integration/filters/sort/only-works-wth-iterables.ts b/src/test/tests/integration/filters/sort/only-works-wth-iterables.ts
similarity index 100%
rename from test/tests/integration/filters/sort/only-works-wth-iterables.ts
rename to src/test/tests/integration/filters/sort/only-works-wth-iterables.ts
diff --git a/test/tests/integration/filters/sort/with-arrow-parameter.ts b/src/test/tests/integration/filters/sort/with-arrow-parameter.ts
similarity index 100%
rename from test/tests/integration/filters/sort/with-arrow-parameter.ts
rename to src/test/tests/integration/filters/sort/with-arrow-parameter.ts
diff --git a/test/tests/integration/filters/spaceless.ts b/src/test/tests/integration/filters/spaceless.ts
similarity index 100%
rename from test/tests/integration/filters/spaceless.ts
rename to src/test/tests/integration/filters/spaceless.ts
diff --git a/test/tests/integration/filters/special_chars.ts b/src/test/tests/integration/filters/special_chars.ts
similarity index 100%
rename from test/tests/integration/filters/special_chars.ts
rename to src/test/tests/integration/filters/special_chars.ts
diff --git a/test/tests/integration/filters/split.ts b/src/test/tests/integration/filters/split.ts
similarity index 100%
rename from test/tests/integration/filters/split.ts
rename to src/test/tests/integration/filters/split.ts
diff --git a/test/tests/integration/filters/split_utf8.ts b/src/test/tests/integration/filters/split_utf8.ts
similarity index 100%
rename from test/tests/integration/filters/split_utf8.ts
rename to src/test/tests/integration/filters/split_utf8.ts
diff --git a/test/tests/integration/filters/static_calls.ts b/src/test/tests/integration/filters/static_calls.ts
similarity index 100%
rename from test/tests/integration/filters/static_calls.ts
rename to src/test/tests/integration/filters/static_calls.ts
diff --git a/test/tests/integration/filters/striptags/basic.ts b/src/test/tests/integration/filters/striptags/basic.ts
similarity index 88%
rename from test/tests/integration/filters/striptags/basic.ts
rename to src/test/tests/integration/filters/striptags/basic.ts
index 8ead40c2..3bf9c8be 100644
--- a/test/tests/integration/filters/striptags/basic.ts
+++ b/src/test/tests/integration/filters/striptags/basic.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../../TestBase";
-import {createMarkup} from "../../../../../src/lib/markup";
+import {createMarkup} from "../../../../../main/lib/markup";
 
 runTest({
     description: '"striptags" filter',
diff --git a/test/tests/integration/filters/striptags/index.ts b/src/test/tests/integration/filters/striptags/index.ts
similarity index 100%
rename from test/tests/integration/filters/striptags/index.ts
rename to src/test/tests/integration/filters/striptags/index.ts
diff --git a/test/tests/integration/filters/title/basic.ts b/src/test/tests/integration/filters/title/basic.ts
similarity index 83%
rename from test/tests/integration/filters/title/basic.ts
rename to src/test/tests/integration/filters/title/basic.ts
index 54debcec..d3b040c4 100644
--- a/test/tests/integration/filters/title/basic.ts
+++ b/src/test/tests/integration/filters/title/basic.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../../TestBase";
-import {createMarkup} from "../../../../../src/lib/markup";
+import {createMarkup} from "../../../../../main/lib/markup";
 
 runTest({
     description: '"title" filter',
diff --git a/test/tests/integration/filters/title/index.ts b/src/test/tests/integration/filters/title/index.ts
similarity index 100%
rename from test/tests/integration/filters/title/index.ts
rename to src/test/tests/integration/filters/title/index.ts
diff --git a/test/tests/integration/filters/trim/basic.ts b/src/test/tests/integration/filters/trim/basic.ts
similarity index 100%
rename from test/tests/integration/filters/trim/basic.ts
rename to src/test/tests/integration/filters/trim/basic.ts
diff --git a/test/tests/integration/filters/trim/index.ts b/src/test/tests/integration/filters/trim/index.ts
similarity index 100%
rename from test/tests/integration/filters/trim/index.ts
rename to src/test/tests/integration/filters/trim/index.ts
diff --git a/test/tests/integration/filters/trim/with-an-unsupported-side.ts b/src/test/tests/integration/filters/trim/with-an-unsupported-side.ts
similarity index 100%
rename from test/tests/integration/filters/trim/with-an-unsupported-side.ts
rename to src/test/tests/integration/filters/trim/with-an-unsupported-side.ts
diff --git a/test/tests/integration/filters/upper/basic.ts b/src/test/tests/integration/filters/upper/basic.ts
similarity index 83%
rename from test/tests/integration/filters/upper/basic.ts
rename to src/test/tests/integration/filters/upper/basic.ts
index 2d13cbee..15b0f0be 100644
--- a/test/tests/integration/filters/upper/basic.ts
+++ b/src/test/tests/integration/filters/upper/basic.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../../TestBase";
-import {createMarkup} from "../../../../../src/lib/markup";
+import {createMarkup} from "../../../../../main/lib/markup";
 
 runTest({
     description: '"upper" filter',
diff --git a/test/tests/integration/filters/upper/index.ts b/src/test/tests/integration/filters/upper/index.ts
similarity index 100%
rename from test/tests/integration/filters/upper/index.ts
rename to src/test/tests/integration/filters/upper/index.ts
diff --git a/test/tests/integration/filters/url_encode/basic.ts b/src/test/tests/integration/filters/url_encode/basic.ts
similarity index 100%
rename from test/tests/integration/filters/url_encode/basic.ts
rename to src/test/tests/integration/filters/url_encode/basic.ts
diff --git a/test/tests/integration/filters/url_encode/index.ts b/src/test/tests/integration/filters/url_encode/index.ts
similarity index 100%
rename from test/tests/integration/filters/url_encode/index.ts
rename to src/test/tests/integration/filters/url_encode/index.ts
diff --git a/test/tests/integration/filters/url_encode/on-non-traversable.ts b/src/test/tests/integration/filters/url_encode/on-non-traversable.ts
similarity index 100%
rename from test/tests/integration/filters/url_encode/on-non-traversable.ts
rename to src/test/tests/integration/filters/url_encode/on-non-traversable.ts
diff --git a/test/tests/integration/filters/variadic.ts b/src/test/tests/integration/filters/variadic.ts
similarity index 90%
rename from test/tests/integration/filters/variadic.ts
rename to src/test/tests/integration/filters/variadic.ts
index e8778b15..5cfa5b71 100644
--- a/test/tests/integration/filters/variadic.ts
+++ b/src/test/tests/integration/filters/variadic.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {createFilter} from "../../../../src/lib/filter";
+import {createFilter} from "../../../../main/lib/filter";
 
 runTest({
     description: 'variadic filter',
diff --git a/test/tests/integration/filters/with_duplicated_argument.ts b/src/test/tests/integration/filters/with_duplicated_argument.ts
similarity index 89%
rename from test/tests/integration/filters/with_duplicated_argument.ts
rename to src/test/tests/integration/filters/with_duplicated_argument.ts
index eff9e701..97dbb6c6 100644
--- a/test/tests/integration/filters/with_duplicated_argument.ts
+++ b/src/test/tests/integration/filters/with_duplicated_argument.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {createFilter} from "../../../../src/lib/filter";
+import {createFilter} from "../../../../main/lib/filter";
 
 runTest({
     description: 'filter with duplicated arguments',
diff --git a/test/tests/integration/filters/with_missing_required_argument.ts b/src/test/tests/integration/filters/with_missing_required_argument.ts
similarity index 89%
rename from test/tests/integration/filters/with_missing_required_argument.ts
rename to src/test/tests/integration/filters/with_missing_required_argument.ts
index 7f942bae..32bdf973 100644
--- a/test/tests/integration/filters/with_missing_required_argument.ts
+++ b/src/test/tests/integration/filters/with_missing_required_argument.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {createFilter} from "../../../../src/lib/filter";
+import {createFilter} from "../../../../main/lib/filter";
 
 runTest({
     description: 'filter with missing required arguments',
diff --git a/test/tests/integration/filters/with_positional_argument_after_named_argument.ts b/src/test/tests/integration/filters/with_positional_argument_after_named_argument.ts
similarity index 91%
rename from test/tests/integration/filters/with_positional_argument_after_named_argument.ts
rename to src/test/tests/integration/filters/with_positional_argument_after_named_argument.ts
index 369f2240..4921abfc 100644
--- a/test/tests/integration/filters/with_positional_argument_after_named_argument.ts
+++ b/src/test/tests/integration/filters/with_positional_argument_after_named_argument.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {createFilter} from "../../../../src/lib/filter";
+import {createFilter} from "../../../../main/lib/filter";
 
 runTest({
     description: 'filter with positional argument after named argument',
diff --git a/test/tests/integration/filters/with_unknown_argument.ts b/src/test/tests/integration/filters/with_unknown_argument.ts
similarity index 93%
rename from test/tests/integration/filters/with_unknown_argument.ts
rename to src/test/tests/integration/filters/with_unknown_argument.ts
index 12e2c700..6db72634 100644
--- a/test/tests/integration/filters/with_unknown_argument.ts
+++ b/src/test/tests/integration/filters/with_unknown_argument.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {createFilter} from "../../../../src/lib/filter";
+import {createFilter} from "../../../../main/lib/filter";
 
 runTest({
     description: 'filter with unknown argument',
diff --git a/test/tests/integration/functions/attribute/attribute.ts b/src/test/tests/integration/functions/attribute/attribute.ts
similarity index 100%
rename from test/tests/integration/functions/attribute/attribute.ts
rename to src/test/tests/integration/functions/attribute/attribute.ts
diff --git a/test/tests/integration/functions/attribute/index.ts b/src/test/tests/integration/functions/attribute/index.ts
similarity index 100%
rename from test/tests/integration/functions/attribute/index.ts
rename to src/test/tests/integration/functions/attribute/index.ts
diff --git a/test/tests/integration/functions/attribute/with-not-at-least-two-arguments.ts b/src/test/tests/integration/functions/attribute/with-not-at-least-two-arguments.ts
similarity index 100%
rename from test/tests/integration/functions/attribute/with-not-at-least-two-arguments.ts
rename to src/test/tests/integration/functions/attribute/with-not-at-least-two-arguments.ts
diff --git a/test/tests/integration/functions/block/block.ts b/src/test/tests/integration/functions/block/block.ts
similarity index 100%
rename from test/tests/integration/functions/block/block.ts
rename to src/test/tests/integration/functions/block/block.ts
diff --git a/test/tests/integration/functions/block/block_with_template.ts b/src/test/tests/integration/functions/block/block_with_template.ts
similarity index 92%
rename from test/tests/integration/functions/block/block_with_template.ts
rename to src/test/tests/integration/functions/block/block_with_template.ts
index 0bf1c4a9..83e248b3 100644
--- a/test/tests/integration/functions/block/block_with_template.ts
+++ b/src/test/tests/integration/functions/block/block_with_template.ts
@@ -1,6 +1,6 @@
 import {runTest} from "../../TestBase";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
 
 runTest(({
     description: '"block" function with a template argument',
diff --git a/test/tests/integration/functions/block/block_without_name.ts b/src/test/tests/integration/functions/block/block_without_name.ts
similarity index 100%
rename from test/tests/integration/functions/block/block_without_name.ts
rename to src/test/tests/integration/functions/block/block_without_name.ts
diff --git a/test/tests/integration/functions/block/block_without_parent.ts b/src/test/tests/integration/functions/block/block_without_parent.ts
similarity index 100%
rename from test/tests/integration/functions/block/block_without_parent.ts
rename to src/test/tests/integration/functions/block/block_without_parent.ts
diff --git a/test/tests/integration/functions/block/index.ts b/src/test/tests/integration/functions/block/index.ts
similarity index 100%
rename from test/tests/integration/functions/block/index.ts
rename to src/test/tests/integration/functions/block/index.ts
diff --git a/test/tests/integration/functions/block/undefined_block.ts b/src/test/tests/integration/functions/block/undefined_block.ts
similarity index 100%
rename from test/tests/integration/functions/block/undefined_block.ts
rename to src/test/tests/integration/functions/block/undefined_block.ts
diff --git a/test/tests/integration/functions/constant.ts b/src/test/tests/integration/functions/constant.ts
similarity index 100%
rename from test/tests/integration/functions/constant.ts
rename to src/test/tests/integration/functions/constant.ts
diff --git a/test/tests/integration/functions/cycle/cycle.ts b/src/test/tests/integration/functions/cycle/cycle.ts
similarity index 100%
rename from test/tests/integration/functions/cycle/cycle.ts
rename to src/test/tests/integration/functions/cycle/cycle.ts
diff --git a/test/tests/integration/functions/cycle/index.ts b/src/test/tests/integration/functions/cycle/index.ts
similarity index 100%
rename from test/tests/integration/functions/cycle/index.ts
rename to src/test/tests/integration/functions/cycle/index.ts
diff --git a/test/tests/integration/functions/cycle/on-a-boolean.ts b/src/test/tests/integration/functions/cycle/on-a-boolean.ts
similarity index 100%
rename from test/tests/integration/functions/cycle/on-a-boolean.ts
rename to src/test/tests/integration/functions/cycle/on-a-boolean.ts
diff --git a/test/tests/integration/functions/cycle/on-hash.ts b/src/test/tests/integration/functions/cycle/on-hash.ts
similarity index 100%
rename from test/tests/integration/functions/cycle/on-hash.ts
rename to src/test/tests/integration/functions/cycle/on-hash.ts
diff --git a/test/tests/integration/functions/date/date.ts b/src/test/tests/integration/functions/date/date.ts
similarity index 100%
rename from test/tests/integration/functions/date/date.ts
rename to src/test/tests/integration/functions/date/date.ts
diff --git a/test/tests/integration/functions/date/index.ts b/src/test/tests/integration/functions/date/index.ts
similarity index 100%
rename from test/tests/integration/functions/date/index.ts
rename to src/test/tests/integration/functions/date/index.ts
diff --git a/test/tests/integration/functions/date/with-a-js-date.ts b/src/test/tests/integration/functions/date/with-a-js-date.ts
similarity index 100%
rename from test/tests/integration/functions/date/with-a-js-date.ts
rename to src/test/tests/integration/functions/date/with-a-js-date.ts
diff --git a/test/tests/integration/functions/date/with-a-timezone-set-to-false.ts b/src/test/tests/integration/functions/date/with-a-timezone-set-to-false.ts
similarity index 100%
rename from test/tests/integration/functions/date/with-a-timezone-set-to-false.ts
rename to src/test/tests/integration/functions/date/with-a-timezone-set-to-false.ts
diff --git a/test/tests/integration/functions/dump/dump.ts b/src/test/tests/integration/functions/dump/dump.ts
similarity index 100%
rename from test/tests/integration/functions/dump/dump.ts
rename to src/test/tests/integration/functions/dump/dump.ts
diff --git a/test/tests/integration/functions/dump/index.ts b/src/test/tests/integration/functions/dump/index.ts
similarity index 100%
rename from test/tests/integration/functions/dump/index.ts
rename to src/test/tests/integration/functions/dump/index.ts
diff --git a/test/tests/integration/functions/dump/with-array.ts b/src/test/tests/integration/functions/dump/with-array.ts
similarity index 100%
rename from test/tests/integration/functions/dump/with-array.ts
rename to src/test/tests/integration/functions/dump/with-array.ts
diff --git a/test/tests/integration/functions/dump/with-boolean.ts b/src/test/tests/integration/functions/dump/with-boolean.ts
similarity index 100%
rename from test/tests/integration/functions/dump/with-boolean.ts
rename to src/test/tests/integration/functions/dump/with-boolean.ts
diff --git a/test/tests/integration/functions/dump/with-function.ts b/src/test/tests/integration/functions/dump/with-function.ts
similarity index 100%
rename from test/tests/integration/functions/dump/with-function.ts
rename to src/test/tests/integration/functions/dump/with-function.ts
diff --git a/test/tests/integration/functions/dump/with-null-or-undefined.ts b/src/test/tests/integration/functions/dump/with-null-or-undefined.ts
similarity index 100%
rename from test/tests/integration/functions/dump/with-null-or-undefined.ts
rename to src/test/tests/integration/functions/dump/with-null-or-undefined.ts
diff --git a/test/tests/integration/functions/dump/with-number.ts b/src/test/tests/integration/functions/dump/with-number.ts
similarity index 100%
rename from test/tests/integration/functions/dump/with-number.ts
rename to src/test/tests/integration/functions/dump/with-number.ts
diff --git a/test/tests/integration/functions/dynamic_function.ts b/src/test/tests/integration/functions/dynamic_function.ts
similarity index 100%
rename from test/tests/integration/functions/dynamic_function.ts
rename to src/test/tests/integration/functions/dynamic_function.ts
diff --git a/test/tests/integration/functions/include/assignment.ts b/src/test/tests/integration/functions/include/assignment.ts
similarity index 100%
rename from test/tests/integration/functions/include/assignment.ts
rename to src/test/tests/integration/functions/include/assignment.ts
diff --git a/test/tests/integration/functions/include/autoescaping.ts b/src/test/tests/integration/functions/include/autoescaping.ts
similarity index 100%
rename from test/tests/integration/functions/include/autoescaping.ts
rename to src/test/tests/integration/functions/include/autoescaping.ts
diff --git a/test/tests/integration/functions/include/basic.ts b/src/test/tests/integration/functions/include/basic.ts
similarity index 100%
rename from test/tests/integration/functions/include/basic.ts
rename to src/test/tests/integration/functions/include/basic.ts
diff --git a/test/tests/integration/functions/include/expression.ts b/src/test/tests/integration/functions/include/expression.ts
similarity index 100%
rename from test/tests/integration/functions/include/expression.ts
rename to src/test/tests/integration/functions/include/expression.ts
diff --git a/test/tests/integration/functions/include/ignore_missing.ts b/src/test/tests/integration/functions/include/ignore_missing.ts
similarity index 100%
rename from test/tests/integration/functions/include/ignore_missing.ts
rename to src/test/tests/integration/functions/include/ignore_missing.ts
diff --git a/test/tests/integration/functions/include/ignore_missing_exists.ts b/src/test/tests/integration/functions/include/ignore_missing_exists.ts
similarity index 100%
rename from test/tests/integration/functions/include/ignore_missing_exists.ts
rename to src/test/tests/integration/functions/include/ignore_missing_exists.ts
diff --git a/test/tests/integration/functions/include/include_missing_extends.ts b/src/test/tests/integration/functions/include/include_missing_extends.ts
similarity index 100%
rename from test/tests/integration/functions/include/include_missing_extends.ts
rename to src/test/tests/integration/functions/include/include_missing_extends.ts
diff --git a/test/tests/integration/functions/include/index.ts b/src/test/tests/integration/functions/include/index.ts
similarity index 100%
rename from test/tests/integration/functions/include/index.ts
rename to src/test/tests/integration/functions/include/index.ts
diff --git a/test/tests/integration/functions/include/missing.ts b/src/test/tests/integration/functions/include/missing.ts
similarity index 100%
rename from test/tests/integration/functions/include/missing.ts
rename to src/test/tests/integration/functions/include/missing.ts
diff --git a/test/tests/integration/functions/include/missing_nested.ts b/src/test/tests/integration/functions/include/missing_nested.ts
similarity index 100%
rename from test/tests/integration/functions/include/missing_nested.ts
rename to src/test/tests/integration/functions/include/missing_nested.ts
diff --git a/test/tests/integration/functions/include/sandbox.ts b/src/test/tests/integration/functions/include/sandbox.ts
similarity index 92%
rename from test/tests/integration/functions/include/sandbox.ts
rename to src/test/tests/integration/functions/include/sandbox.ts
index 3fb07efc..e0fd7093 100644
--- a/test/tests/integration/functions/include/sandbox.ts
+++ b/src/test/tests/integration/functions/include/sandbox.ts
@@ -1,6 +1,6 @@
 import TestBase, {runTest} from "../../TestBase";
 import {createIntegrationTest} from "../../test";
-import {createSandboxSecurityPolicy} from "../../../../../src/lib/sandbox/security-policy";
+import {createSandboxSecurityPolicy} from "../../../../../main/lib/sandbox/security-policy";
 
 class Test extends TestBase {
     getDescription() {
diff --git a/test/tests/integration/functions/include/sandbox_disabling.ts b/src/test/tests/integration/functions/include/sandbox_disabling.ts
similarity index 100%
rename from test/tests/integration/functions/include/sandbox_disabling.ts
rename to src/test/tests/integration/functions/include/sandbox_disabling.ts
diff --git a/test/tests/integration/functions/include/sandbox_disabling_ignore_missing.ts b/src/test/tests/integration/functions/include/sandbox_disabling_ignore_missing.ts
similarity index 100%
rename from test/tests/integration/functions/include/sandbox_disabling_ignore_missing.ts
rename to src/test/tests/integration/functions/include/sandbox_disabling_ignore_missing.ts
diff --git a/test/tests/integration/functions/include/template_as_array.ts b/src/test/tests/integration/functions/include/template_as_array.ts
similarity index 100%
rename from test/tests/integration/functions/include/template_as_array.ts
rename to src/test/tests/integration/functions/include/template_as_array.ts
diff --git a/test/tests/integration/functions/include/template_from_string.ts b/src/test/tests/integration/functions/include/template_from_string.ts
similarity index 100%
rename from test/tests/integration/functions/include/template_from_string.ts
rename to src/test/tests/integration/functions/include/template_from_string.ts
diff --git a/test/tests/integration/functions/include/template_instance.ts b/src/test/tests/integration/functions/include/template_instance.ts
similarity index 85%
rename from test/tests/integration/functions/include/template_instance.ts
rename to src/test/tests/integration/functions/include/template_instance.ts
index 45809762..03f2a0f6 100644
--- a/test/tests/integration/functions/include/template_instance.ts
+++ b/src/test/tests/integration/functions/include/template_instance.ts
@@ -1,7 +1,7 @@
 import TestBase, {runTest} from "../../TestBase";
 import {createIntegrationTest} from "../../test";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
 
 class Test extends TestBase {
     getDescription() {
diff --git a/test/tests/integration/functions/include/with-null.ts b/src/test/tests/integration/functions/include/with-null.ts
similarity index 100%
rename from test/tests/integration/functions/include/with-null.ts
rename to src/test/tests/integration/functions/include/with-null.ts
diff --git a/test/tests/integration/functions/include/with_context.ts b/src/test/tests/integration/functions/include/with_context.ts
similarity index 100%
rename from test/tests/integration/functions/include/with_context.ts
rename to src/test/tests/integration/functions/include/with_context.ts
diff --git a/test/tests/integration/functions/include/with_variables.ts b/src/test/tests/integration/functions/include/with_variables.ts
similarity index 100%
rename from test/tests/integration/functions/include/with_variables.ts
rename to src/test/tests/integration/functions/include/with_variables.ts
diff --git a/test/tests/integration/functions/index.ts b/src/test/tests/integration/functions/index.ts
similarity index 100%
rename from test/tests/integration/functions/index.ts
rename to src/test/tests/integration/functions/index.ts
diff --git a/test/tests/integration/functions/max.ts b/src/test/tests/integration/functions/max.ts
similarity index 100%
rename from test/tests/integration/functions/max.ts
rename to src/test/tests/integration/functions/max.ts
diff --git a/test/tests/integration/functions/min.ts b/src/test/tests/integration/functions/min.ts
similarity index 100%
rename from test/tests/integration/functions/min.ts
rename to src/test/tests/integration/functions/min.ts
diff --git a/test/tests/integration/functions/parent/index.ts b/src/test/tests/integration/functions/parent/index.ts
similarity index 100%
rename from test/tests/integration/functions/parent/index.ts
rename to src/test/tests/integration/functions/parent/index.ts
diff --git a/test/tests/integration/functions/parent/missing-parent-block.ts b/src/test/tests/integration/functions/parent/missing-parent-block.ts
similarity index 100%
rename from test/tests/integration/functions/parent/missing-parent-block.ts
rename to src/test/tests/integration/functions/parent/missing-parent-block.ts
diff --git a/test/tests/integration/functions/parent/outside-a-block.ts b/src/test/tests/integration/functions/parent/outside-a-block.ts
similarity index 100%
rename from test/tests/integration/functions/parent/outside-a-block.ts
rename to src/test/tests/integration/functions/parent/outside-a-block.ts
diff --git a/test/tests/integration/functions/random/index.ts b/src/test/tests/integration/functions/random/index.ts
similarity index 100%
rename from test/tests/integration/functions/random/index.ts
rename to src/test/tests/integration/functions/random/index.ts
diff --git a/test/tests/integration/functions/random/random.ts b/src/test/tests/integration/functions/random/random.ts
similarity index 100%
rename from test/tests/integration/functions/random/random.ts
rename to src/test/tests/integration/functions/random/random.ts
diff --git a/test/tests/integration/functions/random/with-array-as-values.ts b/src/test/tests/integration/functions/random/with-array-as-values.ts
similarity index 100%
rename from test/tests/integration/functions/random/with-array-as-values.ts
rename to src/test/tests/integration/functions/random/with-array-as-values.ts
diff --git a/test/tests/integration/functions/random/with-buffer-as-values.ts b/src/test/tests/integration/functions/random/with-buffer-as-values.ts
similarity index 93%
rename from test/tests/integration/functions/random/with-buffer-as-values.ts
rename to src/test/tests/integration/functions/random/with-buffer-as-values.ts
index b6d337fb..68c35c2c 100644
--- a/test/tests/integration/functions/random/with-buffer-as-values.ts
+++ b/src/test/tests/integration/functions/random/with-buffer-as-values.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../../TestBase";
-import {iconv} from "../../../../../src/lib/helpers/iconv";
+import {iconv} from "../../../../../main/lib/helpers/iconv";
 
 runTest({
     description: '"random" function with buffer as values',
diff --git a/test/tests/integration/functions/random/with-object-as-values.ts b/src/test/tests/integration/functions/random/with-object-as-values.ts
similarity index 100%
rename from test/tests/integration/functions/random/with-object-as-values.ts
rename to src/test/tests/integration/functions/random/with-object-as-values.ts
diff --git a/test/tests/integration/functions/random/without-max.ts b/src/test/tests/integration/functions/random/without-max.ts
similarity index 100%
rename from test/tests/integration/functions/random/without-max.ts
rename to src/test/tests/integration/functions/random/without-max.ts
diff --git a/test/tests/integration/functions/random/without-values.ts b/src/test/tests/integration/functions/random/without-values.ts
similarity index 100%
rename from test/tests/integration/functions/random/without-values.ts
rename to src/test/tests/integration/functions/random/without-values.ts
diff --git a/test/tests/integration/functions/range.ts b/src/test/tests/integration/functions/range.ts
similarity index 100%
rename from test/tests/integration/functions/range.ts
rename to src/test/tests/integration/functions/range.ts
diff --git a/test/tests/integration/functions/recursive_block_with_inheritance.ts b/src/test/tests/integration/functions/recursive_block_with_inheritance.ts
similarity index 100%
rename from test/tests/integration/functions/recursive_block_with_inheritance.ts
rename to src/test/tests/integration/functions/recursive_block_with_inheritance.ts
diff --git a/test/tests/integration/functions/source/index.ts b/src/test/tests/integration/functions/source/index.ts
similarity index 100%
rename from test/tests/integration/functions/source/index.ts
rename to src/test/tests/integration/functions/source/index.ts
diff --git a/test/tests/integration/functions/source/source.ts b/src/test/tests/integration/functions/source/source.ts
similarity index 100%
rename from test/tests/integration/functions/source/source.ts
rename to src/test/tests/integration/functions/source/source.ts
diff --git a/test/tests/integration/functions/source/with-a-missing-template.ts b/src/test/tests/integration/functions/source/with-a-missing-template.ts
similarity index 100%
rename from test/tests/integration/functions/source/with-a-missing-template.ts
rename to src/test/tests/integration/functions/source/with-a-missing-template.ts
diff --git a/test/tests/integration/functions/special_chars.ts b/src/test/tests/integration/functions/special_chars.ts
similarity index 100%
rename from test/tests/integration/functions/special_chars.ts
rename to src/test/tests/integration/functions/special_chars.ts
diff --git a/test/tests/integration/functions/static_calls.ts b/src/test/tests/integration/functions/static_calls.ts
similarity index 100%
rename from test/tests/integration/functions/static_calls.ts
rename to src/test/tests/integration/functions/static_calls.ts
diff --git a/test/tests/integration/functions/template_from_string/index.ts b/src/test/tests/integration/functions/template_from_string/index.ts
similarity index 100%
rename from test/tests/integration/functions/template_from_string/index.ts
rename to src/test/tests/integration/functions/template_from_string/index.ts
diff --git a/test/tests/integration/functions/template_from_string/template_from_string.ts b/src/test/tests/integration/functions/template_from_string/template_from_string.ts
similarity index 100%
rename from test/tests/integration/functions/template_from_string/template_from_string.ts
rename to src/test/tests/integration/functions/template_from_string/template_from_string.ts
diff --git a/test/tests/integration/functions/template_from_string/template_from_string_error.ts b/src/test/tests/integration/functions/template_from_string/template_from_string_error.ts
similarity index 100%
rename from test/tests/integration/functions/template_from_string/template_from_string_error.ts
rename to src/test/tests/integration/functions/template_from_string/template_from_string_error.ts
diff --git a/test/tests/integration/globals/basic.ts b/src/test/tests/integration/globals/basic.ts
similarity index 100%
rename from test/tests/integration/globals/basic.ts
rename to src/test/tests/integration/globals/basic.ts
diff --git a/test/tests/integration/globals/index.ts b/src/test/tests/integration/globals/index.ts
similarity index 100%
rename from test/tests/integration/globals/index.ts
rename to src/test/tests/integration/globals/index.ts
diff --git a/test/tests/integration/globals/with-include.ts b/src/test/tests/integration/globals/with-include.ts
similarity index 100%
rename from test/tests/integration/globals/with-include.ts
rename to src/test/tests/integration/globals/with-include.ts
diff --git a/test/tests/integration/implicit-auto-escaping/applies-at-the-root-of-the-template.ts b/src/test/tests/integration/implicit-auto-escaping/applies-at-the-root-of-the-template.ts
similarity index 100%
rename from test/tests/integration/implicit-auto-escaping/applies-at-the-root-of-the-template.ts
rename to src/test/tests/integration/implicit-auto-escaping/applies-at-the-root-of-the-template.ts
diff --git a/test/tests/integration/implicit-auto-escaping/index.ts b/src/test/tests/integration/implicit-auto-escaping/index.ts
similarity index 100%
rename from test/tests/integration/implicit-auto-escaping/index.ts
rename to src/test/tests/integration/implicit-auto-escaping/index.ts
diff --git a/test/tests/integration/index.ts b/src/test/tests/integration/index.ts
similarity index 100%
rename from test/tests/integration/index.ts
rename to src/test/tests/integration/index.ts
diff --git a/test/tests/integration/macros/default_values.ts b/src/test/tests/integration/macros/default_values.ts
similarity index 100%
rename from test/tests/integration/macros/default_values.ts
rename to src/test/tests/integration/macros/default_values.ts
diff --git a/test/tests/integration/macros/index.ts b/src/test/tests/integration/macros/index.ts
similarity index 100%
rename from test/tests/integration/macros/index.ts
rename to src/test/tests/integration/macros/index.ts
diff --git a/test/tests/integration/macros/nested_calls.ts b/src/test/tests/integration/macros/nested_calls.ts
similarity index 100%
rename from test/tests/integration/macros/nested_calls.ts
rename to src/test/tests/integration/macros/nested_calls.ts
diff --git a/test/tests/integration/macros/reserved_variables.ts b/src/test/tests/integration/macros/reserved_variables.ts
similarity index 100%
rename from test/tests/integration/macros/reserved_variables.ts
rename to src/test/tests/integration/macros/reserved_variables.ts
diff --git a/test/tests/integration/macros/simple.ts b/src/test/tests/integration/macros/simple.ts
similarity index 100%
rename from test/tests/integration/macros/simple.ts
rename to src/test/tests/integration/macros/simple.ts
diff --git a/test/tests/integration/macros/unknown_macro.ts b/src/test/tests/integration/macros/unknown_macro.ts
similarity index 100%
rename from test/tests/integration/macros/unknown_macro.ts
rename to src/test/tests/integration/macros/unknown_macro.ts
diff --git a/test/tests/integration/macros/varargs.ts b/src/test/tests/integration/macros/varargs.ts
similarity index 100%
rename from test/tests/integration/macros/varargs.ts
rename to src/test/tests/integration/macros/varargs.ts
diff --git a/test/tests/integration/macros/varargs_argument.ts b/src/test/tests/integration/macros/varargs_argument.ts
similarity index 100%
rename from test/tests/integration/macros/varargs_argument.ts
rename to src/test/tests/integration/macros/varargs_argument.ts
diff --git a/test/tests/integration/macros/with_filters.ts b/src/test/tests/integration/macros/with_filters.ts
similarity index 100%
rename from test/tests/integration/macros/with_filters.ts
rename to src/test/tests/integration/macros/with_filters.ts
diff --git a/test/tests/integration/operators/equal.ts b/src/test/tests/integration/operators/equal.ts
similarity index 100%
rename from test/tests/integration/operators/equal.ts
rename to src/test/tests/integration/operators/equal.ts
diff --git a/test/tests/integration/operators/has-every/basic.ts b/src/test/tests/integration/operators/has-every/basic.ts
similarity index 100%
rename from test/tests/integration/operators/has-every/basic.ts
rename to src/test/tests/integration/operators/has-every/basic.ts
diff --git a/test/tests/integration/operators/has-every/index.ts b/src/test/tests/integration/operators/has-every/index.ts
similarity index 100%
rename from test/tests/integration/operators/has-every/index.ts
rename to src/test/tests/integration/operators/has-every/index.ts
diff --git a/test/tests/integration/operators/has-every/is-not-supported-by-level-2.ts b/src/test/tests/integration/operators/has-every/is-not-supported-by-level-2.ts
similarity index 100%
rename from test/tests/integration/operators/has-every/is-not-supported-by-level-2.ts
rename to src/test/tests/integration/operators/has-every/is-not-supported-by-level-2.ts
diff --git a/test/tests/integration/operators/has-some/basic.ts b/src/test/tests/integration/operators/has-some/basic.ts
similarity index 100%
rename from test/tests/integration/operators/has-some/basic.ts
rename to src/test/tests/integration/operators/has-some/basic.ts
diff --git a/test/tests/integration/operators/has-some/index.ts b/src/test/tests/integration/operators/has-some/index.ts
similarity index 100%
rename from test/tests/integration/operators/has-some/index.ts
rename to src/test/tests/integration/operators/has-some/index.ts
diff --git a/test/tests/integration/operators/has-some/is-not-supported-by-level-2.ts b/src/test/tests/integration/operators/has-some/is-not-supported-by-level-2.ts
similarity index 100%
rename from test/tests/integration/operators/has-some/is-not-supported-by-level-2.ts
rename to src/test/tests/integration/operators/has-some/is-not-supported-by-level-2.ts
diff --git a/test/tests/integration/operators/index.ts b/src/test/tests/integration/operators/index.ts
similarity index 100%
rename from test/tests/integration/operators/index.ts
rename to src/test/tests/integration/operators/index.ts
diff --git a/test/tests/integration/operators/spaceship.ts b/src/test/tests/integration/operators/spaceship.ts
similarity index 100%
rename from test/tests/integration/operators/spaceship.ts
rename to src/test/tests/integration/operators/spaceship.ts
diff --git a/test/tests/integration/parsing/assigment-on-a-primitive-value.ts b/src/test/tests/integration/parsing/assigment-on-a-primitive-value.ts
similarity index 100%
rename from test/tests/integration/parsing/assigment-on-a-primitive-value.ts
rename to src/test/tests/integration/parsing/assigment-on-a-primitive-value.ts
diff --git a/test/tests/integration/parsing/block-without-tag-name.ts b/src/test/tests/integration/parsing/block-without-tag-name.ts
similarity index 100%
rename from test/tests/integration/parsing/block-without-tag-name.ts
rename to src/test/tests/integration/parsing/block-without-tag-name.ts
diff --git a/test/tests/integration/parsing/index.ts b/src/test/tests/integration/parsing/index.ts
similarity index 100%
rename from test/tests/integration/parsing/index.ts
rename to src/test/tests/integration/parsing/index.ts
diff --git a/test/tests/integration/parsing/invalid-named-argument.ts b/src/test/tests/integration/parsing/invalid-named-argument.ts
similarity index 100%
rename from test/tests/integration/parsing/invalid-named-argument.ts
rename to src/test/tests/integration/parsing/invalid-named-argument.ts
diff --git a/test/tests/integration/parsing/non-strict/index.ts b/src/test/tests/integration/parsing/non-strict/index.ts
similarity index 100%
rename from test/tests/integration/parsing/non-strict/index.ts
rename to src/test/tests/integration/parsing/non-strict/index.ts
diff --git a/test/tests/integration/parsing/non-strict/unknown_filter.ts b/src/test/tests/integration/parsing/non-strict/unknown_filter.ts
similarity index 100%
rename from test/tests/integration/parsing/non-strict/unknown_filter.ts
rename to src/test/tests/integration/parsing/non-strict/unknown_filter.ts
diff --git a/test/tests/integration/parsing/non-strict/unknown_function.ts b/src/test/tests/integration/parsing/non-strict/unknown_function.ts
similarity index 100%
rename from test/tests/integration/parsing/non-strict/unknown_function.ts
rename to src/test/tests/integration/parsing/non-strict/unknown_function.ts
diff --git a/test/tests/integration/parsing/non-strict/unknown_test.ts b/src/test/tests/integration/parsing/non-strict/unknown_test.ts
similarity index 100%
rename from test/tests/integration/parsing/non-strict/unknown_test.ts
rename to src/test/tests/integration/parsing/non-strict/unknown_test.ts
diff --git a/test/tests/integration/parsing/strict/index.ts b/src/test/tests/integration/parsing/strict/index.ts
similarity index 100%
rename from test/tests/integration/parsing/strict/index.ts
rename to src/test/tests/integration/parsing/strict/index.ts
diff --git a/test/tests/integration/parsing/strict/unknown_filter.ts b/src/test/tests/integration/parsing/strict/unknown_filter.ts
similarity index 100%
rename from test/tests/integration/parsing/strict/unknown_filter.ts
rename to src/test/tests/integration/parsing/strict/unknown_filter.ts
diff --git a/test/tests/integration/parsing/strict/unknown_function.ts b/src/test/tests/integration/parsing/strict/unknown_function.ts
similarity index 100%
rename from test/tests/integration/parsing/strict/unknown_function.ts
rename to src/test/tests/integration/parsing/strict/unknown_function.ts
diff --git a/test/tests/integration/parsing/strict/unknown_test.ts b/src/test/tests/integration/parsing/strict/unknown_test.ts
similarity index 100%
rename from test/tests/integration/parsing/strict/unknown_test.ts
rename to src/test/tests/integration/parsing/strict/unknown_test.ts
diff --git a/test/tests/integration/parsing/unexpected-token.ts b/src/test/tests/integration/parsing/unexpected-token.ts
similarity index 100%
rename from test/tests/integration/parsing/unexpected-token.ts
rename to src/test/tests/integration/parsing/unexpected-token.ts
diff --git a/test/tests/integration/regression/block_names_unicity.ts b/src/test/tests/integration/regression/block_names_unicity.ts
similarity index 100%
rename from test/tests/integration/regression/block_names_unicity.ts
rename to src/test/tests/integration/regression/block_names_unicity.ts
diff --git a/test/tests/integration/regression/combined_debug_info.ts b/src/test/tests/integration/regression/combined_debug_info.ts
similarity index 100%
rename from test/tests/integration/regression/combined_debug_info.ts
rename to src/test/tests/integration/regression/combined_debug_info.ts
diff --git a/test/tests/integration/regression/empty_token.ts b/src/test/tests/integration/regression/empty_token.ts
similarity index 100%
rename from test/tests/integration/regression/empty_token.ts
rename to src/test/tests/integration/regression/empty_token.ts
diff --git a/test/tests/integration/regression/index.ts b/src/test/tests/integration/regression/index.ts
similarity index 100%
rename from test/tests/integration/regression/index.ts
rename to src/test/tests/integration/regression/index.ts
diff --git a/test/tests/integration/regression/issue_360.ts b/src/test/tests/integration/regression/issue_360.ts
similarity index 100%
rename from test/tests/integration/regression/issue_360.ts
rename to src/test/tests/integration/regression/issue_360.ts
diff --git a/test/tests/integration/regression/issue_twigphp_1143.ts b/src/test/tests/integration/regression/issue_twigphp_1143.ts
similarity index 100%
rename from test/tests/integration/regression/issue_twigphp_1143.ts
rename to src/test/tests/integration/regression/issue_twigphp_1143.ts
diff --git a/test/tests/integration/regression/js_interpolation.ts b/src/test/tests/integration/regression/js_interpolation.ts
similarity index 100%
rename from test/tests/integration/regression/js_interpolation.ts
rename to src/test/tests/integration/regression/js_interpolation.ts
diff --git a/test/tests/integration/regression/multi_word_tests.ts b/src/test/tests/integration/regression/multi_word_tests.ts
similarity index 100%
rename from test/tests/integration/regression/multi_word_tests.ts
rename to src/test/tests/integration/regression/multi_word_tests.ts
diff --git a/test/tests/integration/regression/simple_xml_element.ts b/src/test/tests/integration/regression/simple_xml_element.ts
similarity index 100%
rename from test/tests/integration/regression/simple_xml_element.ts
rename to src/test/tests/integration/regression/simple_xml_element.ts
diff --git a/test/tests/integration/regression/strings_like_numbers.ts b/src/test/tests/integration/regression/strings_like_numbers.ts
similarity index 100%
rename from test/tests/integration/regression/strings_like_numbers.ts
rename to src/test/tests/integration/regression/strings_like_numbers.ts
diff --git a/test/tests/integration/sandboxing/index.ts b/src/test/tests/integration/sandboxing/index.ts
similarity index 100%
rename from test/tests/integration/sandboxing/index.ts
rename to src/test/tests/integration/sandboxing/index.ts
diff --git a/test/tests/integration/sandboxing/when-disabled.ts b/src/test/tests/integration/sandboxing/when-disabled.ts
similarity index 100%
rename from test/tests/integration/sandboxing/when-disabled.ts
rename to src/test/tests/integration/sandboxing/when-disabled.ts
diff --git a/test/tests/integration/sandboxing/when-enabled.ts b/src/test/tests/integration/sandboxing/when-enabled.ts
similarity index 83%
rename from test/tests/integration/sandboxing/when-enabled.ts
rename to src/test/tests/integration/sandboxing/when-enabled.ts
index 51f765d3..18694bda 100644
--- a/test/tests/integration/sandboxing/when-enabled.ts
+++ b/src/test/tests/integration/sandboxing/when-enabled.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {createSandboxSecurityPolicy} from "../../../../src/lib/sandbox/security-policy";
+import {createSandboxSecurityPolicy} from "../../../../main/lib/sandbox/security-policy";
 
 runTest({
     description: 'Sandboxing when disabled',
diff --git a/test/tests/integration/sandboxing/with-filter.ts b/src/test/tests/integration/sandboxing/with-filter.ts
similarity index 100%
rename from test/tests/integration/sandboxing/with-filter.ts
rename to src/test/tests/integration/sandboxing/with-filter.ts
diff --git a/test/tests/integration/sandboxing/with-function.ts b/src/test/tests/integration/sandboxing/with-function.ts
similarity index 100%
rename from test/tests/integration/sandboxing/with-function.ts
rename to src/test/tests/integration/sandboxing/with-function.ts
diff --git a/test/tests/integration/sandboxing/with-method.ts b/src/test/tests/integration/sandboxing/with-method.ts
similarity index 100%
rename from test/tests/integration/sandboxing/with-method.ts
rename to src/test/tests/integration/sandboxing/with-method.ts
diff --git a/test/tests/integration/sandboxing/with-missing-variable.ts b/src/test/tests/integration/sandboxing/with-missing-variable.ts
similarity index 100%
rename from test/tests/integration/sandboxing/with-missing-variable.ts
rename to src/test/tests/integration/sandboxing/with-missing-variable.ts
diff --git a/test/tests/integration/sandboxing/with-property.ts b/src/test/tests/integration/sandboxing/with-property.ts
similarity index 100%
rename from test/tests/integration/sandboxing/with-property.ts
rename to src/test/tests/integration/sandboxing/with-property.ts
diff --git a/test/tests/integration/sandboxing/with-tag.ts b/src/test/tests/integration/sandboxing/with-tag.ts
similarity index 100%
rename from test/tests/integration/sandboxing/with-tag.ts
rename to src/test/tests/integration/sandboxing/with-tag.ts
diff --git a/test/tests/integration/source-map/index.ts b/src/test/tests/integration/source-map/index.ts
similarity index 100%
rename from test/tests/integration/source-map/index.ts
rename to src/test/tests/integration/source-map/index.ts
diff --git a/test/tests/integration/source-map/print.ts b/src/test/tests/integration/source-map/print.ts
similarity index 100%
rename from test/tests/integration/source-map/print.ts
rename to src/test/tests/integration/source-map/print.ts
diff --git a/test/tests/integration/source-map/simple.ts b/src/test/tests/integration/source-map/simple.ts
similarity index 100%
rename from test/tests/integration/source-map/simple.ts
rename to src/test/tests/integration/source-map/simple.ts
diff --git a/test/tests/integration/source-map/with-absolute-source-name.ts b/src/test/tests/integration/source-map/with-absolute-source-name.ts
similarity index 82%
rename from test/tests/integration/source-map/with-absolute-source-name.ts
rename to src/test/tests/integration/source-map/with-absolute-source-name.ts
index f6729223..212ed069 100644
--- a/test/tests/integration/source-map/with-absolute-source-name.ts
+++ b/src/test/tests/integration/source-map/with-absolute-source-name.ts
@@ -1,8 +1,8 @@
 import {runTest} from "../TestBase";
 import {stub} from "sinon";
-import {createSource} from "../../../../src/lib/source";
+import {createSource} from "../../../../main/lib/source";
 import {resolve} from "path";
-import {createArrayLoader} from "../../../../src/lib/loader/array";
+import {createArrayLoader} from "../../../../main/lib/loader/array";
 
 const loader = createArrayLoader({});
 
diff --git a/test/tests/integration/source-map/with-custom-function.ts b/src/test/tests/integration/source-map/with-custom-function.ts
similarity index 89%
rename from test/tests/integration/source-map/with-custom-function.ts
rename to src/test/tests/integration/source-map/with-custom-function.ts
index 1fdf8c91..a7664783 100644
--- a/test/tests/integration/source-map/with-custom-function.ts
+++ b/src/test/tests/integration/source-map/with-custom-function.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {createFunction} from "../../../../src/lib";
+import {createFunction} from "../../../../main/lib";
 
 runTest({
     description: "Source map supports custom function",
diff --git a/test/tests/integration/source-map/with-embedding.ts b/src/test/tests/integration/source-map/with-embedding.ts
similarity index 100%
rename from test/tests/integration/source-map/with-embedding.ts
rename to src/test/tests/integration/source-map/with-embedding.ts
diff --git a/test/tests/integration/source-map/with-inclusion.ts b/src/test/tests/integration/source-map/with-inclusion.ts
similarity index 100%
rename from test/tests/integration/source-map/with-inclusion.ts
rename to src/test/tests/integration/source-map/with-inclusion.ts
diff --git a/test/tests/integration/source-map/with-inheritance.ts b/src/test/tests/integration/source-map/with-inheritance.ts
similarity index 100%
rename from test/tests/integration/source-map/with-inheritance.ts
rename to src/test/tests/integration/source-map/with-inheritance.ts
diff --git a/test/tests/integration/tags/apply/basic.ts b/src/test/tests/integration/tags/apply/basic.ts
similarity index 100%
rename from test/tests/integration/tags/apply/basic.ts
rename to src/test/tests/integration/tags/apply/basic.ts
diff --git a/test/tests/integration/tags/apply/index.ts b/src/test/tests/integration/tags/apply/index.ts
similarity index 100%
rename from test/tests/integration/tags/apply/index.ts
rename to src/test/tests/integration/tags/apply/index.ts
diff --git a/test/tests/integration/tags/apply/json_encode.ts b/src/test/tests/integration/tags/apply/json_encode.ts
similarity index 100%
rename from test/tests/integration/tags/apply/json_encode.ts
rename to src/test/tests/integration/tags/apply/json_encode.ts
diff --git a/test/tests/integration/tags/apply/multiple.ts b/src/test/tests/integration/tags/apply/multiple.ts
similarity index 100%
rename from test/tests/integration/tags/apply/multiple.ts
rename to src/test/tests/integration/tags/apply/multiple.ts
diff --git a/test/tests/integration/tags/apply/nested.ts b/src/test/tests/integration/tags/apply/nested.ts
similarity index 100%
rename from test/tests/integration/tags/apply/nested.ts
rename to src/test/tests/integration/tags/apply/nested.ts
diff --git a/test/tests/integration/tags/apply/scope.ts b/src/test/tests/integration/tags/apply/scope.ts
similarity index 100%
rename from test/tests/integration/tags/apply/scope.ts
rename to src/test/tests/integration/tags/apply/scope.ts
diff --git a/test/tests/integration/tags/apply/with-arguments.ts b/src/test/tests/integration/tags/apply/with-arguments.ts
similarity index 88%
rename from test/tests/integration/tags/apply/with-arguments.ts
rename to src/test/tests/integration/tags/apply/with-arguments.ts
index 6bfb73a3..d6ad80e0 100644
--- a/test/tests/integration/tags/apply/with-arguments.ts
+++ b/src/test/tests/integration/tags/apply/with-arguments.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../../TestBase";
-import {createFilter} from "../../../../../src/lib/filter";
+import {createFilter} from "../../../../../main/lib/filter";
 
 runTest({
     description: '"apply" tag with filter arguments',
diff --git a/test/tests/integration/tags/apply/with_for_tag.ts b/src/test/tests/integration/tags/apply/with_for_tag.ts
similarity index 100%
rename from test/tests/integration/tags/apply/with_for_tag.ts
rename to src/test/tests/integration/tags/apply/with_for_tag.ts
diff --git a/test/tests/integration/tags/apply/with_if_tag.ts b/src/test/tests/integration/tags/apply/with_if_tag.ts
similarity index 100%
rename from test/tests/integration/tags/apply/with_if_tag.ts
rename to src/test/tests/integration/tags/apply/with_if_tag.ts
diff --git a/test/tests/integration/tags/autoescape/basic.ts b/src/test/tests/integration/tags/autoescape/basic.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/basic.ts
rename to src/test/tests/integration/tags/autoescape/basic.ts
diff --git a/test/tests/integration/tags/autoescape/blocks.ts b/src/test/tests/integration/tags/autoescape/blocks.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/blocks.ts
rename to src/test/tests/integration/tags/autoescape/blocks.ts
diff --git a/test/tests/integration/tags/autoescape/double_escaping.ts b/src/test/tests/integration/tags/autoescape/double_escaping.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/double_escaping.ts
rename to src/test/tests/integration/tags/autoescape/double_escaping.ts
diff --git a/test/tests/integration/tags/autoescape/index.ts b/src/test/tests/integration/tags/autoescape/index.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/index.ts
rename to src/test/tests/integration/tags/autoescape/index.ts
diff --git a/test/tests/integration/tags/autoescape/literal/conditional-expression-with-a-variable.ts b/src/test/tests/integration/tags/autoescape/literal/conditional-expression-with-a-variable.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/literal/conditional-expression-with-a-variable.ts
rename to src/test/tests/integration/tags/autoescape/literal/conditional-expression-with-a-variable.ts
diff --git a/test/tests/integration/tags/autoescape/literal/conditional-expression-with-only-literals.ts b/src/test/tests/integration/tags/autoescape/literal/conditional-expression-with-only-literals.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/literal/conditional-expression-with-only-literals.ts
rename to src/test/tests/integration/tags/autoescape/literal/conditional-expression-with-only-literals.ts
diff --git a/test/tests/integration/tags/autoescape/literal/index.ts b/src/test/tests/integration/tags/autoescape/literal/index.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/literal/index.ts
rename to src/test/tests/integration/tags/autoescape/literal/index.ts
diff --git a/test/tests/integration/tags/autoescape/literal/nested-conditionals-with-a-variable-marked-safe.ts b/src/test/tests/integration/tags/autoescape/literal/nested-conditionals-with-a-variable-marked-safe.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/literal/nested-conditionals-with-a-variable-marked-safe.ts
rename to src/test/tests/integration/tags/autoescape/literal/nested-conditionals-with-a-variable-marked-safe.ts
diff --git a/test/tests/integration/tags/autoescape/literal/nested-conditionals-with-a-variable.ts b/src/test/tests/integration/tags/autoescape/literal/nested-conditionals-with-a-variable.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/literal/nested-conditionals-with-a-variable.ts
rename to src/test/tests/integration/tags/autoescape/literal/nested-conditionals-with-a-variable.ts
diff --git a/test/tests/integration/tags/autoescape/literal/nested-conditionals-with-only-literals.ts b/src/test/tests/integration/tags/autoescape/literal/nested-conditionals-with-only-literals.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/literal/nested-conditionals-with-only-literals.ts
rename to src/test/tests/integration/tags/autoescape/literal/nested-conditionals-with-only-literals.ts
diff --git a/test/tests/integration/tags/autoescape/literal/simple.ts b/src/test/tests/integration/tags/autoescape/literal/simple.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/literal/simple.ts
rename to src/test/tests/integration/tags/autoescape/literal/simple.ts
diff --git a/test/tests/integration/tags/autoescape/nested.ts b/src/test/tests/integration/tags/autoescape/nested.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/nested.ts
rename to src/test/tests/integration/tags/autoescape/nested.ts
diff --git a/test/tests/integration/tags/autoescape/objects.ts b/src/test/tests/integration/tags/autoescape/objects.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/objects.ts
rename to src/test/tests/integration/tags/autoescape/objects.ts
diff --git a/test/tests/integration/tags/autoescape/raw.ts b/src/test/tests/integration/tags/autoescape/raw.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/raw.ts
rename to src/test/tests/integration/tags/autoescape/raw.ts
diff --git a/test/tests/integration/tags/autoescape/strategy.ts b/src/test/tests/integration/tags/autoescape/strategy.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/strategy.ts
rename to src/test/tests/integration/tags/autoescape/strategy.ts
diff --git a/test/tests/integration/tags/autoescape/type.ts b/src/test/tests/integration/tags/autoescape/type.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/type.ts
rename to src/test/tests/integration/tags/autoescape/type.ts
diff --git a/test/tests/integration/tags/autoescape/with-block-function.ts b/src/test/tests/integration/tags/autoescape/with-block-function.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/with-block-function.ts
rename to src/test/tests/integration/tags/autoescape/with-block-function.ts
diff --git a/test/tests/integration/tags/autoescape/with-parent-function.ts b/src/test/tests/integration/tags/autoescape/with-parent-function.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/with-parent-function.ts
rename to src/test/tests/integration/tags/autoescape/with-parent-function.ts
diff --git a/test/tests/integration/tags/autoescape/with_a_non_supported_strategy_name.ts b/src/test/tests/integration/tags/autoescape/with_a_non_supported_strategy_name.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/with_a_non_supported_strategy_name.ts
rename to src/test/tests/integration/tags/autoescape/with_a_non_supported_strategy_name.ts
diff --git a/test/tests/integration/tags/autoescape/with_a_variable_as_strategy.ts b/src/test/tests/integration/tags/autoescape/with_a_variable_as_strategy.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/with_a_variable_as_strategy.ts
rename to src/test/tests/integration/tags/autoescape/with_a_variable_as_strategy.ts
diff --git a/test/tests/integration/tags/autoescape/with_filters.ts b/src/test/tests/integration/tags/autoescape/with_filters.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/with_filters.ts
rename to src/test/tests/integration/tags/autoescape/with_filters.ts
diff --git a/test/tests/integration/tags/autoescape/with_filters_arguments.ts b/src/test/tests/integration/tags/autoescape/with_filters_arguments.ts
similarity index 100%
rename from test/tests/integration/tags/autoescape/with_filters_arguments.ts
rename to src/test/tests/integration/tags/autoescape/with_filters_arguments.ts
diff --git a/test/tests/integration/tags/block/basic.ts b/src/test/tests/integration/tags/block/basic.ts
similarity index 100%
rename from test/tests/integration/tags/block/basic.ts
rename to src/test/tests/integration/tags/block/basic.ts
diff --git a/test/tests/integration/tags/block/block_unique_name.ts b/src/test/tests/integration/tags/block/block_unique_name.ts
similarity index 100%
rename from test/tests/integration/tags/block/block_unique_name.ts
rename to src/test/tests/integration/tags/block/block_unique_name.ts
diff --git a/test/tests/integration/tags/block/capturing_block.ts b/src/test/tests/integration/tags/block/capturing_block.ts
similarity index 100%
rename from test/tests/integration/tags/block/capturing_block.ts
rename to src/test/tests/integration/tags/block/capturing_block.ts
diff --git a/test/tests/integration/tags/block/conditional_block.ts b/src/test/tests/integration/tags/block/conditional_block.ts
similarity index 100%
rename from test/tests/integration/tags/block/conditional_block.ts
rename to src/test/tests/integration/tags/block/conditional_block.ts
diff --git a/test/tests/integration/tags/block/index.ts b/src/test/tests/integration/tags/block/index.ts
similarity index 100%
rename from test/tests/integration/tags/block/index.ts
rename to src/test/tests/integration/tags/block/index.ts
diff --git a/test/tests/integration/tags/block/scope.ts b/src/test/tests/integration/tags/block/scope.ts
similarity index 100%
rename from test/tests/integration/tags/block/scope.ts
rename to src/test/tests/integration/tags/block/scope.ts
diff --git a/test/tests/integration/tags/block/special_chars.ts b/src/test/tests/integration/tags/block/special_chars.ts
similarity index 100%
rename from test/tests/integration/tags/block/special_chars.ts
rename to src/test/tests/integration/tags/block/special_chars.ts
diff --git a/test/tests/integration/tags/block/under-non-capturing-node.level-3.ts b/src/test/tests/integration/tags/block/under-non-capturing-node.level-3.ts
similarity index 100%
rename from test/tests/integration/tags/block/under-non-capturing-node.level-3.ts
rename to src/test/tests/integration/tags/block/under-non-capturing-node.level-3.ts
diff --git a/test/tests/integration/tags/block/with_a_different_endblock_name.ts b/src/test/tests/integration/tags/block/with_a_different_endblock_name.ts
similarity index 100%
rename from test/tests/integration/tags/block/with_a_different_endblock_name.ts
rename to src/test/tests/integration/tags/block/with_a_different_endblock_name.ts
diff --git a/test/tests/integration/tags/deprecated/block.legacy.ts b/src/test/tests/integration/tags/deprecated/block.legacy.ts
similarity index 100%
rename from test/tests/integration/tags/deprecated/block.legacy.ts
rename to src/test/tests/integration/tags/deprecated/block.legacy.ts
diff --git a/test/tests/integration/tags/deprecated/index.ts b/src/test/tests/integration/tags/deprecated/index.ts
similarity index 100%
rename from test/tests/integration/tags/deprecated/index.ts
rename to src/test/tests/integration/tags/deprecated/index.ts
diff --git a/test/tests/integration/tags/deprecated/macro.legacy.ts b/src/test/tests/integration/tags/deprecated/macro.legacy.ts
similarity index 100%
rename from test/tests/integration/tags/deprecated/macro.legacy.ts
rename to src/test/tests/integration/tags/deprecated/macro.legacy.ts
diff --git a/test/tests/integration/tags/deprecated/template.legacy.ts b/src/test/tests/integration/tags/deprecated/template.legacy.ts
similarity index 100%
rename from test/tests/integration/tags/deprecated/template.legacy.ts
rename to src/test/tests/integration/tags/deprecated/template.legacy.ts
diff --git a/test/tests/integration/tags/deprecated/with_a_variable_as_message.ts b/src/test/tests/integration/tags/deprecated/with_a_variable_as_message.ts
similarity index 100%
rename from test/tests/integration/tags/deprecated/with_a_variable_as_message.ts
rename to src/test/tests/integration/tags/deprecated/with_a_variable_as_message.ts
diff --git a/test/tests/integration/tags/embed/basic.ts b/src/test/tests/integration/tags/embed/basic.ts
similarity index 100%
rename from test/tests/integration/tags/embed/basic.ts
rename to src/test/tests/integration/tags/embed/basic.ts
diff --git a/test/tests/integration/tags/embed/complex_dynamic_parent.ts b/src/test/tests/integration/tags/embed/complex_dynamic_parent.ts
similarity index 100%
rename from test/tests/integration/tags/embed/complex_dynamic_parent.ts
rename to src/test/tests/integration/tags/embed/complex_dynamic_parent.ts
diff --git a/test/tests/integration/tags/embed/dynamic_parent.ts b/src/test/tests/integration/tags/embed/dynamic_parent.ts
similarity index 100%
rename from test/tests/integration/tags/embed/dynamic_parent.ts
rename to src/test/tests/integration/tags/embed/dynamic_parent.ts
diff --git a/test/tests/integration/tags/embed/error_line.ts b/src/test/tests/integration/tags/embed/error_line.ts
similarity index 100%
rename from test/tests/integration/tags/embed/error_line.ts
rename to src/test/tests/integration/tags/embed/error_line.ts
diff --git a/test/tests/integration/tags/embed/index.ts b/src/test/tests/integration/tags/embed/index.ts
similarity index 100%
rename from test/tests/integration/tags/embed/index.ts
rename to src/test/tests/integration/tags/embed/index.ts
diff --git a/test/tests/integration/tags/embed/missing.ts b/src/test/tests/integration/tags/embed/missing.ts
similarity index 100%
rename from test/tests/integration/tags/embed/missing.ts
rename to src/test/tests/integration/tags/embed/missing.ts
diff --git a/test/tests/integration/tags/embed/multiple.ts b/src/test/tests/integration/tags/embed/multiple.ts
similarity index 100%
rename from test/tests/integration/tags/embed/multiple.ts
rename to src/test/tests/integration/tags/embed/multiple.ts
diff --git a/test/tests/integration/tags/embed/nested.ts b/src/test/tests/integration/tags/embed/nested.ts
similarity index 100%
rename from test/tests/integration/tags/embed/nested.ts
rename to src/test/tests/integration/tags/embed/nested.ts
diff --git a/test/tests/integration/tags/embed/with_extends.ts b/src/test/tests/integration/tags/embed/with_extends.ts
similarity index 100%
rename from test/tests/integration/tags/embed/with_extends.ts
rename to src/test/tests/integration/tags/embed/with_extends.ts
diff --git a/test/tests/integration/tags/extends/basic.ts b/src/test/tests/integration/tags/extends/basic.ts
similarity index 100%
rename from test/tests/integration/tags/extends/basic.ts
rename to src/test/tests/integration/tags/extends/basic.ts
diff --git a/test/tests/integration/tags/extends/block_expr.ts b/src/test/tests/integration/tags/extends/block_expr.ts
similarity index 100%
rename from test/tests/integration/tags/extends/block_expr.ts
rename to src/test/tests/integration/tags/extends/block_expr.ts
diff --git a/test/tests/integration/tags/extends/block_expr2.ts b/src/test/tests/integration/tags/extends/block_expr2.ts
similarity index 100%
rename from test/tests/integration/tags/extends/block_expr2.ts
rename to src/test/tests/integration/tags/extends/block_expr2.ts
diff --git a/test/tests/integration/tags/extends/capturing_block.ts b/src/test/tests/integration/tags/extends/capturing_block.ts
similarity index 100%
rename from test/tests/integration/tags/extends/capturing_block.ts
rename to src/test/tests/integration/tags/extends/capturing_block.ts
diff --git a/test/tests/integration/tags/extends/conditional.ts b/src/test/tests/integration/tags/extends/conditional.ts
similarity index 100%
rename from test/tests/integration/tags/extends/conditional.ts
rename to src/test/tests/integration/tags/extends/conditional.ts
diff --git a/test/tests/integration/tags/extends/conditional_block.legacy.ts b/src/test/tests/integration/tags/extends/conditional_block.legacy.ts
similarity index 100%
rename from test/tests/integration/tags/extends/conditional_block.legacy.ts
rename to src/test/tests/integration/tags/extends/conditional_block.legacy.ts
diff --git a/test/tests/integration/tags/extends/dynamic.ts b/src/test/tests/integration/tags/extends/dynamic.ts
similarity index 100%
rename from test/tests/integration/tags/extends/dynamic.ts
rename to src/test/tests/integration/tags/extends/dynamic.ts
diff --git a/test/tests/integration/tags/extends/empty.ts b/src/test/tests/integration/tags/extends/empty.ts
similarity index 100%
rename from test/tests/integration/tags/extends/empty.ts
rename to src/test/tests/integration/tags/extends/empty.ts
diff --git a/test/tests/integration/tags/extends/extends_as_array.ts b/src/test/tests/integration/tags/extends/extends_as_array.ts
similarity index 100%
rename from test/tests/integration/tags/extends/extends_as_array.ts
rename to src/test/tests/integration/tags/extends/extends_as_array.ts
diff --git a/test/tests/integration/tags/extends/extends_as_array_with_empty_name.ts b/src/test/tests/integration/tags/extends/extends_as_array_with_empty_name.ts
similarity index 100%
rename from test/tests/integration/tags/extends/extends_as_array_with_empty_name.ts
rename to src/test/tests/integration/tags/extends/extends_as_array_with_empty_name.ts
diff --git a/test/tests/integration/tags/extends/extends_as_array_with_null_name.ts b/src/test/tests/integration/tags/extends/extends_as_array_with_null_name.ts
similarity index 100%
rename from test/tests/integration/tags/extends/extends_as_array_with_null_name.ts
rename to src/test/tests/integration/tags/extends/extends_as_array_with_null_name.ts
diff --git a/test/tests/integration/tags/extends/extends_in_block.ts b/src/test/tests/integration/tags/extends/extends_in_block.ts
similarity index 100%
rename from test/tests/integration/tags/extends/extends_in_block.ts
rename to src/test/tests/integration/tags/extends/extends_in_block.ts
diff --git a/test/tests/integration/tags/extends/extends_in_macro.ts b/src/test/tests/integration/tags/extends/extends_in_macro.ts
similarity index 100%
rename from test/tests/integration/tags/extends/extends_in_macro.ts
rename to src/test/tests/integration/tags/extends/extends_in_macro.ts
diff --git a/test/tests/integration/tags/extends/index.ts b/src/test/tests/integration/tags/extends/index.ts
similarity index 100%
rename from test/tests/integration/tags/extends/index.ts
rename to src/test/tests/integration/tags/extends/index.ts
diff --git a/test/tests/integration/tags/extends/multiple.ts b/src/test/tests/integration/tags/extends/multiple.ts
similarity index 100%
rename from test/tests/integration/tags/extends/multiple.ts
rename to src/test/tests/integration/tags/extends/multiple.ts
diff --git a/test/tests/integration/tags/extends/multiple_dynamic.ts b/src/test/tests/integration/tags/extends/multiple_dynamic.ts
similarity index 100%
rename from test/tests/integration/tags/extends/multiple_dynamic.ts
rename to src/test/tests/integration/tags/extends/multiple_dynamic.ts
diff --git a/test/tests/integration/tags/extends/multiple_extends.ts b/src/test/tests/integration/tags/extends/multiple_extends.ts
similarity index 100%
rename from test/tests/integration/tags/extends/multiple_extends.ts
rename to src/test/tests/integration/tags/extends/multiple_extends.ts
diff --git a/test/tests/integration/tags/extends/nested_blocks.ts b/src/test/tests/integration/tags/extends/nested_blocks.ts
similarity index 100%
rename from test/tests/integration/tags/extends/nested_blocks.ts
rename to src/test/tests/integration/tags/extends/nested_blocks.ts
diff --git a/test/tests/integration/tags/extends/nested_blocks_parent_only.ts b/src/test/tests/integration/tags/extends/nested_blocks_parent_only.ts
similarity index 100%
rename from test/tests/integration/tags/extends/nested_blocks_parent_only.ts
rename to src/test/tests/integration/tags/extends/nested_blocks_parent_only.ts
diff --git a/test/tests/integration/tags/extends/nested_inheritance.ts b/src/test/tests/integration/tags/extends/nested_inheritance.ts
similarity index 100%
rename from test/tests/integration/tags/extends/nested_inheritance.ts
rename to src/test/tests/integration/tags/extends/nested_inheritance.ts
diff --git a/test/tests/integration/tags/extends/parent.ts b/src/test/tests/integration/tags/extends/parent.ts
similarity index 100%
rename from test/tests/integration/tags/extends/parent.ts
rename to src/test/tests/integration/tags/extends/parent.ts
diff --git a/test/tests/integration/tags/extends/parent_change.ts b/src/test/tests/integration/tags/extends/parent_change.ts
similarity index 100%
rename from test/tests/integration/tags/extends/parent_change.ts
rename to src/test/tests/integration/tags/extends/parent_change.ts
diff --git a/test/tests/integration/tags/extends/parent_isolation.ts b/src/test/tests/integration/tags/extends/parent_isolation.ts
similarity index 100%
rename from test/tests/integration/tags/extends/parent_isolation.ts
rename to src/test/tests/integration/tags/extends/parent_isolation.ts
diff --git a/test/tests/integration/tags/extends/parent_nested.ts b/src/test/tests/integration/tags/extends/parent_nested.ts
similarity index 100%
rename from test/tests/integration/tags/extends/parent_nested.ts
rename to src/test/tests/integration/tags/extends/parent_nested.ts
diff --git a/test/tests/integration/tags/extends/parent_without_extends.ts b/src/test/tests/integration/tags/extends/parent_without_extends.ts
similarity index 100%
rename from test/tests/integration/tags/extends/parent_without_extends.ts
rename to src/test/tests/integration/tags/extends/parent_without_extends.ts
diff --git a/test/tests/integration/tags/extends/parent_without_extends_but_traits.ts b/src/test/tests/integration/tags/extends/parent_without_extends_but_traits.ts
similarity index 100%
rename from test/tests/integration/tags/extends/parent_without_extends_but_traits.ts
rename to src/test/tests/integration/tags/extends/parent_without_extends_but_traits.ts
diff --git a/test/tests/integration/tags/extends/template_instance.ts b/src/test/tests/integration/tags/extends/template_instance.ts
similarity index 91%
rename from test/tests/integration/tags/extends/template_instance.ts
rename to src/test/tests/integration/tags/extends/template_instance.ts
index 176e9c7e..37a53d69 100644
--- a/test/tests/integration/tags/extends/template_instance.ts
+++ b/src/test/tests/integration/tags/extends/template_instance.ts
@@ -1,6 +1,6 @@
 import {runTest} from "../../TestBase";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
 
 runTest({
     description: '"extends" tag with template instance',
diff --git a/test/tests/integration/tags/extends/use.ts b/src/test/tests/integration/tags/extends/use.ts
similarity index 100%
rename from test/tests/integration/tags/extends/use.ts
rename to src/test/tests/integration/tags/extends/use.ts
diff --git a/test/tests/integration/tags/filter/basic.ts b/src/test/tests/integration/tags/filter/basic.ts
similarity index 100%
rename from test/tests/integration/tags/filter/basic.ts
rename to src/test/tests/integration/tags/filter/basic.ts
diff --git a/test/tests/integration/tags/filter/index.ts b/src/test/tests/integration/tags/filter/index.ts
similarity index 100%
rename from test/tests/integration/tags/filter/index.ts
rename to src/test/tests/integration/tags/filter/index.ts
diff --git a/test/tests/integration/tags/filter/json_encode.ts b/src/test/tests/integration/tags/filter/json_encode.ts
similarity index 100%
rename from test/tests/integration/tags/filter/json_encode.ts
rename to src/test/tests/integration/tags/filter/json_encode.ts
diff --git a/test/tests/integration/tags/filter/level-3/unsupported.ts b/src/test/tests/integration/tags/filter/level-3/unsupported.ts
similarity index 100%
rename from test/tests/integration/tags/filter/level-3/unsupported.ts
rename to src/test/tests/integration/tags/filter/level-3/unsupported.ts
diff --git a/test/tests/integration/tags/filter/multiple.ts b/src/test/tests/integration/tags/filter/multiple.ts
similarity index 100%
rename from test/tests/integration/tags/filter/multiple.ts
rename to src/test/tests/integration/tags/filter/multiple.ts
diff --git a/test/tests/integration/tags/filter/nested.ts b/src/test/tests/integration/tags/filter/nested.ts
similarity index 100%
rename from test/tests/integration/tags/filter/nested.ts
rename to src/test/tests/integration/tags/filter/nested.ts
diff --git a/test/tests/integration/tags/filter/scope.ts b/src/test/tests/integration/tags/filter/scope.ts
similarity index 100%
rename from test/tests/integration/tags/filter/scope.ts
rename to src/test/tests/integration/tags/filter/scope.ts
diff --git a/test/tests/integration/tags/filter/unknown.ts b/src/test/tests/integration/tags/filter/unknown.ts
similarity index 100%
rename from test/tests/integration/tags/filter/unknown.ts
rename to src/test/tests/integration/tags/filter/unknown.ts
diff --git a/test/tests/integration/tags/filter/with_for_tag.ts b/src/test/tests/integration/tags/filter/with_for_tag.ts
similarity index 100%
rename from test/tests/integration/tags/filter/with_for_tag.ts
rename to src/test/tests/integration/tags/filter/with_for_tag.ts
diff --git a/test/tests/integration/tags/filter/with_if_tag.ts b/src/test/tests/integration/tags/filter/with_if_tag.ts
similarity index 100%
rename from test/tests/integration/tags/filter/with_if_tag.ts
rename to src/test/tests/integration/tags/filter/with_if_tag.ts
diff --git a/test/tests/integration/tags/flush.ts b/src/test/tests/integration/tags/flush.ts
similarity index 100%
rename from test/tests/integration/tags/flush.ts
rename to src/test/tests/integration/tags/flush.ts
diff --git a/test/tests/integration/tags/for/condition.legacy.ts b/src/test/tests/integration/tags/for/condition.legacy.ts
similarity index 100%
rename from test/tests/integration/tags/for/condition.legacy.ts
rename to src/test/tests/integration/tags/for/condition.legacy.ts
diff --git a/test/tests/integration/tags/for/condition_and_nested_for_loop_access.ts b/src/test/tests/integration/tags/for/condition_and_nested_for_loop_access.ts
similarity index 100%
rename from test/tests/integration/tags/for/condition_and_nested_for_loop_access.ts
rename to src/test/tests/integration/tags/for/condition_and_nested_for_loop_access.ts
diff --git a/test/tests/integration/tags/for/containing_with.ts b/src/test/tests/integration/tags/for/containing_with.ts
similarity index 100%
rename from test/tests/integration/tags/for/containing_with.ts
rename to src/test/tests/integration/tags/for/containing_with.ts
diff --git a/test/tests/integration/tags/for/context-as-sequence.ts b/src/test/tests/integration/tags/for/context-as-sequence.ts
similarity index 100%
rename from test/tests/integration/tags/for/context-as-sequence.ts
rename to src/test/tests/integration/tags/for/context-as-sequence.ts
diff --git a/test/tests/integration/tags/for/context.ts b/src/test/tests/integration/tags/for/context.ts
similarity index 100%
rename from test/tests/integration/tags/for/context.ts
rename to src/test/tests/integration/tags/for/context.ts
diff --git a/test/tests/integration/tags/for/else/empty-items.ts b/src/test/tests/integration/tags/for/else/empty-items.ts
similarity index 100%
rename from test/tests/integration/tags/for/else/empty-items.ts
rename to src/test/tests/integration/tags/for/else/empty-items.ts
diff --git a/test/tests/integration/tags/for/else/index.ts b/src/test/tests/integration/tags/for/else/index.ts
similarity index 100%
rename from test/tests/integration/tags/for/else/index.ts
rename to src/test/tests/integration/tags/for/else/index.ts
diff --git a/test/tests/integration/tags/for/else/items.ts b/src/test/tests/integration/tags/for/else/items.ts
similarity index 100%
rename from test/tests/integration/tags/for/else/items.ts
rename to src/test/tests/integration/tags/for/else/items.ts
diff --git a/test/tests/integration/tags/for/else/no-items.ts b/src/test/tests/integration/tags/for/else/no-items.ts
similarity index 100%
rename from test/tests/integration/tags/for/else/no-items.ts
rename to src/test/tests/integration/tags/for/else/no-items.ts
diff --git a/test/tests/integration/tags/for/hashes.ts b/src/test/tests/integration/tags/for/hashes.ts
similarity index 100%
rename from test/tests/integration/tags/for/hashes.ts
rename to src/test/tests/integration/tags/for/hashes.ts
diff --git a/test/tests/integration/tags/for/index.ts b/src/test/tests/integration/tags/for/index.ts
similarity index 100%
rename from test/tests/integration/tags/for/index.ts
rename to src/test/tests/integration/tags/for/index.ts
diff --git a/test/tests/integration/tags/for/inner_variables.ts b/src/test/tests/integration/tags/for/inner_variables.ts
similarity index 100%
rename from test/tests/integration/tags/for/inner_variables.ts
rename to src/test/tests/integration/tags/for/inner_variables.ts
diff --git a/test/tests/integration/tags/for/inside_with.ts b/src/test/tests/integration/tags/for/inside_with.ts
similarity index 100%
rename from test/tests/integration/tags/for/inside_with.ts
rename to src/test/tests/integration/tags/for/inside_with.ts
diff --git a/test/tests/integration/tags/for/keys.ts b/src/test/tests/integration/tags/for/keys.ts
similarity index 100%
rename from test/tests/integration/tags/for/keys.ts
rename to src/test/tests/integration/tags/for/keys.ts
diff --git a/test/tests/integration/tags/for/keys_and_values.ts b/src/test/tests/integration/tags/for/keys_and_values.ts
similarity index 100%
rename from test/tests/integration/tags/for/keys_and_values.ts
rename to src/test/tests/integration/tags/for/keys_and_values.ts
diff --git a/test/tests/integration/tags/for/loop_context.ts b/src/test/tests/integration/tags/for/loop_context.ts
similarity index 100%
rename from test/tests/integration/tags/for/loop_context.ts
rename to src/test/tests/integration/tags/for/loop_context.ts
diff --git a/test/tests/integration/tags/for/loop_context_local.ts b/src/test/tests/integration/tags/for/loop_context_local.ts
similarity index 100%
rename from test/tests/integration/tags/for/loop_context_local.ts
rename to src/test/tests/integration/tags/for/loop_context_local.ts
diff --git a/test/tests/integration/tags/for/loop_not_defined.ts b/src/test/tests/integration/tags/for/loop_not_defined.ts
similarity index 100%
rename from test/tests/integration/tags/for/loop_not_defined.ts
rename to src/test/tests/integration/tags/for/loop_not_defined.ts
diff --git a/test/tests/integration/tags/for/loop_not_defined_cond.ts b/src/test/tests/integration/tags/for/loop_not_defined_cond.ts
similarity index 100%
rename from test/tests/integration/tags/for/loop_not_defined_cond.ts
rename to src/test/tests/integration/tags/for/loop_not_defined_cond.ts
diff --git a/test/tests/integration/tags/for/nested_else.ts b/src/test/tests/integration/tags/for/nested_else.ts
similarity index 100%
rename from test/tests/integration/tags/for/nested_else.ts
rename to src/test/tests/integration/tags/for/nested_else.ts
diff --git a/test/tests/integration/tags/for/objects.ts b/src/test/tests/integration/tags/for/objects.ts
similarity index 100%
rename from test/tests/integration/tags/for/objects.ts
rename to src/test/tests/integration/tags/for/objects.ts
diff --git a/test/tests/integration/tags/for/objects_countable.ts b/src/test/tests/integration/tags/for/objects_countable.ts
similarity index 100%
rename from test/tests/integration/tags/for/objects_countable.ts
rename to src/test/tests/integration/tags/for/objects_countable.ts
diff --git a/test/tests/integration/tags/for/on-a-string.ts b/src/test/tests/integration/tags/for/on-a-string.ts
similarity index 100%
rename from test/tests/integration/tags/for/on-a-string.ts
rename to src/test/tests/integration/tags/for/on-a-string.ts
diff --git a/test/tests/integration/tags/for/recursive.ts b/src/test/tests/integration/tags/for/recursive.ts
similarity index 100%
rename from test/tests/integration/tags/for/recursive.ts
rename to src/test/tests/integration/tags/for/recursive.ts
diff --git a/test/tests/integration/tags/for/values.ts b/src/test/tests/integration/tags/for/values.ts
similarity index 100%
rename from test/tests/integration/tags/for/values.ts
rename to src/test/tests/integration/tags/for/values.ts
diff --git a/test/tests/integration/tags/for/with-a-condition.level-3.ts b/src/test/tests/integration/tags/for/with-a-condition.level-3.ts
similarity index 100%
rename from test/tests/integration/tags/for/with-a-condition.level-3.ts
rename to src/test/tests/integration/tags/for/with-a-condition.level-3.ts
diff --git a/test/tests/integration/tags/from/basic.ts b/src/test/tests/integration/tags/from/basic.ts
similarity index 100%
rename from test/tests/integration/tags/from/basic.ts
rename to src/test/tests/integration/tags/from/basic.ts
diff --git a/test/tests/integration/tags/from/embed_with_global_macro.ts b/src/test/tests/integration/tags/from/embed_with_global_macro.ts
similarity index 100%
rename from test/tests/integration/tags/from/embed_with_global_macro.ts
rename to src/test/tests/integration/tags/from/embed_with_global_macro.ts
diff --git a/test/tests/integration/tags/from/in_block_is_local.ts b/src/test/tests/integration/tags/from/in_block_is_local.ts
similarity index 100%
rename from test/tests/integration/tags/from/in_block_is_local.ts
rename to src/test/tests/integration/tags/from/in_block_is_local.ts
diff --git a/test/tests/integration/tags/from/index.ts b/src/test/tests/integration/tags/from/index.ts
similarity index 100%
rename from test/tests/integration/tags/from/index.ts
rename to src/test/tests/integration/tags/from/index.ts
diff --git a/test/tests/integration/tags/from/local_override.ts b/src/test/tests/integration/tags/from/local_override.ts
similarity index 100%
rename from test/tests/integration/tags/from/local_override.ts
rename to src/test/tests/integration/tags/from/local_override.ts
diff --git a/test/tests/integration/tags/from/macro_in_a_macro.ts b/src/test/tests/integration/tags/from/macro_in_a_macro.ts
similarity index 100%
rename from test/tests/integration/tags/from/macro_in_a_macro.ts
rename to src/test/tests/integration/tags/from/macro_in_a_macro.ts
diff --git a/test/tests/integration/tags/from/macros_in_parent.ts b/src/test/tests/integration/tags/from/macros_in_parent.ts
similarity index 100%
rename from test/tests/integration/tags/from/macros_in_parent.ts
rename to src/test/tests/integration/tags/from/macros_in_parent.ts
diff --git a/test/tests/integration/tags/from/nested_block_with_global_macro.ts b/src/test/tests/integration/tags/from/nested_block_with_global_macro.ts
similarity index 100%
rename from test/tests/integration/tags/from/nested_block_with_global_macro.ts
rename to src/test/tests/integration/tags/from/nested_block_with_global_macro.ts
diff --git a/test/tests/integration/tags/from/nested_blocks.ts b/src/test/tests/integration/tags/from/nested_blocks.ts
similarity index 100%
rename from test/tests/integration/tags/from/nested_blocks.ts
rename to src/test/tests/integration/tags/from/nested_blocks.ts
diff --git a/test/tests/integration/tags/from/recursive.ts b/src/test/tests/integration/tags/from/recursive.ts
similarity index 100%
rename from test/tests/integration/tags/from/recursive.ts
rename to src/test/tests/integration/tags/from/recursive.ts
diff --git a/test/tests/integration/tags/from/self_parent.ts b/src/test/tests/integration/tags/from/self_parent.ts
similarity index 100%
rename from test/tests/integration/tags/from/self_parent.ts
rename to src/test/tests/integration/tags/from/self_parent.ts
diff --git a/test/tests/integration/tags/from/syntax_error.ts b/src/test/tests/integration/tags/from/syntax_error.ts
similarity index 100%
rename from test/tests/integration/tags/from/syntax_error.ts
rename to src/test/tests/integration/tags/from/syntax_error.ts
diff --git a/test/tests/integration/tags/if/basic.ts b/src/test/tests/integration/tags/if/basic.ts
similarity index 100%
rename from test/tests/integration/tags/if/basic.ts
rename to src/test/tests/integration/tags/if/basic.ts
diff --git a/test/tests/integration/tags/if/expression.ts b/src/test/tests/integration/tags/if/expression.ts
similarity index 100%
rename from test/tests/integration/tags/if/expression.ts
rename to src/test/tests/integration/tags/if/expression.ts
diff --git a/test/tests/integration/tags/if/expression_as_boolean.ts b/src/test/tests/integration/tags/if/expression_as_boolean.ts
similarity index 100%
rename from test/tests/integration/tags/if/expression_as_boolean.ts
rename to src/test/tests/integration/tags/if/expression_as_boolean.ts
diff --git a/test/tests/integration/tags/if/index.ts b/src/test/tests/integration/tags/if/index.ts
similarity index 100%
rename from test/tests/integration/tags/if/index.ts
rename to src/test/tests/integration/tags/if/index.ts
diff --git a/test/tests/integration/tags/if/on-hash.ts b/src/test/tests/integration/tags/if/on-hash.ts
similarity index 100%
rename from test/tests/integration/tags/if/on-hash.ts
rename to src/test/tests/integration/tags/if/on-hash.ts
diff --git a/test/tests/integration/tags/if/with-test-as-binary-expression-operand.ts b/src/test/tests/integration/tags/if/with-test-as-binary-expression-operand.ts
similarity index 100%
rename from test/tests/integration/tags/if/with-test-as-binary-expression-operand.ts
rename to src/test/tests/integration/tags/if/with-test-as-binary-expression-operand.ts
diff --git a/test/tests/integration/tags/import/blocks.ts b/src/test/tests/integration/tags/import/blocks.ts
similarity index 100%
rename from test/tests/integration/tags/import/blocks.ts
rename to src/test/tests/integration/tags/import/blocks.ts
diff --git a/test/tests/integration/tags/import/embed_with_global_macro.ts b/src/test/tests/integration/tags/import/embed_with_global_macro.ts
similarity index 100%
rename from test/tests/integration/tags/import/embed_with_global_macro.ts
rename to src/test/tests/integration/tags/import/embed_with_global_macro.ts
diff --git a/test/tests/integration/tags/import/from_string_template.ts b/src/test/tests/integration/tags/import/from_string_template.ts
similarity index 100%
rename from test/tests/integration/tags/import/from_string_template.ts
rename to src/test/tests/integration/tags/import/from_string_template.ts
diff --git a/test/tests/integration/tags/import/in_block_is_local.ts b/src/test/tests/integration/tags/import/in_block_is_local.ts
similarity index 100%
rename from test/tests/integration/tags/import/in_block_is_local.ts
rename to src/test/tests/integration/tags/import/in_block_is_local.ts
diff --git a/test/tests/integration/tags/import/index.ts b/src/test/tests/integration/tags/import/index.ts
similarity index 100%
rename from test/tests/integration/tags/import/index.ts
rename to src/test/tests/integration/tags/import/index.ts
diff --git a/test/tests/integration/tags/import/local_override.ts b/src/test/tests/integration/tags/import/local_override.ts
similarity index 100%
rename from test/tests/integration/tags/import/local_override.ts
rename to src/test/tests/integration/tags/import/local_override.ts
diff --git a/test/tests/integration/tags/import/macro_in_a_macro.ts b/src/test/tests/integration/tags/import/macro_in_a_macro.ts
similarity index 100%
rename from test/tests/integration/tags/import/macro_in_a_macro.ts
rename to src/test/tests/integration/tags/import/macro_in_a_macro.ts
diff --git a/test/tests/integration/tags/import/macros_in_parent.ts b/src/test/tests/integration/tags/import/macros_in_parent.ts
similarity index 100%
rename from test/tests/integration/tags/import/macros_in_parent.ts
rename to src/test/tests/integration/tags/import/macros_in_parent.ts
diff --git a/test/tests/integration/tags/import/nested_blocks.ts b/src/test/tests/integration/tags/import/nested_blocks.ts
similarity index 100%
rename from test/tests/integration/tags/import/nested_blocks.ts
rename to src/test/tests/integration/tags/import/nested_blocks.ts
diff --git a/test/tests/integration/tags/import/nested_blocks_with_global_macro.ts b/src/test/tests/integration/tags/import/nested_blocks_with_global_macro.ts
similarity index 100%
rename from test/tests/integration/tags/import/nested_blocks_with_global_macro.ts
rename to src/test/tests/integration/tags/import/nested_blocks_with_global_macro.ts
diff --git a/test/tests/integration/tags/import/same_parent_and_child.ts b/src/test/tests/integration/tags/import/same_parent_and_child.ts
similarity index 100%
rename from test/tests/integration/tags/import/same_parent_and_child.ts
rename to src/test/tests/integration/tags/import/same_parent_and_child.ts
diff --git a/test/tests/integration/tags/import/self_parent.ts b/src/test/tests/integration/tags/import/self_parent.ts
similarity index 100%
rename from test/tests/integration/tags/import/self_parent.ts
rename to src/test/tests/integration/tags/import/self_parent.ts
diff --git a/test/tests/integration/tags/import/syntax_error.ts b/src/test/tests/integration/tags/import/syntax_error.ts
similarity index 100%
rename from test/tests/integration/tags/import/syntax_error.ts
rename to src/test/tests/integration/tags/import/syntax_error.ts
diff --git a/test/tests/integration/tags/include/basic.ts b/src/test/tests/integration/tags/include/basic.ts
similarity index 100%
rename from test/tests/integration/tags/include/basic.ts
rename to src/test/tests/integration/tags/include/basic.ts
diff --git a/test/tests/integration/tags/include/expression.ts b/src/test/tests/integration/tags/include/expression.ts
similarity index 100%
rename from test/tests/integration/tags/include/expression.ts
rename to src/test/tests/integration/tags/include/expression.ts
diff --git a/test/tests/integration/tags/include/ignore_missing.ts b/src/test/tests/integration/tags/include/ignore_missing.ts
similarity index 100%
rename from test/tests/integration/tags/include/ignore_missing.ts
rename to src/test/tests/integration/tags/include/ignore_missing.ts
diff --git a/test/tests/integration/tags/include/ignore_missing_exists.ts b/src/test/tests/integration/tags/include/ignore_missing_exists.ts
similarity index 100%
rename from test/tests/integration/tags/include/ignore_missing_exists.ts
rename to src/test/tests/integration/tags/include/ignore_missing_exists.ts
diff --git a/test/tests/integration/tags/include/include_missing_extends.ts b/src/test/tests/integration/tags/include/include_missing_extends.ts
similarity index 100%
rename from test/tests/integration/tags/include/include_missing_extends.ts
rename to src/test/tests/integration/tags/include/include_missing_extends.ts
diff --git a/test/tests/integration/tags/include/index.ts b/src/test/tests/integration/tags/include/index.ts
similarity index 100%
rename from test/tests/integration/tags/include/index.ts
rename to src/test/tests/integration/tags/include/index.ts
diff --git a/test/tests/integration/tags/include/missing.ts b/src/test/tests/integration/tags/include/missing.ts
similarity index 100%
rename from test/tests/integration/tags/include/missing.ts
rename to src/test/tests/integration/tags/include/missing.ts
diff --git a/test/tests/integration/tags/include/missing_nested.ts b/src/test/tests/integration/tags/include/missing_nested.ts
similarity index 100%
rename from test/tests/integration/tags/include/missing_nested.ts
rename to src/test/tests/integration/tags/include/missing_nested.ts
diff --git a/test/tests/integration/tags/include/only.ts b/src/test/tests/integration/tags/include/only.ts
similarity index 100%
rename from test/tests/integration/tags/include/only.ts
rename to src/test/tests/integration/tags/include/only.ts
diff --git a/test/tests/integration/tags/include/template_instance.ts b/src/test/tests/integration/tags/include/template_instance.ts
similarity index 89%
rename from test/tests/integration/tags/include/template_instance.ts
rename to src/test/tests/integration/tags/include/template_instance.ts
index 73e8822e..c8822d6c 100644
--- a/test/tests/integration/tags/include/template_instance.ts
+++ b/src/test/tests/integration/tags/include/template_instance.ts
@@ -1,6 +1,6 @@
 import {runTest} from "../../TestBase";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
 
 runTest(({
     description: '"include" tag with a template instance',
diff --git a/test/tests/integration/tags/include/templates_as_array.ts b/src/test/tests/integration/tags/include/templates_as_array.ts
similarity index 100%
rename from test/tests/integration/tags/include/templates_as_array.ts
rename to src/test/tests/integration/tags/include/templates_as_array.ts
diff --git a/test/tests/integration/tags/include/with_string_variables.ts b/src/test/tests/integration/tags/include/with_string_variables.ts
similarity index 100%
rename from test/tests/integration/tags/include/with_string_variables.ts
rename to src/test/tests/integration/tags/include/with_string_variables.ts
diff --git a/test/tests/integration/tags/include/with_undefined_variables.ts b/src/test/tests/integration/tags/include/with_undefined_variables.ts
similarity index 100%
rename from test/tests/integration/tags/include/with_undefined_variables.ts
rename to src/test/tests/integration/tags/include/with_undefined_variables.ts
diff --git a/test/tests/integration/tags/include/with_variables.ts b/src/test/tests/integration/tags/include/with_variables.ts
similarity index 100%
rename from test/tests/integration/tags/include/with_variables.ts
rename to src/test/tests/integration/tags/include/with_variables.ts
diff --git a/test/tests/integration/tags/index.ts b/src/test/tests/integration/tags/index.ts
similarity index 100%
rename from test/tests/integration/tags/index.ts
rename to src/test/tests/integration/tags/index.ts
diff --git a/test/tests/integration/tags/line/basic.ts b/src/test/tests/integration/tags/line/basic.ts
similarity index 100%
rename from test/tests/integration/tags/line/basic.ts
rename to src/test/tests/integration/tags/line/basic.ts
diff --git a/test/tests/integration/tags/line/index.ts b/src/test/tests/integration/tags/line/index.ts
similarity index 100%
rename from test/tests/integration/tags/line/index.ts
rename to src/test/tests/integration/tags/line/index.ts
diff --git a/test/tests/integration/tags/macro/auto_import.ts b/src/test/tests/integration/tags/macro/auto_import.ts
similarity index 100%
rename from test/tests/integration/tags/macro/auto_import.ts
rename to src/test/tests/integration/tags/macro/auto_import.ts
diff --git a/test/tests/integration/tags/macro/auto_import_blocks.ts b/src/test/tests/integration/tags/macro/auto_import_blocks.ts
similarity index 100%
rename from test/tests/integration/tags/macro/auto_import_blocks.ts
rename to src/test/tests/integration/tags/macro/auto_import_blocks.ts
diff --git a/test/tests/integration/tags/macro/auto_import_without_blocks.ts b/src/test/tests/integration/tags/macro/auto_import_without_blocks.ts
similarity index 100%
rename from test/tests/integration/tags/macro/auto_import_without_blocks.ts
rename to src/test/tests/integration/tags/macro/auto_import_without_blocks.ts
diff --git a/test/tests/integration/tags/macro/basic.ts b/src/test/tests/integration/tags/macro/basic.ts
similarity index 100%
rename from test/tests/integration/tags/macro/basic.ts
rename to src/test/tests/integration/tags/macro/basic.ts
diff --git a/test/tests/integration/tags/macro/endmacro_name.ts b/src/test/tests/integration/tags/macro/endmacro_name.ts
similarity index 100%
rename from test/tests/integration/tags/macro/endmacro_name.ts
rename to src/test/tests/integration/tags/macro/endmacro_name.ts
diff --git a/test/tests/integration/tags/macro/external.ts b/src/test/tests/integration/tags/macro/external.ts
similarity index 100%
rename from test/tests/integration/tags/macro/external.ts
rename to src/test/tests/integration/tags/macro/external.ts
diff --git a/test/tests/integration/tags/macro/from_embed_with_global_macro.ts b/src/test/tests/integration/tags/macro/from_embed_with_global_macro.ts
similarity index 100%
rename from test/tests/integration/tags/macro/from_embed_with_global_macro.ts
rename to src/test/tests/integration/tags/macro/from_embed_with_global_macro.ts
diff --git a/test/tests/integration/tags/macro/from_in_block_is_local.test b/src/test/tests/integration/tags/macro/from_in_block_is_local.test
similarity index 100%
rename from test/tests/integration/tags/macro/from_in_block_is_local.test
rename to src/test/tests/integration/tags/macro/from_in_block_is_local.test
diff --git a/test/tests/integration/tags/macro/from_local_override.test b/src/test/tests/integration/tags/macro/from_local_override.test
similarity index 100%
rename from test/tests/integration/tags/macro/from_local_override.test
rename to src/test/tests/integration/tags/macro/from_local_override.test
diff --git a/test/tests/integration/tags/macro/from_macro_in_a_macro/expected.html b/src/test/tests/integration/tags/macro/from_macro_in_a_macro/expected.html
similarity index 100%
rename from test/tests/integration/tags/macro/from_macro_in_a_macro/expected.html
rename to src/test/tests/integration/tags/macro/from_macro_in_a_macro/expected.html
diff --git a/test/tests/integration/tags/macro/from_macro_in_a_macro/index.twig b/src/test/tests/integration/tags/macro/from_macro_in_a_macro/index.twig
similarity index 100%
rename from test/tests/integration/tags/macro/from_macro_in_a_macro/index.twig
rename to src/test/tests/integration/tags/macro/from_macro_in_a_macro/index.twig
diff --git a/test/tests/integration/tags/macro/from_macro_in_a_macro/test.js b/src/test/tests/integration/tags/macro/from_macro_in_a_macro/test.js
similarity index 100%
rename from test/tests/integration/tags/macro/from_macro_in_a_macro/test.js
rename to src/test/tests/integration/tags/macro/from_macro_in_a_macro/test.js
diff --git a/test/tests/integration/tags/macro/from_macros_in_parent.test b/src/test/tests/integration/tags/macro/from_macros_in_parent.test
similarity index 100%
rename from test/tests/integration/tags/macro/from_macros_in_parent.test
rename to src/test/tests/integration/tags/macro/from_macros_in_parent.test
diff --git a/test/tests/integration/tags/macro/from_nested_blocks.ts b/src/test/tests/integration/tags/macro/from_nested_blocks.ts
similarity index 100%
rename from test/tests/integration/tags/macro/from_nested_blocks.ts
rename to src/test/tests/integration/tags/macro/from_nested_blocks.ts
diff --git a/test/tests/integration/tags/macro/from_nested_blocks_with_global_macro.test b/src/test/tests/integration/tags/macro/from_nested_blocks_with_global_macro.test
similarity index 100%
rename from test/tests/integration/tags/macro/from_nested_blocks_with_global_macro.test
rename to src/test/tests/integration/tags/macro/from_nested_blocks_with_global_macro.test
diff --git a/test/tests/integration/tags/macro/from_recursive.test b/src/test/tests/integration/tags/macro/from_recursive.test
similarity index 100%
rename from test/tests/integration/tags/macro/from_recursive.test
rename to src/test/tests/integration/tags/macro/from_recursive.test
diff --git a/test/tests/integration/tags/macro/from_self_parent.test b/src/test/tests/integration/tags/macro/from_self_parent.test
similarity index 100%
rename from test/tests/integration/tags/macro/from_self_parent.test
rename to src/test/tests/integration/tags/macro/from_self_parent.test
diff --git a/test/tests/integration/tags/macro/from_syntax_error.test b/src/test/tests/integration/tags/macro/from_syntax_error.test
similarity index 100%
rename from test/tests/integration/tags/macro/from_syntax_error.test
rename to src/test/tests/integration/tags/macro/from_syntax_error.test
diff --git a/test/tests/integration/tags/macro/import_and_blocks.test b/src/test/tests/integration/tags/macro/import_and_blocks.test
similarity index 100%
rename from test/tests/integration/tags/macro/import_and_blocks.test
rename to src/test/tests/integration/tags/macro/import_and_blocks.test
diff --git a/test/tests/integration/tags/macro/import_embed_with_global_macro.test b/src/test/tests/integration/tags/macro/import_embed_with_global_macro.test
similarity index 100%
rename from test/tests/integration/tags/macro/import_embed_with_global_macro.test
rename to src/test/tests/integration/tags/macro/import_embed_with_global_macro.test
diff --git a/test/tests/integration/tags/macro/import_in_block_is_local.test b/src/test/tests/integration/tags/macro/import_in_block_is_local.test
similarity index 100%
rename from test/tests/integration/tags/macro/import_in_block_is_local.test
rename to src/test/tests/integration/tags/macro/import_in_block_is_local.test
diff --git a/test/tests/integration/tags/macro/import_local_override.test b/src/test/tests/integration/tags/macro/import_local_override.test
similarity index 100%
rename from test/tests/integration/tags/macro/import_local_override.test
rename to src/test/tests/integration/tags/macro/import_local_override.test
diff --git a/test/tests/integration/tags/macro/import_macro_in_a_macro/index.twig b/src/test/tests/integration/tags/macro/import_macro_in_a_macro/index.twig
similarity index 100%
rename from test/tests/integration/tags/macro/import_macro_in_a_macro/index.twig
rename to src/test/tests/integration/tags/macro/import_macro_in_a_macro/index.twig
diff --git a/test/tests/integration/tags/macro/import_macro_in_a_macro/test.js b/src/test/tests/integration/tags/macro/import_macro_in_a_macro/test.js
similarity index 100%
rename from test/tests/integration/tags/macro/import_macro_in_a_macro/test.js
rename to src/test/tests/integration/tags/macro/import_macro_in_a_macro/test.js
diff --git a/test/tests/integration/tags/macro/import_macros_in_parent.test b/src/test/tests/integration/tags/macro/import_macros_in_parent.test
similarity index 100%
rename from test/tests/integration/tags/macro/import_macros_in_parent.test
rename to src/test/tests/integration/tags/macro/import_macros_in_parent.test
diff --git a/test/tests/integration/tags/macro/import_nested_blocks.test b/src/test/tests/integration/tags/macro/import_nested_blocks.test
similarity index 100%
rename from test/tests/integration/tags/macro/import_nested_blocks.test
rename to src/test/tests/integration/tags/macro/import_nested_blocks.test
diff --git a/test/tests/integration/tags/macro/import_nested_blocks_with_global_macro.test b/src/test/tests/integration/tags/macro/import_nested_blocks_with_global_macro.test
similarity index 100%
rename from test/tests/integration/tags/macro/import_nested_blocks_with_global_macro.test
rename to src/test/tests/integration/tags/macro/import_nested_blocks_with_global_macro.test
diff --git a/test/tests/integration/tags/macro/import_same_parent_and_child.test b/src/test/tests/integration/tags/macro/import_same_parent_and_child.test
similarity index 100%
rename from test/tests/integration/tags/macro/import_same_parent_and_child.test
rename to src/test/tests/integration/tags/macro/import_same_parent_and_child.test
diff --git a/test/tests/integration/tags/macro/import_self_parent.test b/src/test/tests/integration/tags/macro/import_self_parent.test
similarity index 100%
rename from test/tests/integration/tags/macro/import_self_parent.test
rename to src/test/tests/integration/tags/macro/import_self_parent.test
diff --git a/test/tests/integration/tags/macro/import_syntax_error.test b/src/test/tests/integration/tags/macro/import_syntax_error.test
similarity index 100%
rename from test/tests/integration/tags/macro/import_syntax_error.test
rename to src/test/tests/integration/tags/macro/import_syntax_error.test
diff --git a/test/tests/integration/tags/macro/index.ts b/src/test/tests/integration/tags/macro/index.ts
similarity index 100%
rename from test/tests/integration/tags/macro/index.ts
rename to src/test/tests/integration/tags/macro/index.ts
diff --git a/test/tests/integration/tags/macro/self_import.ts b/src/test/tests/integration/tags/macro/self_import.ts
similarity index 100%
rename from test/tests/integration/tags/macro/self_import.ts
rename to src/test/tests/integration/tags/macro/self_import.ts
diff --git a/test/tests/integration/tags/macro/special_chars.ts b/src/test/tests/integration/tags/macro/special_chars.ts
similarity index 100%
rename from test/tests/integration/tags/macro/special_chars.ts
rename to src/test/tests/integration/tags/macro/special_chars.ts
diff --git a/test/tests/integration/tags/macro/super_globals.ts b/src/test/tests/integration/tags/macro/super_globals.ts
similarity index 100%
rename from test/tests/integration/tags/macro/super_globals.ts
rename to src/test/tests/integration/tags/macro/super_globals.ts
diff --git a/test/tests/integration/tags/macro/with-varargs.ts b/src/test/tests/integration/tags/macro/with-varargs.ts
similarity index 100%
rename from test/tests/integration/tags/macro/with-varargs.ts
rename to src/test/tests/integration/tags/macro/with-varargs.ts
diff --git a/test/tests/integration/tags/macro/with_a_different_endmacro_name.ts b/src/test/tests/integration/tags/macro/with_a_different_endmacro_name.ts
similarity index 100%
rename from test/tests/integration/tags/macro/with_a_different_endmacro_name.ts
rename to src/test/tests/integration/tags/macro/with_a_different_endmacro_name.ts
diff --git a/test/tests/integration/tags/sandbox/array.ts b/src/test/tests/integration/tags/sandbox/array.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/array.ts
rename to src/test/tests/integration/tags/sandbox/array.ts
diff --git a/test/tests/integration/tags/sandbox/implicit-to-string/concatenation.ts b/src/test/tests/integration/tags/sandbox/implicit-to-string/concatenation.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/implicit-to-string/concatenation.ts
rename to src/test/tests/integration/tags/sandbox/implicit-to-string/concatenation.ts
diff --git a/test/tests/integration/tags/sandbox/implicit-to-string/filtered.ts b/src/test/tests/integration/tags/sandbox/implicit-to-string/filtered.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/implicit-to-string/filtered.ts
rename to src/test/tests/integration/tags/sandbox/implicit-to-string/filtered.ts
diff --git a/test/tests/integration/tags/sandbox/implicit-to-string/index.ts b/src/test/tests/integration/tags/sandbox/implicit-to-string/index.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/implicit-to-string/index.ts
rename to src/test/tests/integration/tags/sandbox/implicit-to-string/index.ts
diff --git a/test/tests/integration/tags/sandbox/implicit-to-string/simple.ts b/src/test/tests/integration/tags/sandbox/implicit-to-string/simple.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/implicit-to-string/simple.ts
rename to src/test/tests/integration/tags/sandbox/implicit-to-string/simple.ts
diff --git a/test/tests/integration/tags/sandbox/index.ts b/src/test/tests/integration/tags/sandbox/index.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/index.ts
rename to src/test/tests/integration/tags/sandbox/index.ts
diff --git a/test/tests/integration/tags/sandbox/markup.ts b/src/test/tests/integration/tags/sandbox/markup.ts
similarity index 90%
rename from test/tests/integration/tags/sandbox/markup.ts
rename to src/test/tests/integration/tags/sandbox/markup.ts
index 18c3eaa6..e9120cf5 100644
--- a/test/tests/integration/tags/sandbox/markup.ts
+++ b/src/test/tests/integration/tags/sandbox/markup.ts
@@ -1,5 +1,5 @@
 import TestBase, {runTest} from "../../TestBase";
-import {createMarkup} from "../../../../../src/lib/markup";
+import {createMarkup} from "../../../../../main/lib/markup";
 import {createIntegrationTest} from "../../test";
 
 class Test extends TestBase {
diff --git a/test/tests/integration/tags/sandbox/non-allowed-filter.ts b/src/test/tests/integration/tags/sandbox/non-allowed-filter.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/non-allowed-filter.ts
rename to src/test/tests/integration/tags/sandbox/non-allowed-filter.ts
diff --git a/test/tests/integration/tags/sandbox/non-allowed-function.ts b/src/test/tests/integration/tags/sandbox/non-allowed-function.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/non-allowed-function.ts
rename to src/test/tests/integration/tags/sandbox/non-allowed-function.ts
diff --git a/test/tests/integration/tags/sandbox/non-allowed-tag.ts b/src/test/tests/integration/tags/sandbox/non-allowed-tag.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/non-allowed-tag.ts
rename to src/test/tests/integration/tags/sandbox/non-allowed-tag.ts
diff --git a/test/tests/integration/tags/sandbox/not_valid1.ts b/src/test/tests/integration/tags/sandbox/not_valid1.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/not_valid1.ts
rename to src/test/tests/integration/tags/sandbox/not_valid1.ts
diff --git a/test/tests/integration/tags/sandbox/not_valid2.ts b/src/test/tests/integration/tags/sandbox/not_valid2.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/not_valid2.ts
rename to src/test/tests/integration/tags/sandbox/not_valid2.ts
diff --git a/test/tests/integration/tags/sandbox/range_operator.ts b/src/test/tests/integration/tags/sandbox/range_operator.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/range_operator.ts
rename to src/test/tests/integration/tags/sandbox/range_operator.ts
diff --git a/test/tests/integration/tags/sandbox/simple.ts b/src/test/tests/integration/tags/sandbox/simple.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/simple.ts
rename to src/test/tests/integration/tags/sandbox/simple.ts
diff --git a/test/tests/integration/tags/sandbox/with-embed-tag.ts b/src/test/tests/integration/tags/sandbox/with-embed-tag.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/with-embed-tag.ts
rename to src/test/tests/integration/tags/sandbox/with-embed-tag.ts
diff --git a/test/tests/integration/tags/sandbox/with-missing-variable.ts b/src/test/tests/integration/tags/sandbox/with-missing-variable.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/with-missing-variable.ts
rename to src/test/tests/integration/tags/sandbox/with-missing-variable.ts
diff --git a/test/tests/integration/tags/sandbox/within-a-sandboxed-environment.ts b/src/test/tests/integration/tags/sandbox/within-a-sandboxed-environment.ts
similarity index 100%
rename from test/tests/integration/tags/sandbox/within-a-sandboxed-environment.ts
rename to src/test/tests/integration/tags/sandbox/within-a-sandboxed-environment.ts
diff --git a/test/tests/integration/tags/set/basic.ts b/src/test/tests/integration/tags/set/basic.ts
similarity index 100%
rename from test/tests/integration/tags/set/basic.ts
rename to src/test/tests/integration/tags/set/basic.ts
diff --git a/test/tests/integration/tags/set/capture-empty.ts b/src/test/tests/integration/tags/set/capture-empty.ts
similarity index 100%
rename from test/tests/integration/tags/set/capture-empty.ts
rename to src/test/tests/integration/tags/set/capture-empty.ts
diff --git a/test/tests/integration/tags/set/capture-multiple.ts b/src/test/tests/integration/tags/set/capture-multiple.ts
similarity index 100%
rename from test/tests/integration/tags/set/capture-multiple.ts
rename to src/test/tests/integration/tags/set/capture-multiple.ts
diff --git a/test/tests/integration/tags/set/capture.ts b/src/test/tests/integration/tags/set/capture.ts
similarity index 100%
rename from test/tests/integration/tags/set/capture.ts
rename to src/test/tests/integration/tags/set/capture.ts
diff --git a/test/tests/integration/tags/set/expression.ts b/src/test/tests/integration/tags/set/expression.ts
similarity index 100%
rename from test/tests/integration/tags/set/expression.ts
rename to src/test/tests/integration/tags/set/expression.ts
diff --git a/test/tests/integration/tags/set/index.ts b/src/test/tests/integration/tags/set/index.ts
similarity index 100%
rename from test/tests/integration/tags/set/index.ts
rename to src/test/tests/integration/tags/set/index.ts
diff --git a/test/tests/integration/tags/set/with_a_block_and_multiple_assignments.ts b/src/test/tests/integration/tags/set/with_a_block_and_multiple_assignments.ts
similarity index 100%
rename from test/tests/integration/tags/set/with_a_block_and_multiple_assignments.ts
rename to src/test/tests/integration/tags/set/with_a_block_and_multiple_assignments.ts
diff --git a/test/tests/integration/tags/set/with_a_number_of_variables_and_assignments.ts b/src/test/tests/integration/tags/set/with_a_number_of_variables_and_assignments.ts
similarity index 100%
rename from test/tests/integration/tags/set/with_a_number_of_variables_and_assignments.ts
rename to src/test/tests/integration/tags/set/with_a_number_of_variables_and_assignments.ts
diff --git a/test/tests/integration/tags/spaceless/index.ts b/src/test/tests/integration/tags/spaceless/index.ts
similarity index 100%
rename from test/tests/integration/tags/spaceless/index.ts
rename to src/test/tests/integration/tags/spaceless/index.ts
diff --git a/test/tests/integration/tags/spaceless/level-3/unsupported.ts b/src/test/tests/integration/tags/spaceless/level-3/unsupported.ts
similarity index 100%
rename from test/tests/integration/tags/spaceless/level-3/unsupported.ts
rename to src/test/tests/integration/tags/spaceless/level-3/unsupported.ts
diff --git a/test/tests/integration/tags/spaceless/root_level_in_child.legacy.ts b/src/test/tests/integration/tags/spaceless/root_level_in_child.legacy.ts
similarity index 100%
rename from test/tests/integration/tags/spaceless/root_level_in_child.legacy.ts
rename to src/test/tests/integration/tags/spaceless/root_level_in_child.legacy.ts
diff --git a/test/tests/integration/tags/spaceless/simple.ts b/src/test/tests/integration/tags/spaceless/simple.ts
similarity index 100%
rename from test/tests/integration/tags/spaceless/simple.ts
rename to src/test/tests/integration/tags/spaceless/simple.ts
diff --git a/test/tests/integration/tags/special_chars.ts b/src/test/tests/integration/tags/special_chars.ts
similarity index 100%
rename from test/tests/integration/tags/special_chars.ts
rename to src/test/tests/integration/tags/special_chars.ts
diff --git a/test/tests/integration/tags/use/aliases.ts b/src/test/tests/integration/tags/use/aliases.ts
similarity index 100%
rename from test/tests/integration/tags/use/aliases.ts
rename to src/test/tests/integration/tags/use/aliases.ts
diff --git a/test/tests/integration/tags/use/basic.ts b/src/test/tests/integration/tags/use/basic.ts
similarity index 100%
rename from test/tests/integration/tags/use/basic.ts
rename to src/test/tests/integration/tags/use/basic.ts
diff --git a/test/tests/integration/tags/use/deep.ts b/src/test/tests/integration/tags/use/deep.ts
similarity index 100%
rename from test/tests/integration/tags/use/deep.ts
rename to src/test/tests/integration/tags/use/deep.ts
diff --git a/test/tests/integration/tags/use/deep_empty.ts b/src/test/tests/integration/tags/use/deep_empty.ts
similarity index 100%
rename from test/tests/integration/tags/use/deep_empty.ts
rename to src/test/tests/integration/tags/use/deep_empty.ts
diff --git a/test/tests/integration/tags/use/index.ts b/src/test/tests/integration/tags/use/index.ts
similarity index 100%
rename from test/tests/integration/tags/use/index.ts
rename to src/test/tests/integration/tags/use/index.ts
diff --git a/test/tests/integration/tags/use/inheritance.ts b/src/test/tests/integration/tags/use/inheritance.ts
similarity index 100%
rename from test/tests/integration/tags/use/inheritance.ts
rename to src/test/tests/integration/tags/use/inheritance.ts
diff --git a/test/tests/integration/tags/use/inheritance2.ts b/src/test/tests/integration/tags/use/inheritance2.ts
similarity index 100%
rename from test/tests/integration/tags/use/inheritance2.ts
rename to src/test/tests/integration/tags/use/inheritance2.ts
diff --git a/test/tests/integration/tags/use/multiple.ts b/src/test/tests/integration/tags/use/multiple.ts
similarity index 100%
rename from test/tests/integration/tags/use/multiple.ts
rename to src/test/tests/integration/tags/use/multiple.ts
diff --git a/test/tests/integration/tags/use/multiple_aliases.ts b/src/test/tests/integration/tags/use/multiple_aliases.ts
similarity index 100%
rename from test/tests/integration/tags/use/multiple_aliases.ts
rename to src/test/tests/integration/tags/use/multiple_aliases.ts
diff --git a/test/tests/integration/tags/use/parent_block.ts b/src/test/tests/integration/tags/use/parent_block.ts
similarity index 100%
rename from test/tests/integration/tags/use/parent_block.ts
rename to src/test/tests/integration/tags/use/parent_block.ts
diff --git a/test/tests/integration/tags/use/parent_block2.ts b/src/test/tests/integration/tags/use/parent_block2.ts
similarity index 100%
rename from test/tests/integration/tags/use/parent_block2.ts
rename to src/test/tests/integration/tags/use/parent_block2.ts
diff --git a/test/tests/integration/tags/use/parent_block3.ts b/src/test/tests/integration/tags/use/parent_block3.ts
similarity index 100%
rename from test/tests/integration/tags/use/parent_block3.ts
rename to src/test/tests/integration/tags/use/parent_block3.ts
diff --git a/test/tests/integration/tags/use/use_with_parent.ts b/src/test/tests/integration/tags/use/use_with_parent.ts
similarity index 100%
rename from test/tests/integration/tags/use/use_with_parent.ts
rename to src/test/tests/integration/tags/use/use_with_parent.ts
diff --git a/test/tests/integration/tags/use/with-a-non-traitable-template.ts b/src/test/tests/integration/tags/use/with-a-non-traitable-template.ts
similarity index 100%
rename from test/tests/integration/tags/use/with-a-non-traitable-template.ts
rename to src/test/tests/integration/tags/use/with-a-non-traitable-template.ts
diff --git a/test/tests/integration/tags/use/with_a_non_supported_template_reference.ts b/src/test/tests/integration/tags/use/with_a_non_supported_template_reference.ts
similarity index 100%
rename from test/tests/integration/tags/use/with_a_non_supported_template_reference.ts
rename to src/test/tests/integration/tags/use/with_a_non_supported_template_reference.ts
diff --git a/test/tests/integration/tags/verbatim/basic.ts b/src/test/tests/integration/tags/verbatim/basic.ts
similarity index 100%
rename from test/tests/integration/tags/verbatim/basic.ts
rename to src/test/tests/integration/tags/verbatim/basic.ts
diff --git a/test/tests/integration/tags/verbatim/empty_content.ts b/src/test/tests/integration/tags/verbatim/empty_content.ts
similarity index 100%
rename from test/tests/integration/tags/verbatim/empty_content.ts
rename to src/test/tests/integration/tags/verbatim/empty_content.ts
diff --git a/test/tests/integration/tags/verbatim/index.ts b/src/test/tests/integration/tags/verbatim/index.ts
similarity index 100%
rename from test/tests/integration/tags/verbatim/index.ts
rename to src/test/tests/integration/tags/verbatim/index.ts
diff --git a/test/tests/integration/tags/verbatim/whitespace_control.ts b/src/test/tests/integration/tags/verbatim/whitespace_control.ts
similarity index 100%
rename from test/tests/integration/tags/verbatim/whitespace_control.ts
rename to src/test/tests/integration/tags/verbatim/whitespace_control.ts
diff --git a/test/tests/integration/tags/with/basic.ts b/src/test/tests/integration/tags/with/basic.ts
similarity index 100%
rename from test/tests/integration/tags/with/basic.ts
rename to src/test/tests/integration/tags/with/basic.ts
diff --git a/test/tests/integration/tags/with/expression.ts b/src/test/tests/integration/tags/with/expression.ts
similarity index 100%
rename from test/tests/integration/tags/with/expression.ts
rename to src/test/tests/integration/tags/with/expression.ts
diff --git a/test/tests/integration/tags/with/index.ts b/src/test/tests/integration/tags/with/index.ts
similarity index 100%
rename from test/tests/integration/tags/with/index.ts
rename to src/test/tests/integration/tags/with/index.ts
diff --git a/test/tests/integration/tags/with/nested.ts b/src/test/tests/integration/tags/with/nested.ts
similarity index 100%
rename from test/tests/integration/tags/with/nested.ts
rename to src/test/tests/integration/tags/with/nested.ts
diff --git a/test/tests/integration/tags/with/with_no_hash.ts b/src/test/tests/integration/tags/with/with_no_hash.ts
similarity index 100%
rename from test/tests/integration/tags/with/with_no_hash.ts
rename to src/test/tests/integration/tags/with/with_no_hash.ts
diff --git a/test/tests/integration/tags/with/with_only.ts b/src/test/tests/integration/tags/with/with_only.ts
similarity index 100%
rename from test/tests/integration/tags/with/with_only.ts
rename to src/test/tests/integration/tags/with/with_only.ts
diff --git a/test/tests/integration/test.ts b/src/test/tests/integration/test.ts
similarity index 82%
rename from test/tests/integration/test.ts
rename to src/test/tests/integration/test.ts
index ef672912..e62670a5 100644
--- a/test/tests/integration/test.ts
+++ b/src/test/tests/integration/test.ts
@@ -1,12 +1,12 @@
 import TestBase from "./TestBase";
-import {TwingEnvironmentOptions} from "../../../src/lib/environment";
+import {TwingEnvironmentOptions} from "../../../main/lib/environment";
 import {MappingItem} from "source-map";
-import {TwingFilter} from "../../../src/lib/filter";
-import {TwingFunction} from "../../../src/lib/function";
-import {TwingTest} from "../../../src/lib/test";
-import {TwingNodeVisitor} from "../../../src/lib/node-visitor";
-import {TwingLoader} from "../../../src/lib/loader";
-import {TwingSandboxSecurityPolicy} from "../../../src/lib/sandbox/security-policy";
+import {TwingFilter} from "../../../main/lib/filter";
+import {TwingFunction} from "../../../main/lib/function";
+import {TwingTest} from "../../../main/lib/test";
+import {TwingNodeVisitor} from "../../../main/lib/node-visitor";
+import {TwingLoader} from "../../../main/lib/loader";
+import {TwingSandboxSecurityPolicy} from "../../../main/lib/sandbox/security-policy";
 
 export type IntegrationTest = {
     additionalFilters?: Array<TwingFilter>;
diff --git a/test/tests/integration/tests/array.ts b/src/test/tests/integration/tests/array.ts
similarity index 100%
rename from test/tests/integration/tests/array.ts
rename to src/test/tests/integration/tests/array.ts
diff --git a/test/tests/integration/tests/constant.ts b/src/test/tests/integration/tests/constant.ts
similarity index 100%
rename from test/tests/integration/tests/constant.ts
rename to src/test/tests/integration/tests/constant.ts
diff --git a/test/tests/integration/tests/deprecation.ts b/src/test/tests/integration/tests/deprecation.ts
similarity index 96%
rename from test/tests/integration/tests/deprecation.ts
rename to src/test/tests/integration/tests/deprecation.ts
index e6a940fb..68e8660e 100644
--- a/test/tests/integration/tests/deprecation.ts
+++ b/src/test/tests/integration/tests/deprecation.ts
@@ -1,5 +1,5 @@
 import {runTest} from "../TestBase";
-import {createTest} from "../../../../src/lib/test";
+import {createTest} from "../../../../main/lib/test";
 
 runTest({
     description: 'deprecated test',
diff --git a/test/tests/integration/tests/dynamic.ts b/src/test/tests/integration/tests/dynamic.ts
similarity index 100%
rename from test/tests/integration/tests/dynamic.ts
rename to src/test/tests/integration/tests/dynamic.ts
diff --git a/test/tests/integration/tests/even.ts b/src/test/tests/integration/tests/even.ts
similarity index 100%
rename from test/tests/integration/tests/even.ts
rename to src/test/tests/integration/tests/even.ts
diff --git a/test/tests/integration/tests/index.ts b/src/test/tests/integration/tests/index.ts
similarity index 100%
rename from test/tests/integration/tests/index.ts
rename to src/test/tests/integration/tests/index.ts
diff --git a/test/tests/integration/tests/is-defined/defined.ts b/src/test/tests/integration/tests/is-defined/defined.ts
similarity index 100%
rename from test/tests/integration/tests/is-defined/defined.ts
rename to src/test/tests/integration/tests/is-defined/defined.ts
diff --git a/test/tests/integration/tests/is-defined/defined_for_attributes.ts b/src/test/tests/integration/tests/is-defined/defined_for_attributes.ts
similarity index 100%
rename from test/tests/integration/tests/is-defined/defined_for_attributes.ts
rename to src/test/tests/integration/tests/is-defined/defined_for_attributes.ts
diff --git a/test/tests/integration/tests/is-defined/defined_for_binary_expression.ts b/src/test/tests/integration/tests/is-defined/defined_for_binary_expression.ts
similarity index 100%
rename from test/tests/integration/tests/is-defined/defined_for_binary_expression.ts
rename to src/test/tests/integration/tests/is-defined/defined_for_binary_expression.ts
diff --git a/test/tests/integration/tests/is-defined/defined_for_blocks.ts b/src/test/tests/integration/tests/is-defined/defined_for_blocks.ts
similarity index 100%
rename from test/tests/integration/tests/is-defined/defined_for_blocks.ts
rename to src/test/tests/integration/tests/is-defined/defined_for_blocks.ts
diff --git a/test/tests/integration/tests/is-defined/defined_for_blocks_with_template.ts b/src/test/tests/integration/tests/is-defined/defined_for_blocks_with_template.ts
similarity index 89%
rename from test/tests/integration/tests/is-defined/defined_for_blocks_with_template.ts
rename to src/test/tests/integration/tests/is-defined/defined_for_blocks_with_template.ts
index 36ae1840..7c86d661 100644
--- a/test/tests/integration/tests/is-defined/defined_for_blocks_with_template.ts
+++ b/src/test/tests/integration/tests/is-defined/defined_for_blocks_with_template.ts
@@ -1,7 +1,7 @@
 import TestBase, {runTest} from "../../TestBase";
 import {createIntegrationTest} from "../../test";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
 
 class Test extends TestBase {
     getName() {
diff --git a/test/tests/integration/tests/is-defined/defined_for_constants.ts b/src/test/tests/integration/tests/is-defined/defined_for_constants.ts
similarity index 100%
rename from test/tests/integration/tests/is-defined/defined_for_constants.ts
rename to src/test/tests/integration/tests/is-defined/defined_for_constants.ts
diff --git a/test/tests/integration/tests/is-defined/defined_for_macros.ts b/src/test/tests/integration/tests/is-defined/defined_for_macros.ts
similarity index 100%
rename from test/tests/integration/tests/is-defined/defined_for_macros.ts
rename to src/test/tests/integration/tests/is-defined/defined_for_macros.ts
diff --git a/test/tests/integration/tests/is-defined/defined_for_self.ts b/src/test/tests/integration/tests/is-defined/defined_for_self.ts
similarity index 100%
rename from test/tests/integration/tests/is-defined/defined_for_self.ts
rename to src/test/tests/integration/tests/is-defined/defined_for_self.ts
diff --git a/test/tests/integration/tests/is-defined/index.ts b/src/test/tests/integration/tests/is-defined/index.ts
similarity index 100%
rename from test/tests/integration/tests/is-defined/index.ts
rename to src/test/tests/integration/tests/is-defined/index.ts
diff --git a/test/tests/integration/tests/is-defined/on-an-array.ts b/src/test/tests/integration/tests/is-defined/on-an-array.ts
similarity index 100%
rename from test/tests/integration/tests/is-defined/on-an-array.ts
rename to src/test/tests/integration/tests/is-defined/on-an-array.ts
diff --git a/test/tests/integration/tests/is-empty/empty.ts b/src/test/tests/integration/tests/is-empty/empty.ts
similarity index 96%
rename from test/tests/integration/tests/is-empty/empty.ts
rename to src/test/tests/integration/tests/is-empty/empty.ts
index 9b570a0c..007c0339 100644
--- a/test/tests/integration/tests/is-empty/empty.ts
+++ b/src/test/tests/integration/tests/is-empty/empty.ts
@@ -1,5 +1,5 @@
 import TestBase, {runTest} from "../../TestBase";
-import {createMarkup} from "../../../../../src/lib/markup";
+import {createMarkup} from "../../../../../main/lib/markup";
 import {createIntegrationTest} from "../../test";
 
 class ToStringStub {
diff --git a/test/tests/integration/tests/is-empty/index.ts b/src/test/tests/integration/tests/is-empty/index.ts
similarity index 100%
rename from test/tests/integration/tests/is-empty/index.ts
rename to src/test/tests/integration/tests/is-empty/index.ts
diff --git a/test/tests/integration/tests/is-empty/on-an-object-without-to-string-method.ts b/src/test/tests/integration/tests/is-empty/on-an-object-without-to-string-method.ts
similarity index 100%
rename from test/tests/integration/tests/is-empty/on-an-object-without-to-string-method.ts
rename to src/test/tests/integration/tests/is-empty/on-an-object-without-to-string-method.ts
diff --git a/test/tests/integration/tests/is-in/in.ts b/src/test/tests/integration/tests/is-in/in.ts
similarity index 97%
rename from test/tests/integration/tests/is-in/in.ts
rename to src/test/tests/integration/tests/is-in/in.ts
index 70d625ce..5724d0f7 100644
--- a/test/tests/integration/tests/is-in/in.ts
+++ b/src/test/tests/integration/tests/is-in/in.ts
@@ -1,5 +1,5 @@
 import TestBase, {runTest} from "../../TestBase";
-import {createMarkup} from "../../../../../src/lib/markup";
+import {createMarkup} from "../../../../../main/lib/markup";
 import {createIntegrationTest} from "../../test";
 
 class SplFileInfo {
diff --git a/test/tests/integration/tests/is-in/in_with_objects.ts b/src/test/tests/integration/tests/is-in/in_with_objects.ts
similarity index 100%
rename from test/tests/integration/tests/is-in/in_with_objects.ts
rename to src/test/tests/integration/tests/is-in/in_with_objects.ts
diff --git a/test/tests/integration/tests/is-in/index.ts b/src/test/tests/integration/tests/is-in/index.ts
similarity index 100%
rename from test/tests/integration/tests/is-in/index.ts
rename to src/test/tests/integration/tests/is-in/index.ts
diff --git a/test/tests/integration/tests/is-in/on-array.ts b/src/test/tests/integration/tests/is-in/on-array.ts
similarity index 100%
rename from test/tests/integration/tests/is-in/on-array.ts
rename to src/test/tests/integration/tests/is-in/on-array.ts
diff --git a/test/tests/integration/tests/is-in/on-hash.ts b/src/test/tests/integration/tests/is-in/on-hash.ts
similarity index 100%
rename from test/tests/integration/tests/is-in/on-hash.ts
rename to src/test/tests/integration/tests/is-in/on-hash.ts
diff --git a/test/tests/integration/tests/iterable.ts b/src/test/tests/integration/tests/iterable.ts
similarity index 100%
rename from test/tests/integration/tests/iterable.ts
rename to src/test/tests/integration/tests/iterable.ts
diff --git a/test/tests/integration/tests/null_coalesce.ts b/src/test/tests/integration/tests/null_coalesce.ts
similarity index 100%
rename from test/tests/integration/tests/null_coalesce.ts
rename to src/test/tests/integration/tests/null_coalesce.ts
diff --git a/test/tests/integration/tests/odd.ts b/src/test/tests/integration/tests/odd.ts
similarity index 100%
rename from test/tests/integration/tests/odd.ts
rename to src/test/tests/integration/tests/odd.ts
diff --git a/test/tests/integration/whitespace/index.ts b/src/test/tests/integration/whitespace/index.ts
similarity index 100%
rename from test/tests/integration/whitespace/index.ts
rename to src/test/tests/integration/whitespace/index.ts
diff --git a/test/tests/integration/whitespace/trim_block.ts b/src/test/tests/integration/whitespace/trim_block.ts
similarity index 100%
rename from test/tests/integration/whitespace/trim_block.ts
rename to src/test/tests/integration/whitespace/trim_block.ts
diff --git a/test/tests/integration/whitespace/trim_delimiter_as_strings.ts b/src/test/tests/integration/whitespace/trim_delimiter_as_strings.ts
similarity index 100%
rename from test/tests/integration/whitespace/trim_delimiter_as_strings.ts
rename to src/test/tests/integration/whitespace/trim_delimiter_as_strings.ts
diff --git a/test/tests/integration/whitespace/trim_left.ts b/src/test/tests/integration/whitespace/trim_left.ts
similarity index 100%
rename from test/tests/integration/whitespace/trim_left.ts
rename to src/test/tests/integration/whitespace/trim_left.ts
diff --git a/test/tests/integration/whitespace/trim_line_left.ts b/src/test/tests/integration/whitespace/trim_line_left.ts
similarity index 100%
rename from test/tests/integration/whitespace/trim_line_left.ts
rename to src/test/tests/integration/whitespace/trim_line_left.ts
diff --git a/test/tests/integration/whitespace/trim_line_right.ts b/src/test/tests/integration/whitespace/trim_line_right.ts
similarity index 100%
rename from test/tests/integration/whitespace/trim_line_right.ts
rename to src/test/tests/integration/whitespace/trim_line_right.ts
diff --git a/test/tests/integration/whitespace/trim_right.ts b/src/test/tests/integration/whitespace/trim_right.ts
similarity index 100%
rename from test/tests/integration/whitespace/trim_right.ts
rename to src/test/tests/integration/whitespace/trim_right.ts
diff --git a/test/tests/unit/index.ts b/src/test/tests/unit/index.ts
similarity index 100%
rename from test/tests/unit/index.ts
rename to src/test/tests/unit/index.ts
diff --git a/test/tests/unit/lib.ts b/src/test/tests/unit/lib.ts
similarity index 97%
rename from test/tests/unit/lib.ts
rename to src/test/tests/unit/lib.ts
index 0eb211a7..280e8af8 100644
--- a/test/tests/unit/lib.ts
+++ b/src/test/tests/unit/lib.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import * as index from "../../../src/lib";
+import * as index from "../../../main/lib";
 
 tape('library index', ({same, end}) => {
     const expected: Array<string> = [
@@ -127,7 +127,9 @@ tape('library index', ({same, end}) => {
         'createTemplate',
         'createTest',
         'executeNode',
-        'createTemplateLoader'
+        'createTemplateLoader',
+        'createContext',
+        'createOutputBuffer'
     ];
 
     const propertyNames = Object.getOwnPropertyNames(index).filter((name) => name !== '__esModule');
diff --git a/test/tests/unit/lib/environment/index.ts b/src/test/tests/unit/lib/environment/index.ts
similarity index 90%
rename from test/tests/unit/lib/environment/index.ts
rename to src/test/tests/unit/lib/environment/index.ts
index 32a90f61..46b2fbc2 100644
--- a/test/tests/unit/lib/environment/index.ts
+++ b/src/test/tests/unit/lib/environment/index.ts
@@ -1,6 +1,6 @@
 import * as tape from "tape";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
 import {Settings} from "luxon";
 
 // todo: unit test every property because this is the public API
diff --git a/test/tests/unit/lib/environment/loader.ts b/src/test/tests/unit/lib/environment/loader.ts
similarity index 61%
rename from test/tests/unit/lib/environment/loader.ts
rename to src/test/tests/unit/lib/environment/loader.ts
index f26f0fe9..bf3f2c99 100644
--- a/test/tests/unit/lib/environment/loader.ts
+++ b/src/test/tests/unit/lib/environment/loader.ts
@@ -1,6 +1,6 @@
 import * as tape from "tape";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
 
 tape('createEnvironment::loader', ({same, end}) => {
     const loader = createArrayLoader({});
diff --git a/test/tests/unit/lib/error/base/index.ts b/src/test/tests/unit/lib/error/base/index.ts
similarity index 90%
rename from test/tests/unit/lib/error/base/index.ts
rename to src/test/tests/unit/lib/error/base/index.ts
index 6437a7fa..50fe57da 100644
--- a/test/tests/unit/lib/error/base/index.ts
+++ b/src/test/tests/unit/lib/error/base/index.ts
@@ -1,5 +1,5 @@
 import * as tape from "tape";
-import {createBaseError} from "../../../../../../src/lib/error/base";
+import {createBaseError} from "../../../../../../main/lib/error/base";
 
 tape('createBaseError', ({test}) => {
     test('creates a valid TwingBaseError', ({same, end}) => {
diff --git a/test/tests/unit/lib/error/index.ts b/src/test/tests/unit/lib/error/index.ts
similarity index 100%
rename from test/tests/unit/lib/error/index.ts
rename to src/test/tests/unit/lib/error/index.ts
diff --git a/test/tests/unit/lib/error/runtime/index.ts b/src/test/tests/unit/lib/error/runtime/index.ts
similarity index 86%
rename from test/tests/unit/lib/error/runtime/index.ts
rename to src/test/tests/unit/lib/error/runtime/index.ts
index 61d2f090..e12c97e3 100644
--- a/test/tests/unit/lib/error/runtime/index.ts
+++ b/src/test/tests/unit/lib/error/runtime/index.ts
@@ -1,5 +1,5 @@
 import * as tape from "tape";
-import {createRuntimeError} from "../../../../../../src/lib/error/runtime";
+import {createRuntimeError} from "../../../../../../main/lib/error/runtime";
 
 tape('createRuntimeError', ({test}) => {
     test('creates a valid TwingRuntimeError', ({same, end}) => {
diff --git a/test/tests/unit/lib/helpers/asort/index.ts b/src/test/tests/unit/lib/helpers/asort/index.ts
similarity index 89%
rename from test/tests/unit/lib/helpers/asort/index.ts
rename to src/test/tests/unit/lib/helpers/asort/index.ts
index 17d41ab7..d389778b 100644
--- a/test/tests/unit/lib/helpers/asort/index.ts
+++ b/src/test/tests/unit/lib/helpers/asort/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {asort} from "../../../../../../src/lib/helpers/asort";
+import {asort} from "../../../../../../main/lib/helpers/asort";
 
 tape('asort', (test) => {
     test.test('without handler', (test) => {
@@ -25,4 +25,5 @@ tape('asort', (test) => {
     });
 
     test.end();
-});
\ No newline at end of file
+});
+
diff --git a/test/tests/unit/lib/helpers/chunk/index.ts b/src/test/tests/unit/lib/helpers/chunk/index.ts
similarity index 87%
rename from test/tests/unit/lib/helpers/chunk/index.ts
rename to src/test/tests/unit/lib/helpers/chunk/index.ts
index b3c051e6..6fd94315 100644
--- a/test/tests/unit/lib/helpers/chunk/index.ts
+++ b/src/test/tests/unit/lib/helpers/chunk/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {chunk} from "../../../../../../src/lib/helpers/chunk";
+import {chunk} from "../../../../../../main/lib/helpers/chunk";
 
 tape('chunk', (test) => {
     test.test('supports arrays', async (test) => {
diff --git a/test/tests/unit/lib/helpers/compare/index.ts b/src/test/tests/unit/lib/helpers/compare/index.ts
similarity index 99%
rename from test/tests/unit/lib/helpers/compare/index.ts
rename to src/test/tests/unit/lib/helpers/compare/index.ts
index 010ebdf7..e3ce965b 100644
--- a/test/tests/unit/lib/helpers/compare/index.ts
+++ b/src/test/tests/unit/lib/helpers/compare/index.ts
@@ -1,4 +1,4 @@
-import {compare} from "../../../../../../src/lib/helpers/compare";
+import {compare} from "../../../../../../main/lib/helpers/compare";
 
 const {DateTime} = require('luxon');
 
diff --git a/test/tests/unit/lib/helpers/count/index.ts b/src/test/tests/unit/lib/helpers/count/index.ts
similarity index 79%
rename from test/tests/unit/lib/helpers/count/index.ts
rename to src/test/tests/unit/lib/helpers/count/index.ts
index 74db55c1..f9934277 100644
--- a/test/tests/unit/lib/helpers/count/index.ts
+++ b/src/test/tests/unit/lib/helpers/count/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {count} from "../../../../../../src/lib/helpers/count";
+import {count} from "../../../../../../main/lib/helpers/count";
 
 tape('count', (test) => {
     test.same(count(new Map([['a', 1], ['b', 2]])), 2);
diff --git a/test/tests/unit/lib/helpers/examine-object/index.ts b/src/test/tests/unit/lib/helpers/examine-object/index.ts
similarity index 92%
rename from test/tests/unit/lib/helpers/examine-object/index.ts
rename to src/test/tests/unit/lib/helpers/examine-object/index.ts
index c79f8072..45faa4f6 100644
--- a/test/tests/unit/lib/helpers/examine-object/index.ts
+++ b/src/test/tests/unit/lib/helpers/examine-object/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {examineObject} from "../../../../../../src/lib/helpers/examine-object";
+import {examineObject} from "../../../../../../main/lib/helpers/examine-object";
 
 class Foo {
     foo: string;
@@ -68,4 +68,5 @@ tape('examine-object', (test) => {
     test.same(actual, expected, 'should return object properties by climbing up the prototype chain');
 
     test.end();
-});
\ No newline at end of file
+});
+
diff --git a/test/tests/unit/lib/helpers/fill-map/index.ts b/src/test/tests/unit/lib/helpers/fill-map/index.ts
similarity index 96%
rename from test/tests/unit/lib/helpers/fill-map/index.ts
rename to src/test/tests/unit/lib/helpers/fill-map/index.ts
index edf9102c..2bb023f9 100644
--- a/test/tests/unit/lib/helpers/fill-map/index.ts
+++ b/src/test/tests/unit/lib/helpers/fill-map/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {fillMap} from "../../../../../../src/lib/helpers/fill-map";
+import {fillMap} from "../../../../../../main/lib/helpers/fill-map";
 
 tape('fillMap', (test) => {
     test.test('does not replace existing numeric keys', (test) => {
diff --git a/test/tests/unit/lib/helpers/format-date-time/index.ts b/src/test/tests/unit/lib/helpers/format-date-time/index.ts
similarity index 99%
rename from test/tests/unit/lib/helpers/format-date-time/index.ts
rename to src/test/tests/unit/lib/helpers/format-date-time/index.ts
index 11c1f43c..6ce2fbbe 100644
--- a/test/tests/unit/lib/helpers/format-date-time/index.ts
+++ b/src/test/tests/unit/lib/helpers/format-date-time/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {formatDateTime} from "../../../../../../src/lib/helpers/format-date-time";
+import {formatDateTime} from "../../../../../../main/lib/helpers/format-date-time";
 
 const {DateTime, Settings} = require('luxon');
 
diff --git a/test/tests/unit/lib/helpers/format-duration/index.ts b/src/test/tests/unit/lib/helpers/format-duration/index.ts
similarity index 94%
rename from test/tests/unit/lib/helpers/format-duration/index.ts
rename to src/test/tests/unit/lib/helpers/format-duration/index.ts
index 0b974368..7b0af8d4 100644
--- a/test/tests/unit/lib/helpers/format-duration/index.ts
+++ b/src/test/tests/unit/lib/helpers/format-duration/index.ts
@@ -1,6 +1,6 @@
 import * as tape from "tape";
 import {Duration} from "luxon";
-import {formatDuration} from "../../../../../../src/lib/helpers/format-duration";
+import {formatDuration} from "../../../../../../main/lib/helpers/format-duration";
 
 tape('formatDuration', ({test}) => {
     const positiveDuration = Duration.fromISO('P5Y5M5DT5H5M5S');
diff --git a/test/tests/unit/lib/helpers/iconv/index.ts b/src/test/tests/unit/lib/helpers/iconv/index.ts
similarity index 79%
rename from test/tests/unit/lib/helpers/iconv/index.ts
rename to src/test/tests/unit/lib/helpers/iconv/index.ts
index 4ee395bf..b7385e68 100644
--- a/test/tests/unit/lib/helpers/iconv/index.ts
+++ b/src/test/tests/unit/lib/helpers/iconv/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {iconv} from "../../../../../../src/lib/helpers/iconv";
+import {iconv} from "../../../../../../main/lib/helpers/iconv";
 
 tape('iconv', ({test}) => {
     test('is non destructive', ({same, end}) => {
diff --git a/test/tests/unit/lib/helpers/includes/index.ts b/src/test/tests/unit/lib/helpers/includes/index.ts
similarity index 75%
rename from test/tests/unit/lib/helpers/includes/index.ts
rename to src/test/tests/unit/lib/helpers/includes/index.ts
index 2c4686d0..c45d9fe0 100644
--- a/test/tests/unit/lib/helpers/includes/index.ts
+++ b/src/test/tests/unit/lib/helpers/includes/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {includes} from "../../../../../../src/lib/helpers/includes";
+import {includes} from "../../../../../../main/lib/helpers/includes";
 
 tape('includes', (test) => {
     let map = new Map([
diff --git a/test/tests/unit/lib/helpers/index.ts b/src/test/tests/unit/lib/helpers/index.ts
similarity index 100%
rename from test/tests/unit/lib/helpers/index.ts
rename to src/test/tests/unit/lib/helpers/index.ts
diff --git a/test/tests/unit/lib/helpers/is-in/index.ts b/src/test/tests/unit/lib/helpers/is-in/index.ts
similarity index 78%
rename from test/tests/unit/lib/helpers/is-in/index.ts
rename to src/test/tests/unit/lib/helpers/is-in/index.ts
index 784b967d..e72e7577 100644
--- a/test/tests/unit/lib/helpers/is-in/index.ts
+++ b/src/test/tests/unit/lib/helpers/is-in/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {isIn} from "../../../../../../src/lib/helpers/is-in";
+import {isIn} from "../../../../../../main/lib/helpers/is-in";
 
 tape('is-in', ({same, end}) => {
     same(isIn(1, [1, 2]), true);
diff --git a/test/tests/unit/lib/helpers/iterate/index.ts b/src/test/tests/unit/lib/helpers/iterate/index.ts
similarity index 96%
rename from test/tests/unit/lib/helpers/iterate/index.ts
rename to src/test/tests/unit/lib/helpers/iterate/index.ts
index c51f2ccc..7a4e3163 100644
--- a/test/tests/unit/lib/helpers/iterate/index.ts
+++ b/src/test/tests/unit/lib/helpers/iterate/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {iterate} from "../../../../../../src/lib/helpers/iterate";
+import {iterate} from "../../../../../../main/lib/helpers/iterate";
 
 class TestIterator {
     position: number;
diff --git a/test/tests/unit/lib/helpers/iterator-to-array/index.ts b/src/test/tests/unit/lib/helpers/iterator-to-array/index.ts
similarity index 89%
rename from test/tests/unit/lib/helpers/iterator-to-array/index.ts
rename to src/test/tests/unit/lib/helpers/iterator-to-array/index.ts
index 1a2193a7..3dc94207 100644
--- a/test/tests/unit/lib/helpers/iterator-to-array/index.ts
+++ b/src/test/tests/unit/lib/helpers/iterator-to-array/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {iteratorToArray} from "../../../../../../src/lib/helpers/iterator-to-array";
+import {iteratorToArray} from "../../../../../../main/lib/helpers/iterator-to-array";
 
 class TestIterator {
     values: any[];
diff --git a/test/tests/unit/lib/helpers/iterator-to-hash/index.ts b/src/test/tests/unit/lib/helpers/iterator-to-hash/index.ts
similarity index 74%
rename from test/tests/unit/lib/helpers/iterator-to-hash/index.ts
rename to src/test/tests/unit/lib/helpers/iterator-to-hash/index.ts
index 7beeb278..3b5b5b73 100644
--- a/test/tests/unit/lib/helpers/iterator-to-hash/index.ts
+++ b/src/test/tests/unit/lib/helpers/iterator-to-hash/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {iteratorToHash} from "../../../../../../src/lib/helpers/iterator-to-hash";
+import {iteratorToHash} from "../../../../../../main/lib/helpers/iterator-to-hash";
 
 class Foo {
 
diff --git a/test/tests/unit/lib/helpers/iterator-to-map/index.ts b/src/test/tests/unit/lib/helpers/iterator-to-map/index.ts
similarity index 98%
rename from test/tests/unit/lib/helpers/iterator-to-map/index.ts
rename to src/test/tests/unit/lib/helpers/iterator-to-map/index.ts
index 2e173a84..11bc0d2d 100644
--- a/test/tests/unit/lib/helpers/iterator-to-map/index.ts
+++ b/src/test/tests/unit/lib/helpers/iterator-to-map/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {iteratorToMap} from "../../../../../../src/lib/helpers/iterator-to-map";
+import {iteratorToMap} from "../../../../../../main/lib/helpers/iterator-to-map";
 
 const createIterator = () => {
     let index = 0;
diff --git a/test/tests/unit/lib/helpers/ksort/index.ts b/src/test/tests/unit/lib/helpers/ksort/index.ts
similarity index 89%
rename from test/tests/unit/lib/helpers/ksort/index.ts
rename to src/test/tests/unit/lib/helpers/ksort/index.ts
index 62155060..99d75067 100644
--- a/test/tests/unit/lib/helpers/ksort/index.ts
+++ b/src/test/tests/unit/lib/helpers/ksort/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {ksort} from "../../../../../../src/lib/helpers/ksort";
+import {ksort} from "../../../../../../main/lib/helpers/ksort";
 
 tape('ksort', (test) => {
     test.test('without handler', (test) => {
diff --git a/test/tests/unit/lib/helpers/modify-date/index.ts b/src/test/tests/unit/lib/helpers/modify-date/index.ts
similarity index 95%
rename from test/tests/unit/lib/helpers/modify-date/index.ts
rename to src/test/tests/unit/lib/helpers/modify-date/index.ts
index 9cfd356c..666c2429 100644
--- a/test/tests/unit/lib/helpers/modify-date/index.ts
+++ b/src/test/tests/unit/lib/helpers/modify-date/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {modifyDate} from "../../../../../../src/lib/helpers/modify-date";
+import {modifyDate} from "../../../../../../main/lib/helpers/modify-date";
 
 const sinon = require('sinon');
 const luxon = require('luxon');
@@ -25,4 +25,5 @@ tape('relative-date', (test) => {
     stub.restore();
 
     test.end();
-});
\ No newline at end of file
+});
+
diff --git a/test/tests/unit/lib/helpers/reverse/index.ts b/src/test/tests/unit/lib/helpers/reverse/index.ts
similarity index 80%
rename from test/tests/unit/lib/helpers/reverse/index.ts
rename to src/test/tests/unit/lib/helpers/reverse/index.ts
index e4366971..c934d53e 100644
--- a/test/tests/unit/lib/helpers/reverse/index.ts
+++ b/src/test/tests/unit/lib/helpers/reverse/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {reverse} from "../../../../../../src/lib/helpers/reverse";
+import {reverse} from "../../../../../../main/lib/helpers/reverse";
 
 tape('reverse', (test) => {
     let map = new Map<any, any>([[0, 'foo'], ['bar', 'bar']]);
@@ -8,4 +8,5 @@ tape('reverse', (test) => {
     test.same(reverse(map, true), new Map<any, any>([['bar', 'bar'], [0, 'foo']]));
 
     test.end();
-});
\ No newline at end of file
+});
+
diff --git a/test/tests/unit/lib/helpers/slice/index.ts b/src/test/tests/unit/lib/helpers/slice/index.ts
similarity index 82%
rename from test/tests/unit/lib/helpers/slice/index.ts
rename to src/test/tests/unit/lib/helpers/slice/index.ts
index 5f4df626..8a9c241d 100644
--- a/test/tests/unit/lib/helpers/slice/index.ts
+++ b/src/test/tests/unit/lib/helpers/slice/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {sliceMap} from "../../../../../../src/lib/helpers/slice-map";
+import {sliceMap} from "../../../../../../main/lib/helpers/slice-map";
 
 tape('slice', (test) => {
     let map = new Map<any, any>([[1, 'foo'], ['bar', 'bar'], [2, 'oof']]);
diff --git a/test/tests/unit/lib/helpers/sort/index.ts b/src/test/tests/unit/lib/helpers/sort/index.ts
similarity index 94%
rename from test/tests/unit/lib/helpers/sort/index.ts
rename to src/test/tests/unit/lib/helpers/sort/index.ts
index 1e5f45e6..d0464b8e 100644
--- a/test/tests/unit/lib/helpers/sort/index.ts
+++ b/src/test/tests/unit/lib/helpers/sort/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {sortAsynchronously} from '../../../../../../src/lib/helpers/sort';
+import {sortAsynchronously} from '../../../../../../main/lib/helpers/sort';
 
 tape('sort helpers', ({test}) => {
     test('sortAsynchronously', ({test}) => {
@@ -32,4 +32,5 @@ tape('sort helpers', ({test}) => {
             });
         }
     });
-})
\ No newline at end of file
+})
+
diff --git a/test/tests/unit/lib/index.ts b/src/test/tests/unit/lib/index.ts
similarity index 100%
rename from test/tests/unit/lib/index.ts
rename to src/test/tests/unit/lib/index.ts
diff --git a/test/tests/unit/lib/lexer/index.ts b/src/test/tests/unit/lib/lexer/index.ts
similarity index 94%
rename from test/tests/unit/lib/lexer/index.ts
rename to src/test/tests/unit/lib/lexer/index.ts
index c9b63ff8..21122a95 100644
--- a/test/tests/unit/lib/lexer/index.ts
+++ b/src/test/tests/unit/lib/lexer/index.ts
@@ -1,6 +1,6 @@
 import * as tape from 'tape';
-import {TwingLexer, typeToEnglish} from "../../../../../src/lib/lexer";
-import {createOperator} from "../../../../../src/lib/operator";
+import {TwingLexer, typeToEnglish} from "../../../../../main/lib/lexer";
+import {createOperator} from "../../../../../main/lib/operator";
 
 tape('lexer', (test) => {
     test.test('constructor', (test) => {
diff --git a/test/tests/unit/lib/loader/array/index.ts b/src/test/tests/unit/lib/loader/array/index.ts
similarity index 95%
rename from test/tests/unit/lib/loader/array/index.ts
rename to src/test/tests/unit/lib/loader/array/index.ts
index fa279fae..97c88976 100644
--- a/test/tests/unit/lib/loader/array/index.ts
+++ b/src/test/tests/unit/lib/loader/array/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {createArrayLoader} from "../../../../../../src/lib/loader/array";
+import {createArrayLoader} from "../../../../../../main/lib/loader/array";
 
 tape('createArrayLoader', ({test}) => {
     test('resolve', async ({same, end}) => {
diff --git a/test/tests/unit/lib/loader/chain/index.ts b/src/test/tests/unit/lib/loader/chain/index.ts
similarity index 98%
rename from test/tests/unit/lib/loader/chain/index.ts
rename to src/test/tests/unit/lib/loader/chain/index.ts
index f848d84f..cdcee919 100644
--- a/test/tests/unit/lib/loader/chain/index.ts
+++ b/src/test/tests/unit/lib/loader/chain/index.ts
@@ -1,6 +1,6 @@
 import * as tape from 'tape';
-import {createChainLoader} from "../../../../../../src/lib/loader/chain";
-import {createArrayLoader} from "../../../../../../src/lib/loader/array";
+import {createChainLoader} from "../../../../../../main/lib/loader/chain";
+import {createArrayLoader} from "../../../../../../main/lib/loader/array";
 import {spy, stub} from "sinon";
 
 tape('createChainLoader', ({test}) => {
diff --git a/test/tests/unit/lib/loader/filesystem/index.ts b/src/test/tests/unit/lib/loader/filesystem/index.ts
similarity index 98%
rename from test/tests/unit/lib/loader/filesystem/index.ts
rename to src/test/tests/unit/lib/loader/filesystem/index.ts
index 8a2e2b1f..90451969 100644
--- a/test/tests/unit/lib/loader/filesystem/index.ts
+++ b/src/test/tests/unit/lib/loader/filesystem/index.ts
@@ -1,6 +1,6 @@
 import * as tape from "tape";
-import {createFilesystemLoader, TwingFilesystemLoaderFilesystem} from "../../../../../../src/lib/loader/filesystem";
-import {createSource} from "../../../../../../src/lib/source";
+import {createFilesystemLoader, TwingFilesystemLoaderFilesystem} from "../../../../../../main/lib/loader/filesystem";
+import {createSource} from "../../../../../../main/lib/source";
 import {stub} from "sinon";
 
 const fileSystemContent: Array<[path: string, content: string]> = [
diff --git a/test/tests/unit/lib/loader/index.ts b/src/test/tests/unit/lib/loader/index.ts
similarity index 100%
rename from test/tests/unit/lib/loader/index.ts
rename to src/test/tests/unit/lib/loader/index.ts
diff --git a/test/tests/unit/lib/node-executor/base/index.ts b/src/test/tests/unit/lib/node-executor/base/index.ts
similarity index 69%
rename from test/tests/unit/lib/node-executor/base/index.ts
rename to src/test/tests/unit/lib/node-executor/base/index.ts
index 9302c8eb..0f8cf7c0 100644
--- a/test/tests/unit/lib/node-executor/base/index.ts
+++ b/src/test/tests/unit/lib/node-executor/base/index.ts
@@ -1,8 +1,8 @@
 import * as tape from "tape";
-import {TwingRuntimeError} from "../../../../../../src/lib/error/runtime";
-import {createBaseNode} from "../../../../../../src/lib/node";
-import {executeNode} from "../../../../../../src/lib/node-executor";
-import type {TwingExecutionContext} from "../../../../../../src/lib/execution-context";
+import {TwingRuntimeError} from "../../../../../../main/lib/error/runtime";
+import {createBaseNode} from "../../../../../../main/lib/node";
+import {executeNode} from "../../../../../../main/lib/node-executor";
+import type {TwingExecutionContext} from "../../../../../../main/lib/execution-context";
 
 tape('executeNode => ::()', ({test}) => {
     test('throws on unrecognized node type', ({same, fail, end}) => {
diff --git a/test/tests/unit/lib/node-executor/binary/index.ts b/src/test/tests/unit/lib/node-executor/binary/index.ts
similarity index 64%
rename from test/tests/unit/lib/node-executor/binary/index.ts
rename to src/test/tests/unit/lib/node-executor/binary/index.ts
index c8c08688..395a4746 100644
--- a/test/tests/unit/lib/node-executor/binary/index.ts
+++ b/src/test/tests/unit/lib/node-executor/binary/index.ts
@@ -1,9 +1,9 @@
 import * as tape from "tape";
-import {executeBinaryNode} from "../../../../../../src/lib/node-executor/expression/binary";
-import {createBaseBinaryNode} from "../../../../../../src/lib/node/expression/binary";
-import {createConstantNode} from "../../../../../../src/lib/node/expression/constant";
-import {TwingRuntimeError} from "../../../../../../src/lib/error/runtime";
-import type {TwingExecutionContext} from "../../../../../../src/lib/execution-context";
+import {executeBinaryNode} from "../../../../../../main/lib/node-executor/expression/binary";
+import {createBaseBinaryNode} from "../../../../../../main/lib/node/expression/binary";
+import {createConstantNode} from "../../../../../../main/lib/node/expression/constant";
+import {TwingRuntimeError} from "../../../../../../main/lib/error/runtime";
+import type {TwingExecutionContext} from "../../../../../../main/lib/execution-context";
 
 tape('executeBinaryNode => ::()', ({test}) => {
     test('throws on unrecognized node type', ({same, fail, end}) => {
diff --git a/test/tests/unit/lib/node-executor/index.ts b/src/test/tests/unit/lib/node-executor/index.ts
similarity index 100%
rename from test/tests/unit/lib/node-executor/index.ts
rename to src/test/tests/unit/lib/node-executor/index.ts
diff --git a/test/tests/unit/lib/node-executor/unary/index.ts b/src/test/tests/unit/lib/node-executor/unary/index.ts
similarity index 62%
rename from test/tests/unit/lib/node-executor/unary/index.ts
rename to src/test/tests/unit/lib/node-executor/unary/index.ts
index e3c07358..38d8b2f6 100644
--- a/test/tests/unit/lib/node-executor/unary/index.ts
+++ b/src/test/tests/unit/lib/node-executor/unary/index.ts
@@ -1,9 +1,9 @@
 import * as tape from "tape";
-import {createConstantNode} from "../../../../../../src/lib/node/expression/constant";
-import {TwingRuntimeError} from "../../../../../../src/lib/error/runtime";
-import {executeUnaryNode} from "../../../../../../src/lib/node-executor/expression/unary";
-import {createBaseUnaryNode} from "../../../../../../src/lib/node/expression/unary";
-import type {TwingExecutionContext} from "../../../../../../src/lib/execution-context";
+import {createConstantNode} from "../../../../../../main/lib/node/expression/constant";
+import {TwingRuntimeError} from "../../../../../../main/lib/error/runtime";
+import {executeUnaryNode} from "../../../../../../main/lib/node-executor/expression/unary";
+import {createBaseUnaryNode} from "../../../../../../main/lib/node/expression/unary";
+import type {TwingExecutionContext} from "../../../../../../main/lib/execution-context";
 
 tape('executeUnaryNode', ({test}) => {
     test('throws on unrecognized node type', ({same, fail, end}) => {
diff --git a/test/tests/unit/lib/node-traverser/index.ts b/src/test/tests/unit/lib/node-traverser/index.ts
similarity index 87%
rename from test/tests/unit/lib/node-traverser/index.ts
rename to src/test/tests/unit/lib/node-traverser/index.ts
index 86d6a739..f97ba97d 100644
--- a/test/tests/unit/lib/node-traverser/index.ts
+++ b/src/test/tests/unit/lib/node-traverser/index.ts
@@ -1,7 +1,7 @@
 import * as tape from 'tape';
-import {createNodeTraverser} from "../../../../../src/lib/node-traverser";
-import {TwingBaseNode, createBaseNode} from "../../../../../src/lib/node";
-import {createNodeVisitor, TwingNodeVisitor} from "../../../../../src/lib/node-visitor";
+import {createNodeTraverser} from "../../../../../main/lib/node-traverser";
+import {TwingBaseNode, createBaseNode} from "../../../../../main/lib/node";
+import {createNodeVisitor, TwingNodeVisitor} from "../../../../../main/lib/node-visitor";
 
 const createRemoveNodeToRemoveNodeVisitor = (
     nodeToRemove: TwingBaseNode
diff --git a/test/tests/unit/lib/output-buffer/index.ts b/src/test/tests/unit/lib/output-buffer/index.ts
similarity index 98%
rename from test/tests/unit/lib/output-buffer/index.ts
rename to src/test/tests/unit/lib/output-buffer/index.ts
index 20536ddc..a9f6e418 100644
--- a/test/tests/unit/lib/output-buffer/index.ts
+++ b/src/test/tests/unit/lib/output-buffer/index.ts
@@ -1,5 +1,5 @@
 import * as tape from 'tape';
-import {createOutputBuffer} from "../../../../../src/lib/output-buffer";
+import {createOutputBuffer} from "../../../../../main/lib/output-buffer";
 import {spy} from "sinon";
 import {Writable} from "stream";
 
diff --git a/test/tests/unit/lib/parser/create-parser/index.ts b/src/test/tests/unit/lib/parser/create-parser/index.ts
similarity index 100%
rename from test/tests/unit/lib/parser/create-parser/index.ts
rename to src/test/tests/unit/lib/parser/create-parser/index.ts
diff --git a/test/tests/unit/lib/parser/create-parser/with-undefined-options.ts b/src/test/tests/unit/lib/parser/create-parser/with-undefined-options.ts
similarity index 84%
rename from test/tests/unit/lib/parser/create-parser/with-undefined-options.ts
rename to src/test/tests/unit/lib/parser/create-parser/with-undefined-options.ts
index 6fa623b8..8ef44384 100644
--- a/test/tests/unit/lib/parser/create-parser/with-undefined-options.ts
+++ b/src/test/tests/unit/lib/parser/create-parser/with-undefined-options.ts
@@ -1,9 +1,9 @@
 import * as tape from "tape";
-import {createParser} from "../../../../../../src/lib/parser";
-import {createSource} from "../../../../../../src/lib/source";
-import {createLexer} from "../../../../../../src/lib/lexer";
-import {createTokenStream} from "../../../../../../src/lib/token-stream";
-import {createFilter} from "../../../../../../src/lib/filter";
+import {createParser} from "../../../../../../main/lib/parser";
+import {createSource} from "../../../../../../main/lib/source";
+import {createLexer} from "../../../../../../main/lib/lexer";
+import {createTokenStream} from "../../../../../../main/lib/token-stream";
+import {createFilter} from "../../../../../../main/lib/filter";
 
 tape('createParser', ({test}) => {
     test('with undefined options', ({test}) => {
@@ -59,4 +59,5 @@ tape('createParser', ({test}) => {
             }
         });
     });
-});
\ No newline at end of file
+});
+
diff --git a/test/tests/unit/lib/parser/index.ts b/src/test/tests/unit/lib/parser/index.ts
similarity index 100%
rename from test/tests/unit/lib/parser/index.ts
rename to src/test/tests/unit/lib/parser/index.ts
diff --git a/test/tests/unit/lib/template-loader/index.ts b/src/test/tests/unit/lib/template-loader/index.ts
similarity index 81%
rename from test/tests/unit/lib/template-loader/index.ts
rename to src/test/tests/unit/lib/template-loader/index.ts
index b3354190..1f0e5265 100644
--- a/test/tests/unit/lib/template-loader/index.ts
+++ b/src/test/tests/unit/lib/template-loader/index.ts
@@ -1,10 +1,10 @@
 import * as tape from "tape";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createFilesystemLoader, TwingFilesystemLoaderFilesystem} from "../../../../../src/lib/loader/filesystem";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createFilesystemLoader, TwingFilesystemLoaderFilesystem} from "../../../../../main/lib/loader/filesystem";
 import {spy, stub} from "sinon";
-import {createTemplateLoader} from "../../../../../src/lib/template-loader";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
-import type {TwingCache} from "../../../../../src/lib/cache";
+import {createTemplateLoader} from "../../../../../main/lib/template-loader";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
+import type {TwingCache} from "../../../../../main/lib/cache";
 
 const createMockCache = (): TwingCache => {
     return {
@@ -45,13 +45,13 @@ tape('createTemplateLoader::()', ({test}) => {
 
         const getSourceSpy = spy(loader, "getSource");
 
-        return loadTemplate('@Foo/bar')
+        return loadTemplate('@Foo/bar', null)
             .then(() => {
                 return Promise.all([
-                    loadTemplate('foo/bar'),
-                    loadTemplate('./foo/bar'),
+                    loadTemplate('foo/bar', null),
+                    loadTemplate('./foo/bar', null),
                     loadTemplate('../foo/bar', 'there/index.html'),
-                    loadTemplate('Bar/bar'),
+                    loadTemplate('Bar/bar', null),
                 ]).then(() => {
                     same(getSourceSpy.callCount, 1);
                 });
@@ -78,12 +78,12 @@ tape('createTemplateLoader::()', ({test}) => {
         );
         const loadTemplate = createTemplateLoader(environment);
 
-        return loadTemplate('foo')
+        return loadTemplate('foo', null)
             .then(() => {
-                return loadTemplate('foo');
+                return loadTemplate('foo', null);
             })
             .then(() => {
-                return loadTemplate('foo');
+                return loadTemplate('foo', null);
             })
             .then((template) => {
                 return template?.render(environment, {});
@@ -113,14 +113,14 @@ tape('createTemplateLoader::()', ({test}) => {
         );
         const loadTemplate = createTemplateLoader(environment);
 
-        return loadTemplate('foo')
+        return loadTemplate('foo', null)
             .then(() => {
-                return loadTemplate('foo');
+                return loadTemplate('foo', null);
             })
             .then(() => {
                 stub(loader, "isFresh").resolves(true);
 
-                return loadTemplate('foo');
+                return loadTemplate('foo', null);
             })
             .then((template) => {
                 return template?.render(environment, {});
diff --git a/test/tests/unit/lib/template/ast.ts b/src/test/tests/unit/lib/template/ast.ts
similarity index 85%
rename from test/tests/unit/lib/template/ast.ts
rename to src/test/tests/unit/lib/template/ast.ts
index 856e0545..7e5da251 100644
--- a/test/tests/unit/lib/template/ast.ts
+++ b/src/test/tests/unit/lib/template/ast.ts
@@ -1,8 +1,8 @@
 import * as tape from "tape";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
-import {TwingTemplateNode} from "../../../../../src/lib/node/template";
-import {createTemplate} from "../../../../../src/lib/template";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
+import {TwingTemplateNode} from "../../../../../main/lib/node/template";
+import {createTemplate} from "../../../../../main/lib/template";
 
 tape('createTemplate => ::ast', ({test}) => {
     test('without embedded templates', ({same, end}) => {
diff --git a/test/tests/unit/lib/template/embedded-templates.ts b/src/test/tests/unit/lib/template/embedded-templates.ts
similarity index 77%
rename from test/tests/unit/lib/template/embedded-templates.ts
rename to src/test/tests/unit/lib/template/embedded-templates.ts
index 29fd79b5..ac205ac1 100644
--- a/test/tests/unit/lib/template/embedded-templates.ts
+++ b/src/test/tests/unit/lib/template/embedded-templates.ts
@@ -1,8 +1,8 @@
 import * as tape from "tape";
-import {createTemplate} from "../../../../../src/lib/template";
-import {createTemplateNode} from "../../../../../src/lib/node/template";
-import {createBaseNode} from "../../../../../src/lib/node";
-import {createSource} from "../../../../../src/lib/source";
+import {createTemplate} from "../../../../../main/lib/template";
+import {createTemplateNode} from "../../../../../main/lib/node/template";
+import {createBaseNode} from "../../../../../main/lib/node";
+import {createSource} from "../../../../../main/lib/source";
 
 tape('createTemplate => ::embeddedTemplates', ({test}) => {
     test('throws an error on invalid index', ({same, end}) => {
diff --git a/test/tests/unit/lib/template/execute.ts b/src/test/tests/unit/lib/template/execute.ts
similarity index 87%
rename from test/tests/unit/lib/template/execute.ts
rename to src/test/tests/unit/lib/template/execute.ts
index 549090c3..1ea74244 100644
--- a/test/tests/unit/lib/template/execute.ts
+++ b/src/test/tests/unit/lib/template/execute.ts
@@ -1,18 +1,18 @@
 import * as tape from "tape";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
-import {createTemplate} from "../../../../../src/lib/template";
-import {createTemplateNode} from "../../../../../src/lib/node/template";
-import {createBaseNode} from "../../../../../src/lib/node";
-import {createSource} from "../../../../../src/lib/source";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
+import {createTemplate} from "../../../../../main/lib/template";
+import {createTemplateNode} from "../../../../../main/lib/node/template";
+import {createBaseNode} from "../../../../../main/lib/node";
+import {createSource} from "../../../../../main/lib/source";
 import {spy} from "sinon";
-import {createOutputBuffer} from "../../../../../src/lib/output-buffer";
-import {createContext} from "../../../../../src/lib/context";
-import {createSourceMapRuntime} from "../../../../../src/lib/source-map-runtime";
-import {executeNode, type TwingNodeExecutor} from "../../../../../src/lib/node-executor";
-import {createTextNode} from "../../../../../src/lib/node/text";
-import {createVerbatimNode} from "../../../../../src/lib/node/verbatim";
-import {createTemplateLoader, type TwingTemplateLoader} from "../../../../../src/lib/template-loader";
+import {createOutputBuffer} from "../../../../../main/lib/output-buffer";
+import {createContext} from "../../../../../main/lib/context";
+import {createSourceMapRuntime} from "../../../../../main/lib/source-map-runtime";
+import {executeNode, type TwingNodeExecutor} from "../../../../../main/lib/node-executor";
+import {createTextNode} from "../../../../../main/lib/node/text";
+import {createVerbatimNode} from "../../../../../main/lib/node/verbatim";
+import {createTemplateLoader, type TwingTemplateLoader} from "../../../../../main/lib/template-loader";
 
 tape('createTemplate => ::execute', ({test}) => {
     test('executes the AST according to the passed options', ({test}) => {
diff --git a/test/tests/unit/lib/template/index.ts b/src/test/tests/unit/lib/template/index.ts
similarity index 100%
rename from test/tests/unit/lib/template/index.ts
rename to src/test/tests/unit/lib/template/index.ts
diff --git a/test/tests/unit/lib/template/render.ts b/src/test/tests/unit/lib/template/render.ts
similarity index 67%
rename from test/tests/unit/lib/template/render.ts
rename to src/test/tests/unit/lib/template/render.ts
index 61b4f7d4..64e65a12 100644
--- a/test/tests/unit/lib/template/render.ts
+++ b/src/test/tests/unit/lib/template/render.ts
@@ -1,15 +1,15 @@
 import * as tape from "tape";
-import {createEnvironment} from "../../../../../src/lib/environment";
-import {createArrayLoader} from "../../../../../src/lib/loader/array";
-import {createTemplate} from "../../../../../src/lib/template";
-import {createTemplateNode} from "../../../../../src/lib/node/template";
-import {createBaseNode} from "../../../../../src/lib/node";
-import {createSource} from "../../../../../src/lib/source";
-import {createOutputBuffer} from "../../../../../src/lib/output-buffer";
-import {createContext} from "../../../../../src/lib/context";
-import {executeNode, type TwingNodeExecutor} from "../../../../../src/lib/node-executor";
-import {createTextNode} from "../../../../../src/lib/node/text";
-import {createVerbatimNode} from "../../../../../src/lib/node/verbatim";
+import {createEnvironment} from "../../../../../main/lib/environment";
+import {createArrayLoader} from "../../../../../main/lib/loader/array";
+import {createTemplate} from "../../../../../main/lib/template";
+import {createTemplateNode} from "../../../../../main/lib/node/template";
+import {createBaseNode} from "../../../../../main/lib/node";
+import {createSource} from "../../../../../main/lib/source";
+import {createOutputBuffer} from "../../../../../main/lib/output-buffer";
+import {createContext} from "../../../../../main/lib/context";
+import {executeNode, type TwingNodeExecutor} from "../../../../../main/lib/node-executor";
+import {createTextNode} from "../../../../../main/lib/node/text";
+import {createVerbatimNode} from "../../../../../main/lib/node/verbatim";
 
 tape('createTemplate => ::render', ({test}) => {
     test('honors the passed node executor', ({same, end}) => {
diff --git a/test/tsconfig.json b/src/test/tsconfig.json
similarity index 72%
rename from test/tsconfig.json
rename to src/test/tsconfig.json
index 682b9a7b..0a9b9acd 100644
--- a/test/tsconfig.json
+++ b/src/test/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "inlineSourceMap": true
   },
diff --git a/tsconfig.json b/tsconfig.json
index af23c7df..7a043259 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,9 +8,5 @@
     "strict": true,
     "noUnusedParameters": true,
     "noUnusedLocals": true
-  },
-  "include": [
-    "src/lib.ts"
-  ],
-  "exclude": []
+  }
 }
\ No newline at end of file