diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 1ad899db..00000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.editorconfig b/packages/es-mapping-generator/.editorconfig
similarity index 100%
rename from .editorconfig
rename to packages/es-mapping-generator/.editorconfig
diff --git a/.eslintignore b/packages/es-mapping-generator/.eslintignore
similarity index 100%
rename from .eslintignore
rename to packages/es-mapping-generator/.eslintignore
diff --git a/.eslintrc b/packages/es-mapping-generator/.eslintrc
similarity index 100%
rename from .eslintrc
rename to packages/es-mapping-generator/.eslintrc
diff --git a/.gitignore b/packages/es-mapping-generator/.gitignore
similarity index 100%
rename from .gitignore
rename to packages/es-mapping-generator/.gitignore
diff --git a/.gitlab-ci.yml b/packages/es-mapping-generator/.gitlab-ci.yml
similarity index 100%
rename from .gitlab-ci.yml
rename to packages/es-mapping-generator/.gitlab-ci.yml
diff --git a/.npmignore b/packages/es-mapping-generator/.npmignore
similarity index 100%
rename from .npmignore
rename to packages/es-mapping-generator/.npmignore
diff --git a/CHANGELOG.md b/packages/es-mapping-generator/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to packages/es-mapping-generator/CHANGELOG.md
diff --git a/Dockerfile b/packages/es-mapping-generator/Dockerfile
similarity index 100%
rename from Dockerfile
rename to packages/es-mapping-generator/Dockerfile
diff --git a/LICENSE b/packages/es-mapping-generator/LICENSE
similarity index 100%
rename from LICENSE
rename to packages/es-mapping-generator/LICENSE
diff --git a/README.md b/packages/es-mapping-generator/README.md
similarity index 100%
rename from README.md
rename to packages/es-mapping-generator/README.md
diff --git a/package-lock.json b/packages/es-mapping-generator/package-lock.json
similarity index 100%
rename from package-lock.json
rename to packages/es-mapping-generator/package-lock.json
diff --git a/package.json b/packages/es-mapping-generator/package.json
similarity index 100%
rename from package.json
rename to packages/es-mapping-generator/package.json
diff --git a/src/cli.ts b/packages/es-mapping-generator/src/cli.ts
similarity index 100%
rename from src/cli.ts
rename to packages/es-mapping-generator/src/cli.ts
diff --git a/src/config/fieldmap.ts b/packages/es-mapping-generator/src/config/fieldmap.ts
similarity index 100%
rename from src/config/fieldmap.ts
rename to packages/es-mapping-generator/src/config/fieldmap.ts
diff --git a/src/config/premap.ts b/packages/es-mapping-generator/src/config/premap.ts
similarity index 100%
rename from src/config/premap.ts
rename to packages/es-mapping-generator/src/config/premap.ts
diff --git a/src/config/settings.ts b/packages/es-mapping-generator/src/config/settings.ts
similarity index 100%
rename from src/config/settings.ts
rename to packages/es-mapping-generator/src/config/settings.ts
diff --git a/src/config/typemap.ts b/packages/es-mapping-generator/src/config/typemap.ts
similarity index 100%
rename from src/config/typemap.ts
rename to packages/es-mapping-generator/src/config/typemap.ts
diff --git a/src/mapping.ts b/packages/es-mapping-generator/src/mapping.ts
similarity index 100%
rename from src/mapping.ts
rename to packages/es-mapping-generator/src/mapping.ts
diff --git a/src/project-reflection.ts b/packages/es-mapping-generator/src/project-reflection.ts
similarity index 100%
rename from src/project-reflection.ts
rename to packages/es-mapping-generator/src/project-reflection.ts
diff --git a/src/types/aggregation.ts b/packages/es-mapping-generator/src/types/aggregation.ts
similarity index 100%
rename from src/types/aggregation.ts
rename to packages/es-mapping-generator/src/types/aggregation.ts
diff --git a/src/types/mapping.ts b/packages/es-mapping-generator/src/types/mapping.ts
similarity index 100%
rename from src/types/mapping.ts
rename to packages/es-mapping-generator/src/types/mapping.ts
diff --git a/test/aggregations.spec.ts b/packages/es-mapping-generator/test/aggregations.spec.ts
similarity index 100%
rename from test/aggregations.spec.ts
rename to packages/es-mapping-generator/test/aggregations.spec.ts
diff --git a/test/mapping-model/aggregations/src/agg-array.agg-test.ts b/packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-array.agg-test.ts
similarity index 100%
rename from test/mapping-model/aggregations/src/agg-array.agg-test.ts
rename to packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-array.agg-test.ts
diff --git a/test/mapping-model/aggregations/src/agg-global-nested.agg-test.ts b/packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-global-nested.agg-test.ts
similarity index 100%
rename from test/mapping-model/aggregations/src/agg-global-nested.agg-test.ts
rename to packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-global-nested.agg-test.ts
diff --git a/test/mapping-model/aggregations/src/agg-global.agg-test.ts b/packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-global.agg-test.ts
similarity index 100%
rename from test/mapping-model/aggregations/src/agg-global.agg-test.ts
rename to packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-global.agg-test.ts
diff --git a/test/mapping-model/aggregations/src/agg-inherited-global.agg-test.ts b/packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-inherited-global.agg-test.ts
similarity index 100%
rename from test/mapping-model/aggregations/src/agg-inherited-global.agg-test.ts
rename to packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-inherited-global.agg-test.ts
diff --git a/test/mapping-model/aggregations/src/agg-inherited-overwritten.agg-test.ts b/packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-inherited-overwritten.agg-test.ts
similarity index 100%
rename from test/mapping-model/aggregations/src/agg-inherited-overwritten.agg-test.ts
rename to packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-inherited-overwritten.agg-test.ts
diff --git a/test/mapping-model/aggregations/src/agg-inherited.agg-test.ts b/packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-inherited.agg-test.ts
similarity index 100%
rename from test/mapping-model/aggregations/src/agg-inherited.agg-test.ts
rename to packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-inherited.agg-test.ts
diff --git a/test/mapping-model/aggregations/src/agg-nested.agg-test.ts b/packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-nested.agg-test.ts
similarity index 100%
rename from test/mapping-model/aggregations/src/agg-nested.agg-test.ts
rename to packages/es-mapping-generator/test/mapping-model/aggregations/src/agg-nested.agg-test.ts
diff --git a/test/mapping-model/aggregations/src/types.ts b/packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts
similarity index 100%
rename from test/mapping-model/aggregations/src/types.ts
rename to packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts
diff --git a/test/mapping-model/aggregations/tsconfig.json b/packages/es-mapping-generator/test/mapping-model/aggregations/tsconfig.json
similarity index 100%
rename from test/mapping-model/aggregations/tsconfig.json
rename to packages/es-mapping-generator/test/mapping-model/aggregations/tsconfig.json
diff --git a/test/mapping-model/map-agg-test-options.ts b/packages/es-mapping-generator/test/mapping-model/map-agg-test-options.ts
similarity index 100%
rename from test/mapping-model/map-agg-test-options.ts
rename to packages/es-mapping-generator/test/mapping-model/map-agg-test-options.ts
diff --git a/test/mapping-model/map-agg-test.ts b/packages/es-mapping-generator/test/mapping-model/map-agg-test.ts
similarity index 100%
rename from test/mapping-model/map-agg-test.ts
rename to packages/es-mapping-generator/test/mapping-model/map-agg-test.ts
diff --git a/test/mapping-model/mappings/src/any-unknown.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/any-unknown.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/any-unknown.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/any-unknown.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/date.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/date.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/date.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/date.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/default-generics.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/default-generics.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/default-generics.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/default-generics.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/double-type-conflict.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/double-type-conflict.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/double-type-conflict.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/double-type-conflict.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/enum.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/enum.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/enum.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/enum.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/filterable-tag.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/filterable-tag.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/filterable-tag.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/filterable-tag.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/generics.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/generics.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/generics.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/generics.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/impossible-union.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/impossible-union.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/impossible-union.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/impossible-union.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/incompatible-type.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/incompatible-type.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/incompatible-type.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/incompatible-type.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/index-signature.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/index-signature.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/index-signature.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/index-signature.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/inferred-type-filterable.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/inferred-type-filterable.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/inferred-type-filterable.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/inferred-type-filterable.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/inherit-tags.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/inherit-tags.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/inherit-tags.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/inherit-tags.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/inherited-property.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/inherited-property.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/inherited-property.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/inherited-property.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/invalid-tag.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/invalid-tag.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/invalid-tag.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/invalid-tag.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/map-explicit-types.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/map-explicit-types.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/map-explicit-types.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/map-explicit-types.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/missing-premap.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/missing-premap.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/missing-premap.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/missing-premap.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/nested.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/nested.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/nested.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/nested.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/object-union.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/object-union.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/object-union.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/object-union.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/paired-tags.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/paired-tags.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/paired-tags.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/paired-tags.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/sensible-defaults.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/sensible-defaults.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/sensible-defaults.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/sensible-defaults.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/sortable-tag.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/sortable-tag.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/sortable-tag.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/sortable-tag.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/tags-ignore-case.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/tags-ignore-case.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/tags-ignore-case.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/tags-ignore-case.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/type-alias.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/type-alias.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/type-alias.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/type-alias.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/type-overrides.mapping-test.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/type-overrides.mapping-test.ts
similarity index 100%
rename from test/mapping-model/mappings/src/type-overrides.mapping-test.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/type-overrides.mapping-test.ts
diff --git a/test/mapping-model/mappings/src/type-query.mapping-test.disabled.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/type-query.mapping-test.disabled.ts
similarity index 100%
rename from test/mapping-model/mappings/src/type-query.mapping-test.disabled.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/type-query.mapping-test.disabled.ts
diff --git a/test/mapping-model/mappings/src/type-wrapper-inheritance.mapping-test.disabled.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/type-wrapper-inheritance.mapping-test.disabled.ts
similarity index 100%
rename from test/mapping-model/mappings/src/type-wrapper-inheritance.mapping-test.disabled.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/type-wrapper-inheritance.mapping-test.disabled.ts
diff --git a/test/mapping-model/mappings/src/types.ts b/packages/es-mapping-generator/test/mapping-model/mappings/src/types.ts
similarity index 100%
rename from test/mapping-model/mappings/src/types.ts
rename to packages/es-mapping-generator/test/mapping-model/mappings/src/types.ts
diff --git a/test/mapping-model/mappings/tsconfig.json b/packages/es-mapping-generator/test/mapping-model/mappings/tsconfig.json
similarity index 100%
rename from test/mapping-model/mappings/tsconfig.json
rename to packages/es-mapping-generator/test/mapping-model/mappings/tsconfig.json
diff --git a/test/mapping.spec.ts b/packages/es-mapping-generator/test/mapping.spec.ts
similarity index 100%
rename from test/mapping.spec.ts
rename to packages/es-mapping-generator/test/mapping.spec.ts
diff --git a/tsconfig.json b/packages/es-mapping-generator/tsconfig.json
similarity index 100%
rename from tsconfig.json
rename to packages/es-mapping-generator/tsconfig.json
diff --git a/tsconfig.spec.json b/packages/es-mapping-generator/tsconfig.spec.json
similarity index 100%
rename from tsconfig.spec.json
rename to packages/es-mapping-generator/tsconfig.spec.json