diff --git a/test/mapping-model/MapAggTest.ts b/test/mapping-model/MapAggTest.ts
index 1052f3ad..0b402dc1 100644
--- a/test/mapping-model/MapAggTest.ts
+++ b/test/mapping-model/MapAggTest.ts
@@ -12,16 +12,16 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
+import {ElasticsearchDataType} from '../../src/config/typemap';
 import {generateTemplate} from '../../src/mapping';
 import {resolve} from "path";
 import {expect} from "chai";
 import {ProjectReflection} from 'typedoc';
-import {getProjectReflection} from '../../src/common';
-import {AggregationSchema, ESNestedAggregation} from '../../src/mappings/aggregation-definitions';
+import {getProjectReflection} from '../../src/project-reflection';
+import {AggregationSchema, ESNestedAggregation} from '../../src/types/aggregation';
+import {ElasticsearchTemplateCollection} from '../../src/types/mapping';
 import {MapAggTestOptions, MinimalMappingDescription} from './MapAggTestOptions';
-import {ElasticsearchTemplateCollection} from '../../src/mappings/mapping-definitions';
-import {settings} from '../../src/mappings/definitions/settings';
-import {ElasticsearchDataType} from '../../src/mappings/definitions/typemap';
+import {settings} from '../../src/config/settings';
 
 export class MapAggTest {
   mapping_model_path!: string;
diff --git a/test/mapping-model/MapAggTestOptions.ts b/test/mapping-model/MapAggTestOptions.ts
index 4b3ab13f..1150260f 100644
--- a/test/mapping-model/MapAggTestOptions.ts
+++ b/test/mapping-model/MapAggTestOptions.ts
@@ -12,10 +12,8 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import {
-  ElasticsearchDynamicTemplate,
-  ElasticsearchValue
-} from '../../src/mappings/mapping-definitions';
+
+import {ElasticsearchDynamicTemplate, ElasticsearchValue} from '../../src/types/mapping';
 
 export interface MapAggTestOptions {
   name: string;
diff --git a/test/mapping-model/mappings/src/default-generics.ts b/test/mapping-model/mappings/src/default-generics.ts
index cc84ba4d..88b20b7e 100644
--- a/test/mapping-model/mappings/src/default-generics.ts
+++ b/test/mapping-model/mappings/src/default-generics.ts
@@ -13,9 +13,9 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/double-type-conflict.ts b/test/mapping-model/mappings/src/double-type-conflict.ts
index cbcdc71e..034bbeaf 100644
--- a/test/mapping-model/mappings/src/double-type-conflict.ts
+++ b/test/mapping-model/mappings/src/double-type-conflict.ts
@@ -13,9 +13,9 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/enum.ts b/test/mapping-model/mappings/src/enum.ts
index dde5dfa8..62b233c3 100644
--- a/test/mapping-model/mappings/src/enum.ts
+++ b/test/mapping-model/mappings/src/enum.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/filterable-tag.ts b/test/mapping-model/mappings/src/filterable-tag.ts
index 9d3e1cb5..7ddcb345 100644
--- a/test/mapping-model/mappings/src/filterable-tag.ts
+++ b/test/mapping-model/mappings/src/filterable-tag.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 export type FilterableEnumType = 'a' | 'b' | 'c';
 
diff --git a/test/mapping-model/mappings/src/generics.ts b/test/mapping-model/mappings/src/generics.ts
index 7c41cf1c..f0be68dd 100644
--- a/test/mapping-model/mappings/src/generics.ts
+++ b/test/mapping-model/mappings/src/generics.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/impossible-union.ts b/test/mapping-model/mappings/src/impossible-union.ts
index 4312207c..8bb9ee13 100644
--- a/test/mapping-model/mappings/src/impossible-union.ts
+++ b/test/mapping-model/mappings/src/impossible-union.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/incompatible-type.ts b/test/mapping-model/mappings/src/incompatible-type.ts
index 0e57ed5c..34eb2ecb 100644
--- a/test/mapping-model/mappings/src/incompatible-type.ts
+++ b/test/mapping-model/mappings/src/incompatible-type.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/index-signature.ts b/test/mapping-model/mappings/src/index-signature.ts
index a733441e..ea9afeeb 100644
--- a/test/mapping-model/mappings/src/index-signature.ts
+++ b/test/mapping-model/mappings/src/index-signature.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/inherit-tags.ts b/test/mapping-model/mappings/src/inherit-tags.ts
index 16919dc1..8d4bdb20 100644
--- a/test/mapping-model/mappings/src/inherit-tags.ts
+++ b/test/mapping-model/mappings/src/inherit-tags.ts
@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
 import {ThingType} from './types';
 
diff --git a/test/mapping-model/mappings/src/inherited-property.ts b/test/mapping-model/mappings/src/inherited-property.ts
index a795fbb6..4f0ffb83 100644
--- a/test/mapping-model/mappings/src/inherited-property.ts
+++ b/test/mapping-model/mappings/src/inherited-property.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/invalid-tag.ts b/test/mapping-model/mappings/src/invalid-tag.ts
index c7a96909..40c7fda0 100644
--- a/test/mapping-model/mappings/src/invalid-tag.ts
+++ b/test/mapping-model/mappings/src/invalid-tag.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/map-explicit-types.ts b/test/mapping-model/mappings/src/map-explicit-types.ts
index 92a1468c..62336a1e 100644
--- a/test/mapping-model/mappings/src/map-explicit-types.ts
+++ b/test/mapping-model/mappings/src/map-explicit-types.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/missing-premap.ts b/test/mapping-model/mappings/src/missing-premap.ts
index 3a06332c..7414b824 100644
--- a/test/mapping-model/mappings/src/missing-premap.ts
+++ b/test/mapping-model/mappings/src/missing-premap.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/nested.ts b/test/mapping-model/mappings/src/nested.ts
index f14afc31..6ea3d260 100644
--- a/test/mapping-model/mappings/src/nested.ts
+++ b/test/mapping-model/mappings/src/nested.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/object-union.ts b/test/mapping-model/mappings/src/object-union.ts
index b9703c34..176046d0 100644
--- a/test/mapping-model/mappings/src/object-union.ts
+++ b/test/mapping-model/mappings/src/object-union.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/paired-tags.ts b/test/mapping-model/mappings/src/paired-tags.ts
index 1f857ad1..8945bf9f 100644
--- a/test/mapping-model/mappings/src/paired-tags.ts
+++ b/test/mapping-model/mappings/src/paired-tags.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/sensible-defaults.ts b/test/mapping-model/mappings/src/sensible-defaults.ts
index deca22f1..547a4422 100644
--- a/test/mapping-model/mappings/src/sensible-defaults.ts
+++ b/test/mapping-model/mappings/src/sensible-defaults.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/sortable-tag.ts b/test/mapping-model/mappings/src/sortable-tag.ts
index e6458020..6d55eeeb 100644
--- a/test/mapping-model/mappings/src/sortable-tag.ts
+++ b/test/mapping-model/mappings/src/sortable-tag.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/tags-ignore-case.ts b/test/mapping-model/mappings/src/tags-ignore-case.ts
index e53590c5..5ee18da3 100644
--- a/test/mapping-model/mappings/src/tags-ignore-case.ts
+++ b/test/mapping-model/mappings/src/tags-ignore-case.ts
@@ -14,7 +14,7 @@
  */
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/type-alias.ts b/test/mapping-model/mappings/src/type-alias.ts
index c19d5ce7..aaa6a9d7 100644
--- a/test/mapping-model/mappings/src/type-alias.ts
+++ b/test/mapping-model/mappings/src/type-alias.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/type-overrides.ts b/test/mapping-model/mappings/src/type-overrides.ts
index 945faab3..a400cf1c 100644
--- a/test/mapping-model/mappings/src/type-overrides.ts
+++ b/test/mapping-model/mappings/src/type-overrides.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 export interface SCISO8601DateRange {
   bar: string;
diff --git a/test/mapping-model/mappings/src/type-query.ts b/test/mapping-model/mappings/src/type-query.ts
index f3d77621..abe76e91 100644
--- a/test/mapping-model/mappings/src/type-query.ts
+++ b/test/mapping-model/mappings/src/type-query.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable
diff --git a/test/mapping-model/mappings/src/type-wrapper-inheritance.ts b/test/mapping-model/mappings/src/type-wrapper-inheritance.ts
index d2146dcf..7e650443 100644
--- a/test/mapping-model/mappings/src/type-wrapper-inheritance.ts
+++ b/test/mapping-model/mappings/src/type-wrapper-inheritance.ts
@@ -15,7 +15,7 @@
 
 import {ThingType} from './types';
 import {MapAggTestOptions} from '../../MapAggTestOptions';
-import {ElasticsearchDataType} from '../../../../src/mappings/definitions/typemap';
+import {ElasticsearchDataType} from '../../../../src/config/typemap';
 
 /**
  * @indexable