Move dc code into core package

Fixes #558
ConnectedPlacesCatapult · May 14, 2018 · 01f2ffa · 01f2ffa
1 parent cab7955
commit 01f2ffa
Show file tree

Hide file tree

Showing 472 changed files with 134,511 additions and 8 deletions.
diff --git a/Dockerfile → core/Dockerfile b/Dockerfile → core/Dockerfile
diff --git a/apikeys.properties.example → core/apikeys.properties.example b/apikeys.properties.example → core/apikeys.properties.example
diff --git a/build.gradle → core/build.gradle b/build.gradle → core/build.gradle
diff --git a/core/documentation/Dockerfile b/core/documentation/Dockerfile
@@ -0,0 +1,3 @@
+FROM java
+MAINTAINER Lorena Qendro <lqendro@futurecities.catapult.org.uk>
+RUN apt-get update && apt-get -y install gradle postgresql-client
diff --git a/documentation/README.md → core/documentation/README.md b/documentation/README.md → core/documentation/README.md
diff --git a/core/documentation/apikeys.properties.example b/core/documentation/apikeys.properties.example
@@ -0,0 +1,12 @@
+! ONS API Authentication
+! https://web.ons.gov.uk/ons/apiservice/web/apiservice/home
+apiKeyOns=<INSERT-YOUR-API-KEY-HERE>
+
+! TfL API Authentication
+! https://api.tfl.gov.uk/
+apiIdTfl=<INSERT-YOUR-API-ID-HERE>
+apiKeyTfl=<INSERT-YOUR-API-KEY-HERE>
+
+! Space Syntax OpenSpaceNework Authentication
+openSpaceNetworkUsername=<INSERT-YOUR-OSN-POSTGIS-USERNAME-HERE>
+openSpaceNetworkPassword=<INSERT-YOUR-OSN-POSTGIS-PASSWORD-HERE>
diff --git a/documentation/build.gradle → core/documentation/build.gradle b/documentation/build.gradle → core/documentation/build.gradle
diff --git a/documentation/continuous-integration.md → core/documentation/continuous-integration.md b/documentation/continuous-integration.md → core/documentation/continuous-integration.md
diff --git a/documentation/css/pdf.css → core/documentation/css/pdf.css b/documentation/css/pdf.css → core/documentation/css/pdf.css
diff --git a/documentation/exporters.md → core/documentation/exporters.md b/documentation/exporters.md → core/documentation/exporters.md
diff --git a/documentation/features.md → core/documentation/features.md b/documentation/features.md → core/documentation/features.md
diff --git a/documentation/fields-and-models.md → core/documentation/fields-and-models.md b/documentation/fields-and-models.md → core/documentation/fields-and-models.md
diff --git a/documentation/frequently-asked-questions.md → ...cumentation/frequently-asked-questions.md b/documentation/frequently-asked-questions.md → ...cumentation/frequently-asked-questions.md
diff --git a/documentation/glossary.md → core/documentation/glossary.md b/documentation/glossary.md → core/documentation/glossary.md
diff --git a/...entation/howto-importer-implementation.md → ...entation/howto-importer-implementation.md b/...entation/howto-importer-implementation.md → ...entation/howto-importer-implementation.md
diff --git a/documentation/importers.md → core/documentation/importers.md b/documentation/importers.md → core/documentation/importers.md
diff --git a/documentation/local-datastore.md → core/documentation/local-datastore.md b/documentation/local-datastore.md → core/documentation/local-datastore.md
diff --git a/documentation/macOS-installation-guide.md → ...documentation/macOS-installation-guide.md b/documentation/macOS-installation-guide.md → ...documentation/macOS-installation-guide.md
diff --git a/documentation/open-with-qgis.md → core/documentation/open-with-qgis.md b/documentation/open-with-qgis.md → core/documentation/open-with-qgis.md
diff --git a/documentation/recipe-language.md → core/documentation/recipe-language.md b/documentation/recipe-language.md → core/documentation/recipe-language.md
diff --git a/documentation/system-architecture.md → core/documentation/system-architecture.md b/documentation/system-architecture.md → core/documentation/system-architecture.md
diff --git a/...mentation/tutorial-cycling-air-quality.md → ...mentation/tutorial-cycling-air-quality.md b/...mentation/tutorial-cycling-air-quality.md → ...mentation/tutorial-cycling-air-quality.md
diff --git a/documentation/ubuntu-installation-guide.md → ...ocumentation/ubuntu-installation-guide.md b/documentation/ubuntu-installation-guide.md → ...ocumentation/ubuntu-installation-guide.md
diff --git a/...ion/use-case-on-active-transport-index.md → ...ion/use-case-on-active-transport-index.md b/...ion/use-case-on-active-transport-index.md → ...ion/use-case-on-active-transport-index.md
diff --git a/...on/use-case-on-cycling-and-air-quality.md → ...on/use-case-on-cycling-and-air-quality.md b/...on/use-case-on-cycling-and-air-quality.md → ...on/use-case-on-cycling-and-air-quality.md
diff --git a/documentation/using-the-digital-connector.md → ...umentation/using-the-digital-connector.md b/documentation/using-the-digital-connector.md → ...umentation/using-the-digital-connector.md
diff --git a/documentation/windows-installation-guide.md → ...cumentation/windows-installation-guide.md b/documentation/windows-installation-guide.md → ...cumentation/windows-installation-guide.md
diff --git a/gradle.properties.example → core/gradle.properties.example b/gradle.properties.example → core/gradle.properties.example
diff --git a/setup/create_db.sh → core/setup/create_db.sh b/setup/create_db.sh → core/setup/create_db.sh
diff --git a/setup/setup_osx.sh → core/setup/setup_osx.sh b/setup/setup_osx.sh → core/setup/setup_osx.sh
diff --git a/...n/java/uk/org/tombolo/AbstractRunner.java → ...n/java/uk/org/tombolo/AbstractRunner.java b/...n/java/uk/org/tombolo/AbstractRunner.java → ...n/java/uk/org/tombolo/AbstractRunner.java
diff --git a/...uk/org/tombolo/CatalogueExportRunner.java → ...uk/org/tombolo/CatalogueExportRunner.java b/...uk/org/tombolo/CatalogueExportRunner.java → ...uk/org/tombolo/CatalogueExportRunner.java
diff --git a/...java/uk/org/tombolo/DataExportRunner.java → ...java/uk/org/tombolo/DataExportRunner.java b/...java/uk/org/tombolo/DataExportRunner.java → ...java/uk/org/tombolo/DataExportRunner.java
diff --git a/...va/uk/org/tombolo/ImporterInfoRunner.java → ...va/uk/org/tombolo/ImporterInfoRunner.java b/...va/uk/org/tombolo/ImporterInfoRunner.java → ...va/uk/org/tombolo/ImporterInfoRunner.java
diff --git a/src/main/java/uk/org/tombolo/Py4jServer.java → .../main/java/uk/org/tombolo/Py4jServer.java b/src/main/java/uk/org/tombolo/Py4jServer.java → .../main/java/uk/org/tombolo/Py4jServer.java
diff --git a/...a/uk/org/tombolo/Py4jServerInterface.java → ...a/uk/org/tombolo/Py4jServerInterface.java b/...a/uk/org/tombolo/Py4jServerInterface.java → ...a/uk/org/tombolo/Py4jServerInterface.java
diff --git a/...n/java/uk/org/tombolo/core/Attribute.java → ...n/java/uk/org/tombolo/core/Attribute.java b/...n/java/uk/org/tombolo/core/Attribute.java → ...n/java/uk/org/tombolo/core/Attribute.java
diff --git a/...rg/tombolo/core/DatabaseJournalEntry.java → ...rg/tombolo/core/DatabaseJournalEntry.java b/...rg/tombolo/core/DatabaseJournalEntry.java → ...rg/tombolo/core/DatabaseJournalEntry.java
diff --git a/.../java/uk/org/tombolo/core/Datasource.java → .../java/uk/org/tombolo/core/Datasource.java b/.../java/uk/org/tombolo/core/Datasource.java → .../java/uk/org/tombolo/core/Datasource.java
diff --git a/...a/uk/org/tombolo/core/DatasourceSpec.java → ...a/uk/org/tombolo/core/DatasourceSpec.java b/...a/uk/org/tombolo/core/DatasourceSpec.java → ...a/uk/org/tombolo/core/DatasourceSpec.java
diff --git a/.../java/uk/org/tombolo/core/FixedValue.java → .../java/uk/org/tombolo/core/FixedValue.java b/.../java/uk/org/tombolo/core/FixedValue.java → .../java/uk/org/tombolo/core/FixedValue.java
diff --git a/...ava/uk/org/tombolo/core/FixedValueId.java → ...ava/uk/org/tombolo/core/FixedValueId.java b/...ava/uk/org/tombolo/core/FixedValueId.java → ...ava/uk/org/tombolo/core/FixedValueId.java
diff --git a/...in/java/uk/org/tombolo/core/Provider.java → ...in/java/uk/org/tombolo/core/Provider.java b/...in/java/uk/org/tombolo/core/Provider.java → ...in/java/uk/org/tombolo/core/Provider.java
diff --git a/...ain/java/uk/org/tombolo/core/Subject.java → ...ain/java/uk/org/tombolo/core/Subject.java b/...ain/java/uk/org/tombolo/core/Subject.java → ...ain/java/uk/org/tombolo/core/Subject.java
diff --git a/...java/uk/org/tombolo/core/SubjectType.java → ...java/uk/org/tombolo/core/SubjectType.java b/...java/uk/org/tombolo/core/SubjectType.java → ...java/uk/org/tombolo/core/SubjectType.java
diff --git a/.../java/uk/org/tombolo/core/TimedValue.java → .../java/uk/org/tombolo/core/TimedValue.java b/.../java/uk/org/tombolo/core/TimedValue.java → .../java/uk/org/tombolo/core/TimedValue.java
diff --git a/...ava/uk/org/tombolo/core/TimedValueId.java → ...ava/uk/org/tombolo/core/TimedValueId.java b/...ava/uk/org/tombolo/core/TimedValueId.java → ...ava/uk/org/tombolo/core/TimedValueId.java
diff --git a/...rg/tombolo/core/utils/AttributeUtils.java → ...rg/tombolo/core/utils/AttributeUtils.java b/...rg/tombolo/core/utils/AttributeUtils.java → ...rg/tombolo/core/utils/AttributeUtils.java
diff --git a/...g/tombolo/core/utils/DatabaseJournal.java → ...g/tombolo/core/utils/DatabaseJournal.java b/...g/tombolo/core/utils/DatabaseJournal.java → ...g/tombolo/core/utils/DatabaseJournal.java
diff --git a/...org/tombolo/core/utils/DatabaseUtils.java → ...org/tombolo/core/utils/DatabaseUtils.java b/...org/tombolo/core/utils/DatabaseUtils.java → ...org/tombolo/core/utils/DatabaseUtils.java
diff --git a/...g/tombolo/core/utils/FixedValueUtils.java → ...g/tombolo/core/utils/FixedValueUtils.java b/...g/tombolo/core/utils/FixedValueUtils.java → ...g/tombolo/core/utils/FixedValueUtils.java
diff --git a/...org/tombolo/core/utils/HibernateUtil.java → ...org/tombolo/core/utils/HibernateUtil.java b/...org/tombolo/core/utils/HibernateUtil.java → ...org/tombolo/core/utils/HibernateUtil.java
diff --git a/...org/tombolo/core/utils/ProviderUtils.java → ...org/tombolo/core/utils/ProviderUtils.java b/...org/tombolo/core/utils/ProviderUtils.java → ...org/tombolo/core/utils/ProviderUtils.java
diff --git a/.../tombolo/core/utils/SubjectTypeUtils.java → .../tombolo/core/utils/SubjectTypeUtils.java b/.../tombolo/core/utils/SubjectTypeUtils.java → .../tombolo/core/utils/SubjectTypeUtils.java
diff --git a/.../org/tombolo/core/utils/SubjectUtils.java → .../org/tombolo/core/utils/SubjectUtils.java b/.../org/tombolo/core/utils/SubjectUtils.java → .../org/tombolo/core/utils/SubjectUtils.java
diff --git a/...g/tombolo/core/utils/TimedValueUtils.java → ...g/tombolo/core/utils/TimedValueUtils.java b/...g/tombolo/core/utils/TimedValueUtils.java → ...g/tombolo/core/utils/TimedValueUtils.java
diff --git a/.../execution/CorrelationAnalysisEngine.java → .../execution/CorrelationAnalysisEngine.java b/.../execution/CorrelationAnalysisEngine.java → .../execution/CorrelationAnalysisEngine.java
diff --git a/...g/tombolo/execution/DataExportEngine.java → ...g/tombolo/execution/DataExportEngine.java b/...g/tombolo/execution/DataExportEngine.java → ...g/tombolo/execution/DataExportEngine.java
diff --git a/...rg/tombolo/execution/ExecutionEngine.java → ...rg/tombolo/execution/ExecutionEngine.java b/...rg/tombolo/execution/ExecutionEngine.java → ...rg/tombolo/execution/ExecutionEngine.java
diff --git a/.../uk/org/tombolo/execution/FieldCache.java → .../uk/org/tombolo/execution/FieldCache.java b/.../uk/org/tombolo/execution/FieldCache.java → .../uk/org/tombolo/execution/FieldCache.java
diff --git a/.../uk/org/tombolo/exporter/CSVExporter.java → .../uk/org/tombolo/exporter/CSVExporter.java b/.../uk/org/tombolo/exporter/CSVExporter.java → .../uk/org/tombolo/exporter/CSVExporter.java
diff --git a/...ava/uk/org/tombolo/exporter/Exporter.java → ...ava/uk/org/tombolo/exporter/Exporter.java b/...ava/uk/org/tombolo/exporter/Exporter.java → ...ava/uk/org/tombolo/exporter/Exporter.java
diff --git a/...org/tombolo/exporter/GeoJsonExporter.java → ...org/tombolo/exporter/GeoJsonExporter.java b/...org/tombolo/exporter/GeoJsonExporter.java → ...org/tombolo/exporter/GeoJsonExporter.java
diff --git a/...a/uk/org/tombolo/field/AbstractField.java → ...a/uk/org/tombolo/field/AbstractField.java b/...a/uk/org/tombolo/field/AbstractField.java → ...a/uk/org/tombolo/field/AbstractField.java
diff --git a/...main/java/uk/org/tombolo/field/Field.java → ...main/java/uk/org/tombolo/field/Field.java b/...main/java/uk/org/tombolo/field/Field.java → ...main/java/uk/org/tombolo/field/Field.java
diff --git a/...olo/field/IncomputableFieldException.java → ...olo/field/IncomputableFieldException.java b/...olo/field/IncomputableFieldException.java → ...olo/field/IncomputableFieldException.java
diff --git a/...ava/uk/org/tombolo/field/ParentField.java → ...ava/uk/org/tombolo/field/ParentField.java b/...ava/uk/org/tombolo/field/ParentField.java → ...ava/uk/org/tombolo/field/ParentField.java
diff --git a/...k/org/tombolo/field/SingleValueField.java → ...k/org/tombolo/field/SingleValueField.java b/...k/org/tombolo/field/SingleValueField.java → ...k/org/tombolo/field/SingleValueField.java
diff --git a/...va/uk/org/tombolo/field/WrapperField.java → ...va/uk/org/tombolo/field/WrapperField.java b/...va/uk/org/tombolo/field/WrapperField.java → ...va/uk/org/tombolo/field/WrapperField.java
diff --git a/...mbolo/field/aggregation/BackOffField.java → ...mbolo/field/aggregation/BackOffField.java b/...mbolo/field/aggregation/BackOffField.java → ...mbolo/field/aggregation/BackOffField.java
diff --git a/...gregation/GeographicAggregationField.java → ...gregation/GeographicAggregationField.java b/...gregation/GeographicAggregationField.java → ...gregation/GeographicAggregationField.java
diff --git a/...regation/MapToContainingSubjectField.java → ...regation/MapToContainingSubjectField.java b/...regation/MapToContainingSubjectField.java → ...regation/MapToContainingSubjectField.java
diff --git a/...aggregation/MapToNearestSubjectField.java → ...aggregation/MapToNearestSubjectField.java b/...aggregation/MapToNearestSubjectField.java → ...aggregation/MapToNearestSubjectField.java
diff --git a/...ield/assertion/AttributeMatcherField.java → ...ield/assertion/AttributeMatcherField.java b/...ield/assertion/AttributeMatcherField.java → ...ield/assertion/AttributeMatcherField.java
diff --git a/...tion/OSMBuiltInAttributeMatcherField.java → ...tion/OSMBuiltInAttributeMatcherField.java b/...tion/OSMBuiltInAttributeMatcherField.java → ...tion/OSMBuiltInAttributeMatcherField.java
diff --git a/.../field/modelling/BasicModellingField.java → .../field/modelling/BasicModellingField.java b/.../field/modelling/BasicModellingField.java → .../field/modelling/BasicModellingField.java
diff --git a/...mbolo/field/modelling/ModellingField.java → ...mbolo/field/modelling/ModellingField.java b/...mbolo/field/modelling/ModellingField.java → ...mbolo/field/modelling/ModellingField.java
diff --git a/.../modelling/SingleValueModellingField.java → .../modelling/SingleValueModellingField.java b/.../modelling/SingleValueModellingField.java → .../modelling/SingleValueModellingField.java
diff --git a/...mbolo/field/transformation/AreaField.java → ...mbolo/field/transformation/AreaField.java b/...mbolo/field/transformation/AreaField.java → ...mbolo/field/transformation/AreaField.java
diff --git a/...field/transformation/ArithmeticField.java → ...field/transformation/ArithmeticField.java b/...field/transformation/ArithmeticField.java → ...field/transformation/ArithmeticField.java
diff --git a/...formation/DescriptiveStatisticsField.java → ...formation/DescriptiveStatisticsField.java b/...formation/DescriptiveStatisticsField.java → ...formation/DescriptiveStatisticsField.java
diff --git a/...ld/transformation/FieldValueSumField.java → ...ld/transformation/FieldValueSumField.java b/...ld/transformation/FieldValueSumField.java → ...ld/transformation/FieldValueSumField.java
diff --git a/.../transformation/FractionOfTotalField.java → .../transformation/FractionOfTotalField.java b/.../transformation/FractionOfTotalField.java → .../transformation/FractionOfTotalField.java
diff --git a/...ransformation/LinearCombinationField.java → ...ransformation/LinearCombinationField.java b/...ransformation/LinearCombinationField.java → ...ransformation/LinearCombinationField.java
diff --git a/...d/transformation/ListArithmeticField.java → ...d/transformation/ListArithmeticField.java b/...d/transformation/ListArithmeticField.java → ...d/transformation/ListArithmeticField.java
diff --git a/...ield/transformation/PercentilesField.java → ...ield/transformation/PercentilesField.java b/...ield/transformation/PercentilesField.java → ...ield/transformation/PercentilesField.java
diff --git a/.../tombolo/field/value/BasicValueField.java → .../tombolo/field/value/BasicValueField.java b/.../tombolo/field/value/BasicValueField.java → .../tombolo/field/value/BasicValueField.java
diff --git a/...rg/tombolo/field/value/ConstantField.java → ...rg/tombolo/field/value/ConstantField.java b/...rg/tombolo/field/value/ConstantField.java → ...rg/tombolo/field/value/ConstantField.java
diff --git a/.../tombolo/field/value/FixedValueField.java → .../tombolo/field/value/FixedValueField.java b/.../tombolo/field/value/FixedValueField.java → .../tombolo/field/value/FixedValueField.java
diff --git a/...tombolo/field/value/LatestValueField.java → ...tombolo/field/value/LatestValueField.java b/...tombolo/field/value/LatestValueField.java → ...tombolo/field/value/LatestValueField.java
diff --git a/...olo/field/value/SubjectLatitudeField.java → ...olo/field/value/SubjectLatitudeField.java b/...olo/field/value/SubjectLatitudeField.java → ...olo/field/value/SubjectLatitudeField.java
diff --git a/...lo/field/value/SubjectLongitudeField.java → ...lo/field/value/SubjectLongitudeField.java b/...lo/field/value/SubjectLongitudeField.java → ...lo/field/value/SubjectLongitudeField.java
diff --git a/...tombolo/field/value/SubjectNameField.java → ...tombolo/field/value/SubjectNameField.java b/...tombolo/field/value/SubjectNameField.java → ...tombolo/field/value/SubjectNameField.java
diff --git a/.../tombolo/field/value/TimeseriesField.java → .../tombolo/field/value/TimeseriesField.java b/.../tombolo/field/value/TimeseriesField.java → .../tombolo/field/value/TimeseriesField.java
diff --git a/...field/value/TimeseriesMeanValueField.java → ...field/value/TimeseriesMeanValueField.java b/...field/value/TimeseriesMeanValueField.java → ...field/value/TimeseriesMeanValueField.java
diff --git a/...er/AbstractGeotoolsDataStoreImporter.java → ...er/AbstractGeotoolsDataStoreImporter.java b/...er/AbstractGeotoolsDataStoreImporter.java → ...er/AbstractGeotoolsDataStoreImporter.java
diff --git a/...rg/tombolo/importer/AbstractImporter.java → ...rg/tombolo/importer/AbstractImporter.java b/...rg/tombolo/importer/AbstractImporter.java → ...rg/tombolo/importer/AbstractImporter.java
diff --git a/.../tombolo/importer/AbstractOaImporter.java → .../tombolo/importer/AbstractOaImporter.java b/.../tombolo/importer/AbstractOaImporter.java → .../tombolo/importer/AbstractOaImporter.java
diff --git a/.../java/uk/org/tombolo/importer/Config.java → .../java/uk/org/tombolo/importer/Config.java b/.../java/uk/org/tombolo/importer/Config.java → .../java/uk/org/tombolo/importer/Config.java
diff --git a/...bolo/importer/ConfigurationException.java → ...bolo/importer/ConfigurationException.java b/...bolo/importer/ConfigurationException.java → ...bolo/importer/ConfigurationException.java
diff --git a/...k/org/tombolo/importer/DownloadUtils.java → ...k/org/tombolo/importer/DownloadUtils.java b/...k/org/tombolo/importer/DownloadUtils.java → ...k/org/tombolo/importer/DownloadUtils.java
diff --git a/...org/tombolo/importer/GeneralImporter.java → ...org/tombolo/importer/GeneralImporter.java b/...org/tombolo/importer/GeneralImporter.java → ...org/tombolo/importer/GeneralImporter.java
diff --git a/...ava/uk/org/tombolo/importer/Importer.java → ...ava/uk/org/tombolo/importer/Importer.java b/...ava/uk/org/tombolo/importer/Importer.java → ...ava/uk/org/tombolo/importer/Importer.java
diff --git a/...org/tombolo/importer/ImporterMatcher.java → ...org/tombolo/importer/ImporterMatcher.java b/...org/tombolo/importer/ImporterMatcher.java → ...org/tombolo/importer/ImporterMatcher.java
diff --git a/...rg/tombolo/importer/ParsingException.java → ...rg/tombolo/importer/ParsingException.java b/...rg/tombolo/importer/ParsingException.java → ...rg/tombolo/importer/ParsingException.java
diff --git a/.../org/tombolo/importer/PythonImporter.java → .../org/tombolo/importer/PythonImporter.java b/.../org/tombolo/importer/PythonImporter.java → .../org/tombolo/importer/PythonImporter.java
diff --git a/...ava/uk/org/tombolo/importer/ZipUtils.java → ...ava/uk/org/tombolo/importer/ZipUtils.java b/...ava/uk/org/tombolo/importer/ZipUtils.java → ...ava/uk/org/tombolo/importer/ZipUtils.java
diff --git a/...o/importer/dclg/AbstractDCLGImporter.java → ...o/importer/dclg/AbstractDCLGImporter.java b/...o/importer/dclg/AbstractDCLGImporter.java → ...o/importer/dclg/AbstractDCLGImporter.java
diff --git a/...rg/tombolo/importer/dclg/IMDImporter.java → ...rg/tombolo/importer/dclg/IMDImporter.java b/...rg/tombolo/importer/dclg/IMDImporter.java → ...rg/tombolo/importer/dclg/IMDImporter.java
diff --git a/...olo/importer/dfe/AbstractDfEImporter.java → ...olo/importer/dfe/AbstractDfEImporter.java b/...olo/importer/dfe/AbstractDfEImporter.java → ...olo/importer/dfe/AbstractDfEImporter.java
diff --git a/...tombolo/importer/dfe/SchoolsImporter.java → ...tombolo/importer/dfe/SchoolsImporter.java b/...tombolo/importer/dfe/SchoolsImporter.java → ...tombolo/importer/dfe/SchoolsImporter.java
diff --git a/...olo/importer/dft/AbstractDFTImporter.java → ...olo/importer/dft/AbstractDFTImporter.java b/...olo/importer/dft/AbstractDFTImporter.java → ...olo/importer/dft/AbstractDFTImporter.java
diff --git a/...o/importer/dft/AccessibilityImporter.java → ...o/importer/dft/AccessibilityImporter.java b/...o/importer/dft/AccessibilityImporter.java → ...o/importer/dft/AccessibilityImporter.java
diff --git a/...orter/dft/ActivePeopleSurveyImporter.java → ...orter/dft/ActivePeopleSurveyImporter.java b/...orter/dft/ActivePeopleSurveyImporter.java → ...orter/dft/ActivePeopleSurveyImporter.java
diff --git a/...lo/importer/dft/TrafficCountImporter.java → ...lo/importer/dft/TrafficCountImporter.java b/...lo/importer/dft/TrafficCountImporter.java → ...lo/importer/dft/TrafficCountImporter.java
diff --git a/...porter/generalcsv/GeneralCSVImporter.java → ...porter/generalcsv/GeneralCSVImporter.java b/...porter/generalcsv/GeneralCSVImporter.java → ...porter/generalcsv/GeneralCSVImporter.java
diff --git a/...rg/tombolo/importer/lac/LAQNImporter.java → ...rg/tombolo/importer/lac/LAQNImporter.java b/...rg/tombolo/importer/lac/LAQNImporter.java → ...rg/tombolo/importer/lac/LAQNImporter.java
diff --git a/...tore/AbstractLondonDatastoreImporter.java → ...tore/AbstractLondonDatastoreImporter.java b/...tore/AbstractLondonDatastoreImporter.java → ...tore/AbstractLondonDatastoreImporter.java
diff --git a/...londondatastore/AdultObesityImporter.java → ...londondatastore/AdultObesityImporter.java b/...londondatastore/AdultObesityImporter.java → ...londondatastore/AdultObesityImporter.java
diff --git a/...tastore/LondonBoroughProfileImporter.java → ...tastore/LondonBoroughProfileImporter.java b/...tastore/LondonBoroughProfileImporter.java → ...tastore/LondonBoroughProfileImporter.java
diff --git a/...ondatastore/LondonLonelinessImporter.java → ...ondatastore/LondonLonelinessImporter.java b/...ondatastore/LondonLonelinessImporter.java → ...ondatastore/LondonLonelinessImporter.java
diff --git a/...r/londondatastore/LondonPHOFImporter.java → ...r/londondatastore/LondonPHOFImporter.java b/...r/londondatastore/LondonPHOFImporter.java → ...r/londondatastore/LondonPHOFImporter.java
diff --git a/...astore/WalkingCyclingBoroughImporter.java → ...astore/WalkingCyclingBoroughImporter.java b/...astore/WalkingCyclingBoroughImporter.java → ...astore/WalkingCyclingBoroughImporter.java
diff --git a/...hschoices/HealthOrganisationImporter.java → ...hschoices/HealthOrganisationImporter.java b/...hschoices/HealthOrganisationImporter.java → ...hschoices/HealthOrganisationImporter.java
diff --git a/...ter/nhschoices/NHSAdmissionsImporter.java → ...ter/nhschoices/NHSAdmissionsImporter.java b/...ter/nhschoices/NHSAdmissionsImporter.java → ...ter/nhschoices/NHSAdmissionsImporter.java
diff --git a/...olo/importer/ons/AbstractONSImporter.java → ...olo/importer/ons/AbstractONSImporter.java b/...olo/importer/ons/AbstractONSImporter.java → ...olo/importer/ons/AbstractONSImporter.java
diff --git a/.../tombolo/importer/ons/CensusImporter.java → .../tombolo/importer/ons/CensusImporter.java b/.../tombolo/importer/ons/CensusImporter.java → .../tombolo/importer/ons/CensusImporter.java
diff --git a/...ter/ons/ONSAverageAttainmentImporter.java → ...ter/ons/ONSAverageAttainmentImporter.java b/...ter/ons/ONSAverageAttainmentImporter.java → ...ter/ons/ONSAverageAttainmentImporter.java
diff --git a/...er/ons/ONSBusinessDemographyImporter.java → ...er/ons/ONSBusinessDemographyImporter.java b/...er/ons/ONSBusinessDemographyImporter.java → ...er/ons/ONSBusinessDemographyImporter.java
diff --git a/...o/importer/ons/ONSEmploymentImporter.java → ...o/importer/ons/ONSEmploymentImporter.java b/...o/importer/ons/ONSEmploymentImporter.java → ...o/importer/ons/ONSEmploymentImporter.java
diff --git a/...porter/ons/ONSLifeExpectancyImporter.java → ...porter/ons/ONSLifeExpectancyImporter.java b/...porter/ons/ONSLifeExpectancyImporter.java → ...porter/ons/ONSLifeExpectancyImporter.java
diff --git a/...ombolo/importer/ons/ONSWagesImporter.java → ...ombolo/importer/ons/ONSWagesImporter.java b/...ombolo/importer/ons/ONSWagesImporter.java → ...ombolo/importer/ons/ONSWagesImporter.java
diff --git a/...lo/importer/ons/ONSWellbeingImporter.java → ...lo/importer/ons/ONSWellbeingImporter.java b/...lo/importer/ons/ONSWellbeingImporter.java → ...lo/importer/ons/ONSWellbeingImporter.java
diff --git a/.../org/tombolo/importer/ons/OaImporter.java → .../org/tombolo/importer/ons/OaImporter.java b/.../org/tombolo/importer/ons/OaImporter.java → .../org/tombolo/importer/ons/OaImporter.java
diff --git a/...olo/importer/osm/OSMBuiltInImporters.java → ...olo/importer/osm/OSMBuiltInImporters.java b/...olo/importer/osm/OSMBuiltInImporters.java → ...olo/importer/osm/OSMBuiltInImporters.java
diff --git a/...ombolo/importer/osm/OSMEntityHandler.java → ...ombolo/importer/osm/OSMEntityHandler.java b/...ombolo/importer/osm/OSMEntityHandler.java → ...ombolo/importer/osm/OSMEntityHandler.java
diff --git a/...org/tombolo/importer/osm/OSMImporter.java → ...org/tombolo/importer/osm/OSMImporter.java b/...org/tombolo/importer/osm/OSMImporter.java → ...org/tombolo/importer/osm/OSMImporter.java
diff --git a/...olo/importer/phe/AbstractPheImporter.java → ...olo/importer/phe/AbstractPheImporter.java b/...olo/importer/phe/AbstractPheImporter.java → ...olo/importer/phe/AbstractPheImporter.java
diff --git a/...mporter/phe/ChildhoodObesityImporter.java → ...mporter/phe/ChildhoodObesityImporter.java b/...mporter/phe/ChildhoodObesityImporter.java → ...mporter/phe/ChildhoodObesityImporter.java
diff --git a/...o/importer/phe/SportsEnglandImporter.java → ...o/importer/phe/SportsEnglandImporter.java b/...o/importer/phe/SportsEnglandImporter.java → ...o/importer/phe/SportsEnglandImporter.java
diff --git a/...rter/spacesyntax/OpenMappingImporter.java → ...rter/spacesyntax/OpenMappingImporter.java b/...rter/spacesyntax/OpenMappingImporter.java → ...rter/spacesyntax/OpenMappingImporter.java
diff --git a/...spacesyntax/OpenSpaceNetworkImporter.java → ...spacesyntax/OpenSpaceNetworkImporter.java b/...spacesyntax/OpenSpaceNetworkImporter.java → ...spacesyntax/OpenSpaceNetworkImporter.java
diff --git a/...org/tombolo/importer/tfl/TfLImporter.java → ...org/tombolo/importer/tfl/TfLImporter.java b/...org/tombolo/importer/tfl/TfLImporter.java → ...org/tombolo/importer/tfl/TfLImporter.java
diff --git a/...olo/importer/tfl/TfLStationsImporter.java → ...olo/importer/tfl/TfLStationsImporter.java b/...olo/importer/tfl/TfLStationsImporter.java → ...olo/importer/tfl/TfLStationsImporter.java
diff --git a/...olo/importer/twitter/TwitterImporter.java → ...olo/importer/twitter/TwitterImporter.java b/...olo/importer/twitter/TwitterImporter.java → ...olo/importer/twitter/TwitterImporter.java
diff --git a/.../org/tombolo/importer/utils/CSVUtils.java → .../org/tombolo/importer/utils/CSVUtils.java b/.../org/tombolo/importer/utils/CSVUtils.java → .../org/tombolo/importer/utils/CSVUtils.java
diff --git a/...g/tombolo/importer/utils/ConfigUtils.java → ...g/tombolo/importer/utils/ConfigUtils.java b/...g/tombolo/importer/utils/ConfigUtils.java → ...g/tombolo/importer/utils/ConfigUtils.java
diff --git a/...mbolo/importer/utils/CoordinateUtils.java → ...mbolo/importer/utils/CoordinateUtils.java b/...mbolo/importer/utils/CoordinateUtils.java → ...mbolo/importer/utils/CoordinateUtils.java
diff --git a/...rg/tombolo/importer/utils/ExcelUtils.java → ...rg/tombolo/importer/utils/ExcelUtils.java b/...rg/tombolo/importer/utils/ExcelUtils.java → ...rg/tombolo/importer/utils/ExcelUtils.java
diff --git a/...mporter/utils/GeotoolsDataStoreUtils.java → ...mporter/utils/GeotoolsDataStoreUtils.java b/...mporter/utils/GeotoolsDataStoreUtils.java → ...mporter/utils/GeotoolsDataStoreUtils.java
diff --git a/...rg/tombolo/importer/utils/JSONReader.java → ...rg/tombolo/importer/utils/JSONReader.java b/...rg/tombolo/importer/utils/JSONReader.java → ...rg/tombolo/importer/utils/JSONReader.java
diff --git a/...olo/importer/utils/JournalEntryUtils.java → ...olo/importer/utils/JournalEntryUtils.java b/...olo/importer/utils/JournalEntryUtils.java → ...olo/importer/utils/JournalEntryUtils.java
diff --git a/...k/org/tombolo/importer/utils/LatLong.java → ...k/org/tombolo/importer/utils/LatLong.java b/...k/org/tombolo/importer/utils/LatLong.java → ...k/org/tombolo/importer/utils/LatLong.java
diff --git a/.../utils/extraction/BlankCellException.java → .../utils/extraction/BlankCellException.java b/.../utils/extraction/BlankCellException.java → .../utils/extraction/BlankCellException.java
diff --git a/...porter/utils/extraction/CSVExtractor.java → ...porter/utils/extraction/CSVExtractor.java b/...porter/utils/extraction/CSVExtractor.java → ...porter/utils/extraction/CSVExtractor.java
diff --git a/...r/utils/extraction/ConstantExtractor.java → ...r/utils/extraction/ConstantExtractor.java b/...r/utils/extraction/ConstantExtractor.java → ...r/utils/extraction/ConstantExtractor.java
diff --git a/.../utils/extraction/ExtractorException.java → .../utils/extraction/ExtractorException.java b/.../utils/extraction/ExtractorException.java → .../utils/extraction/ExtractorException.java
diff --git a/...er/utils/extraction/RowCellExtractor.java → ...er/utils/extraction/RowCellExtractor.java b/...er/utils/extraction/RowCellExtractor.java → ...er/utils/extraction/RowCellExtractor.java
diff --git a/...tils/extraction/SingleValueExtractor.java → ...tils/extraction/SingleValueExtractor.java b/...tils/extraction/SingleValueExtractor.java → ...tils/extraction/SingleValueExtractor.java
diff --git a/...utils/extraction/TimedValueExtractor.java → ...utils/extraction/TimedValueExtractor.java b/...utils/extraction/TimedValueExtractor.java → ...utils/extraction/TimedValueExtractor.java
diff --git a/...raction/UnknownSubjectLabelException.java → ...raction/UnknownSubjectLabelException.java b/...raction/UnknownSubjectLabelException.java → ...raction/UnknownSubjectLabelException.java
diff --git a/.../org/tombolo/recipe/AttributeMatcher.java → .../org/tombolo/recipe/AttributeMatcher.java b/.../org/tombolo/recipe/AttributeMatcher.java → .../org/tombolo/recipe/AttributeMatcher.java
diff --git a/.../org/tombolo/recipe/DataExportRecipe.java → .../org/tombolo/recipe/DataExportRecipe.java b/.../org/tombolo/recipe/DataExportRecipe.java → .../org/tombolo/recipe/DataExportRecipe.java
diff --git a/...olo/recipe/DataExportRecipeValidator.java → ...olo/recipe/DataExportRecipeValidator.java b/...olo/recipe/DataExportRecipeValidator.java → ...olo/recipe/DataExportRecipeValidator.java
diff --git a/.../uk/org/tombolo/recipe/DatasetRecipe.java → .../uk/org/tombolo/recipe/DatasetRecipe.java b/.../uk/org/tombolo/recipe/DatasetRecipe.java → .../uk/org/tombolo/recipe/DatasetRecipe.java
diff --git a/.../org/tombolo/recipe/DatasourceRecipe.java → .../org/tombolo/recipe/DatasourceRecipe.java b/.../org/tombolo/recipe/DatasourceRecipe.java → .../org/tombolo/recipe/DatasourceRecipe.java
diff --git a/...va/uk/org/tombolo/recipe/FieldRecipe.java → ...va/uk/org/tombolo/recipe/FieldRecipe.java b/...va/uk/org/tombolo/recipe/FieldRecipe.java → ...va/uk/org/tombolo/recipe/FieldRecipe.java
diff --git a/...rg/tombolo/recipe/RecipeDeserializer.java → ...rg/tombolo/recipe/RecipeDeserializer.java b/...rg/tombolo/recipe/RecipeDeserializer.java → ...rg/tombolo/recipe/RecipeDeserializer.java
diff --git a/.../uk/org/tombolo/recipe/SubjectRecipe.java → .../uk/org/tombolo/recipe/SubjectRecipe.java b/.../uk/org/tombolo/recipe/SubjectRecipe.java → .../uk/org/tombolo/recipe/SubjectRecipe.java
diff --git a/src/main/resources/catalogue.json → core/src/main/resources/catalogue.json b/src/main/resources/catalogue.json → core/src/main/resources/catalogue.json
diff --git a/...ces/data_export_specification_schema.json → ...ces/data_export_specification_schema.json b/...ces/data_export_specification_schema.json → ...ces/data_export_specification_schema.json
diff --git a/...utions/city-indices/active-transport.json → ...utions/city-indices/active-transport.json b/...utions/city-indices/active-transport.json → ...utions/city-indices/active-transport.json
diff --git a/.../executions/city-indices/green-space.json → .../executions/city-indices/green-space.json b/.../executions/city-indices/green-space.json → .../executions/city-indices/green-space.json
diff --git a/...tions/city-indices/landuse-diversity.json → ...tions/city-indices/landuse-diversity.json b/...tions/city-indices/landuse-diversity.json → ...tions/city-indices/landuse-diversity.json
diff --git a/...utions/city-indices/social-isolation.json → ...utions/city-indices/social-isolation.json b/...utions/city-indices/social-isolation.json → ...utions/city-indices/social-isolation.json
diff --git a/...c-count-data-within-localauthorities.json → ...c-count-data-within-localauthorities.json b/...c-count-data-within-localauthorities.json → ...c-count-data-within-localauthorities.json
diff --git a/...xamples/birmingham-land-use-variance.json → ...xamples/birmingham-land-use-variance.json b/...xamples/birmingham-land-use-variance.json → ...xamples/birmingham-land-use-variance.json
diff --git a/...lauthority-data-for-traffic-counters.json → ...lauthority-data-for-traffic-counters.json b/...lauthority-data-for-traffic-counters.json → ...lauthority-data-for-traffic-counters.json
diff --git a/...ns/examples/greenspace-hertfordshire.json → ...ns/examples/greenspace-hertfordshire.json b/...ns/examples/greenspace-hertfordshire.json → ...ns/examples/greenspace-hertfordshire.json
diff --git a/...les/islington-active-transport-index.json → ...les/islington-active-transport-index.json b/...les/islington-active-transport-index.json → ...les/islington-active-transport-index.json
diff --git a/.../leeds-activetravel-greenspace-ratio.json → .../leeds-activetravel-greenspace-ratio.json b/.../leeds-activetravel-greenspace-ratio.json → .../leeds-activetravel-greenspace-ratio.json
diff --git a/.../examples/leisure-park-hertfordshire.json → .../examples/leisure-park-hertfordshire.json b/.../examples/leisure-park-hertfordshire.json → .../examples/leisure-park-hertfordshire.json
diff --git a/...cle-traffic-air-quality-lsoa-backoff.json → ...cle-traffic-air-quality-lsoa-backoff.json b/...cle-traffic-air-quality-lsoa-backoff.json → ...cle-traffic-air-quality-lsoa-backoff.json
diff --git a/...e-traffic-air-quality-lsoa-modelling.json → ...e-traffic-air-quality-lsoa-modelling.json b/...e-traffic-air-quality-lsoa-modelling.json → ...e-traffic-air-quality-lsoa-modelling.json
diff --git a/...ondon-cycle-traffic-air-quality-lsoa.json → ...ondon-cycle-traffic-air-quality-lsoa.json b/...ondon-cycle-traffic-air-quality-lsoa.json → ...ondon-cycle-traffic-air-quality-lsoa.json
diff --git a/...-cycle-traffic-air-quality-meanvalue.json → ...-cycle-traffic-air-quality-meanvalue.json b/...-cycle-traffic-air-quality-meanvalue.json → ...-cycle-traffic-air-quality-meanvalue.json
diff --git a/...les/london-cycle-traffic-air-quality.json → ...les/london-cycle-traffic-air-quality.json b/...les/london-cycle-traffic-air-quality.json → ...les/london-cycle-traffic-air-quality.json
diff --git a/...utions/examples/london-no2-meanvalue.json → ...utions/examples/london-no2-meanvalue.json b/...utions/examples/london-no2-meanvalue.json → ...utions/examples/london-no2-meanvalue.json
diff --git a/...urces/executions/examples/london-no2.json → ...urces/executions/examples/london-no2.json b/...urces/executions/examples/london-no2.json → ...urces/executions/examples/london-no2.json
diff --git a/...xamples/london-social-infrastructure.json → ...xamples/london-social-infrastructure.json b/...xamples/london-social-infrastructure.json → ...xamples/london-social-infrastructure.json
diff --git a/...ions/examples/map-to-nearest-subject.json → ...ions/examples/map-to-nearest-subject.json b/...ions/examples/map-to-nearest-subject.json → ...ions/examples/map-to-nearest-subject.json
diff --git a/...ples/reaggregate-traffic-count-to-la.json → ...ples/reaggregate-traffic-count-to-la.json b/...ples/reaggregate-traffic-count-to-la.json → ...ples/reaggregate-traffic-count-to-la.json
diff --git a/...iles-for-leeds-normalised-nationally.json → ...iles-for-leeds-normalised-nationally.json b/...iles-for-leeds-normalised-nationally.json → ...iles-for-leeds-normalised-nationally.json
diff --git a/...es/restricting-subjects-to-geography.json → ...es/restricting-subjects-to-geography.json b/...es/restricting-subjects-to-geography.json → ...es/restricting-subjects-to-geography.json
diff --git a/...ions/examples/social-isolation-leeds.json → ...ions/examples/social-isolation-leeds.json b/...ions/examples/social-isolation-leeds.json → ...ions/examples/social-isolation-leeds.json
diff --git a/...ons/examples/social-resilience-leeds.json → ...ons/examples/social-resilience-leeds.json b/...ons/examples/social-resilience-leeds.json → ...ons/examples/social-resilience-leeds.json
diff --git a/...sources/executions/examples/template.json → ...sources/executions/examples/template.json b/...sources/executions/examples/template.json → ...sources/executions/examples/template.json
diff --git a/...mples/traffic-counts-geography-scope.json → ...mples/traffic-counts-geography-scope.json b/...mples/traffic-counts-geography-scope.json → ...mples/traffic-counts-geography-scope.json
diff --git a/...s/tweet-number-person-number-compare.json → ...s/tweet-number-person-number-compare.json b/...s/tweet-number-person-number-compare.json → ...s/tweet-number-person-number-compare.json
diff --git a/src/main/resources/hibernate.cfg.xml → core/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml → core/src/main/resources/hibernate.cfg.xml
diff --git a/src/main/resources/logback.xml → core/src/main/resources/logback.xml b/src/main/resources/logback.xml → core/src/main/resources/logback.xml
diff --git a/...main/resources/modelling-fields/README.md → ...main/resources/modelling-fields/README.md b/...main/resources/modelling-fields/README.md → ...main/resources/modelling-fields/README.md
diff --git a/...sources/modelling-fields/census/README.md → ...sources/modelling-fields/census/README.md b/...sources/modelling-fields/census/README.md → ...sources/modelling-fields/census/README.md
diff --git a/...ds/census/fraction-65-and-older-data.json → ...ds/census/fraction-65-and-older-data.json b/...ds/census/fraction-65-and-older-data.json → ...ds/census/fraction-65-and-older-data.json
diff --git a/...s/census/fraction-65-and-older-field.json → ...s/census/fraction-65-and-older-field.json b/...s/census/fraction-65-and-older-field.json → ...s/census/fraction-65-and-older-field.json
diff --git a/...action-active-transport-to-work-data.json → ...action-active-transport-to-work-data.json b/...action-active-transport-to-work-data.json → ...action-active-transport-to-work-data.json
diff --git a/...ction-active-transport-to-work-field.json → ...ction-active-transport-to-work-field.json b/...ction-active-transport-to-work-field.json → ...ction-active-transport-to-work-field.json
diff --git a/...elds/census/fraction-bad-health-data.json → ...elds/census/fraction-bad-health-data.json b/...elds/census/fraction-bad-health-data.json → ...elds/census/fraction-bad-health-data.json
diff --git a/...lds/census/fraction-bad-health-field.json → ...lds/census/fraction-bad-health-field.json b/...lds/census/fraction-bad-health-field.json → ...lds/census/fraction-bad-health-field.json
diff --git a/...fields/census/fraction-deprived-data.json → ...fields/census/fraction-deprived-data.json b/...fields/census/fraction-deprived-data.json → ...fields/census/fraction-deprived-data.json
diff --git a/...ields/census/fraction-deprived-field.json → ...ields/census/fraction-deprived-field.json b/...ields/census/fraction-deprived-field.json → ...ields/census/fraction-deprived-field.json
diff --git a/...fields/census/fraction-disabled-data.json → ...fields/census/fraction-disabled-data.json b/...fields/census/fraction-disabled-data.json → ...fields/census/fraction-disabled-data.json
diff --git a/...ields/census/fraction-disabled-field.json → ...ields/census/fraction-disabled-field.json b/...ields/census/fraction-disabled-field.json → ...ields/census/fraction-disabled-field.json
diff --git a/...-fields/census/fraction-renting-data.json → ...-fields/census/fraction-renting-data.json b/...-fields/census/fraction-renting-data.json → ...-fields/census/fraction-renting-data.json
diff --git a/...fields/census/fraction-renting-field.json → ...fields/census/fraction-renting-field.json b/...fields/census/fraction-renting-field.json → ...fields/census/fraction-renting-field.json
diff --git a/...tion-widowed-divorced-separated-data.json → ...tion-widowed-divorced-separated-data.json b/...tion-widowed-divorced-separated-data.json → ...tion-widowed-divorced-separated-data.json
diff --git a/...ion-widowed-divorced-separated-field.json → ...ion-widowed-divorced-separated-field.json b/...ion-widowed-divorced-separated-field.json → ...ion-widowed-divorced-separated-field.json
diff --git a/...-transport/ActiveTransportIndex-data.json → ...-transport/ActiveTransportIndex-data.json b/...-transport/ActiveTransportIndex-data.json → ...-transport/ActiveTransportIndex-data.json
diff --git a/...transport/ActiveTransportIndex-field.json → ...transport/ActiveTransportIndex-field.json b/...transport/ActiveTransportIndex-field.json → ...transport/ActiveTransportIndex-field.json
diff --git a/...transport/ActiveTransportToWork-data.json → ...transport/ActiveTransportToWork-data.json b/...transport/ActiveTransportToWork-data.json → ...transport/ActiveTransportToWork-data.json
diff --git a/...ransport/ActiveTransportToWork-field.json → ...ransport/ActiveTransportToWork-field.json b/...ransport/ActiveTransportToWork-field.json → ...ransport/ActiveTransportToWork-field.json
diff --git a/...active-transport/CycleLaneCount-data.json → ...active-transport/CycleLaneCount-data.json b/...active-transport/CycleLaneCount-data.json → ...active-transport/CycleLaneCount-data.json
diff --git a/...ctive-transport/CycleLaneCount-field.json → ...ctive-transport/CycleLaneCount-field.json b/...ctive-transport/CycleLaneCount-field.json → ...ctive-transport/CycleLaneCount-field.json
diff --git a/...e-transport/CycleLaneCount-lsoa-data.json → ...e-transport/CycleLaneCount-lsoa-data.json b/...e-transport/CycleLaneCount-lsoa-data.json → ...e-transport/CycleLaneCount-lsoa-data.json
diff --git a/...-transport/CycleLaneCount-lsoa-field.json → ...-transport/CycleLaneCount-lsoa-field.json b/...-transport/CycleLaneCount-lsoa-field.json → ...-transport/CycleLaneCount-lsoa-field.json
diff --git a/...s/active-transport/CyclingCount-data.json → ...s/active-transport/CyclingCount-data.json b/...s/active-transport/CyclingCount-data.json → ...s/active-transport/CyclingCount-data.json
diff --git a/.../active-transport/CyclingCount-field.json → .../active-transport/CyclingCount-field.json b/.../active-transport/CyclingCount-field.json → .../active-transport/CyclingCount-field.json
diff --git a/...ive-transport/CyclingCount-lsoa-data.json → ...ive-transport/CyclingCount-lsoa-data.json b/...ive-transport/CyclingCount-lsoa-data.json → ...ive-transport/CyclingCount-lsoa-data.json
diff --git a/...ve-transport/CyclingCount-lsoa-field.json → ...ve-transport/CyclingCount-lsoa-field.json b/...ve-transport/CyclingCount-lsoa-field.json → ...ve-transport/CyclingCount-lsoa-field.json
diff --git a/...dices/greenspace/GreenSpaceArea-data.json → ...dices/greenspace/GreenSpaceArea-data.json b/...dices/greenspace/GreenSpaceArea-data.json → ...dices/greenspace/GreenSpaceArea-data.json
diff --git a/...ices/greenspace/GreenSpaceArea-field.json → ...ices/greenspace/GreenSpaceArea-field.json b/...ices/greenspace/GreenSpaceArea-field.json → ...ices/greenspace/GreenSpaceArea-field.json
diff --git a/...ices/greenspace/GreenSpaceIndex-data.json → ...ices/greenspace/GreenSpaceIndex-data.json b/...ices/greenspace/GreenSpaceIndex-data.json → ...ices/greenspace/GreenSpaceIndex-data.json
diff --git a/...ces/greenspace/GreenSpaceIndex-field.json → ...ces/greenspace/GreenSpaceIndex-field.json b/...ces/greenspace/GreenSpaceIndex-field.json → ...ces/greenspace/GreenSpaceIndex-field.json
diff --git a/...ity-indices/greenspace/lsoaArea-data.json → ...ity-indices/greenspace/lsoaArea-data.json b/...ity-indices/greenspace/lsoaArea-data.json → ...ity-indices/greenspace/lsoaArea-data.json
diff --git a/...ty-indices/greenspace/lsoaArea-field.json → ...ty-indices/greenspace/lsoaArea-field.json b/...ty-indices/greenspace/lsoaArea-field.json → ...ty-indices/greenspace/lsoaArea-field.json
diff --git a/.../landuse-diversity/LanduseCount-data.json → .../landuse-diversity/LanduseCount-data.json b/.../landuse-diversity/LanduseCount-data.json → .../landuse-diversity/LanduseCount-data.json
diff --git a/...landuse-diversity/LanduseCount-field.json → ...landuse-diversity/LanduseCount-field.json b/...landuse-diversity/LanduseCount-field.json → ...landuse-diversity/LanduseCount-field.json
diff --git a/...e-diversity/ResidentialFraction-data.json → ...e-diversity/ResidentialFraction-data.json b/...e-diversity/ResidentialFraction-data.json → ...e-diversity/ResidentialFraction-data.json
diff --git a/...-diversity/ResidentialFraction-field.json → ...-diversity/ResidentialFraction-field.json b/...-diversity/ResidentialFraction-field.json → ...-diversity/ResidentialFraction-field.json
diff --git a/.../social-isolation-score-elderly-data.json → .../social-isolation-score-elderly-data.json b/.../social-isolation-score-elderly-data.json → .../social-isolation-score-elderly-data.json
diff --git a/...social-isolation-score-elderly-field.json → ...social-isolation-score-elderly-field.json b/...social-isolation-score-elderly-field.json → ...social-isolation-score-elderly-field.json
diff --git a/...e/CombinedSocialResilience-lsoa-data.json → ...e/CombinedSocialResilience-lsoa-data.json b/...e/CombinedSocialResilience-lsoa-data.json → ...e/CombinedSocialResilience-lsoa-data.json
diff --git a/.../CombinedSocialResilience-lsoa-field.json → .../CombinedSocialResilience-lsoa-field.json b/.../CombinedSocialResilience-lsoa-field.json → .../CombinedSocialResilience-lsoa-field.json
diff --git a/...cial-resilience/Disability-lsoa-data.json → ...cial-resilience/Disability-lsoa-data.json b/...cial-resilience/Disability-lsoa-data.json → ...cial-resilience/Disability-lsoa-data.json
diff --git a/...ial-resilience/Disability-lsoa-field.json → ...ial-resilience/Disability-lsoa-field.json b/...ial-resilience/Disability-lsoa-field.json → ...ial-resilience/Disability-lsoa-field.json
diff --git a/...ices/social-resilience/GPs-lsoa-data.json → ...ices/social-resilience/GPs-lsoa-data.json b/...ices/social-resilience/GPs-lsoa-data.json → ...ices/social-resilience/GPs-lsoa-data.json
diff --git a/...ces/social-resilience/GPs-lsoa-field.json → ...ces/social-resilience/GPs-lsoa-field.json b/...ces/social-resilience/GPs-lsoa-field.json → ...ces/social-resilience/GPs-lsoa-field.json
diff --git a/...al-resilience/Overcrowding-lsoa-data.json → ...al-resilience/Overcrowding-lsoa-data.json b/...al-resilience/Overcrowding-lsoa-data.json → ...al-resilience/Overcrowding-lsoa-data.json
diff --git a/...l-resilience/Overcrowding-lsoa-field.json → ...l-resilience/Overcrowding-lsoa-field.json b/...l-resilience/Overcrowding-lsoa-field.json → ...l-resilience/Overcrowding-lsoa-field.json
diff --git a/...es/modelling-fields/environment/README.md → ...es/modelling-fields/environment/README.md b/...es/modelling-fields/environment/README.md → ...es/modelling-fields/environment/README.md
diff --git a/...environment/fraction-greenspace-data.json → ...environment/fraction-greenspace-data.json b/...environment/fraction-greenspace-data.json → ...environment/fraction-greenspace-data.json
diff --git a/...nvironment/fraction-greenspace-field.json → ...nvironment/fraction-greenspace-field.json b/...nvironment/fraction-greenspace-field.json → ...nvironment/fraction-greenspace-field.json
diff --git a/...ment/laqn-aggregated-yearly-no2-data.json → ...ment/laqn-aggregated-yearly-no2-data.json b/...ment/laqn-aggregated-yearly-no2-data.json → ...ment/laqn-aggregated-yearly-no2-data.json
diff --git a/...ent/laqn-aggregated-yearly-no2-field.json → ...ent/laqn-aggregated-yearly-no2-field.json b/...ent/laqn-aggregated-yearly-no2-field.json → ...ent/laqn-aggregated-yearly-no2-field.json
diff --git a/...urces/modelling-fields/geometry/README.md → ...urces/modelling-fields/geometry/README.md b/...urces/modelling-fields/geometry/README.md → ...urces/modelling-fields/geometry/README.md
diff --git a/...geometry/area-square-kilometers-data.json → ...geometry/area-square-kilometers-data.json b/...geometry/area-square-kilometers-data.json → ...geometry/area-square-kilometers-data.json
diff --git a/...eometry/area-square-kilometers-field.json → ...eometry/area-square-kilometers-field.json b/...eometry/area-square-kilometers-field.json → ...eometry/area-square-kilometers-field.json
diff --git a/...lds/geometry/area-square-meters-data.json → ...lds/geometry/area-square-meters-data.json b/...lds/geometry/area-square-meters-data.json → ...lds/geometry/area-square-meters-data.json
diff --git a/...ds/geometry/area-square-meters-field.json → ...ds/geometry/area-square-meters-field.json b/...ds/geometry/area-square-meters-field.json → ...ds/geometry/area-square-meters-field.json
diff --git a/...urces/modelling-fields/land-use/README.md → ...urces/modelling-fields/land-use/README.md b/...urces/modelling-fields/land-use/README.md → ...urces/modelling-fields/land-use/README.md
diff --git a/...ds/land-use/fraction-commercial-data.json → ...ds/land-use/fraction-commercial-data.json b/...ds/land-use/fraction-commercial-data.json → ...ds/land-use/fraction-commercial-data.json
diff --git a/...s/land-use/fraction-commercial-field.json → ...s/land-use/fraction-commercial-field.json b/...s/land-use/fraction-commercial-field.json → ...s/land-use/fraction-commercial-field.json
diff --git a/...se/fraction-commercial-of-urban-data.json → ...se/fraction-commercial-of-urban-data.json b/...se/fraction-commercial-of-urban-data.json → ...se/fraction-commercial-of-urban-data.json
diff --git a/...e/fraction-commercial-of-urban-field.json → ...e/fraction-commercial-of-urban-field.json b/...e/fraction-commercial-of-urban-field.json → ...e/fraction-commercial-of-urban-field.json
diff --git a/...s/land-use/fraction-residential-data.json → ...s/land-use/fraction-residential-data.json b/...s/land-use/fraction-residential-data.json → ...s/land-use/fraction-residential-data.json
diff --git a/.../land-use/fraction-residential-field.json → .../land-use/fraction-residential-field.json b/.../land-use/fraction-residential-field.json → .../land-use/fraction-residential-field.json
diff --git a/...e/fraction-residential-of-urban-data.json → ...e/fraction-residential-of-urban-data.json b/...e/fraction-residential-of-urban-data.json → ...e/fraction-residential-of-urban-data.json
diff --git a/.../fraction-residential-of-urban-field.json → .../fraction-residential-of-urban-field.json b/.../fraction-residential-of-urban-field.json → .../fraction-residential-of-urban-field.json
diff --git a/...fields/land-use/fraction-retail-data.json → ...fields/land-use/fraction-retail-data.json b/...fields/land-use/fraction-retail-data.json → ...fields/land-use/fraction-retail-data.json
diff --git a/...ields/land-use/fraction-retail-field.json → ...ields/land-use/fraction-retail-field.json b/...ields/land-use/fraction-retail-field.json → ...ields/land-use/fraction-retail-field.json
diff --git a/...nd-use/fraction-retail-of-urban-data.json → ...nd-use/fraction-retail-of-urban-data.json b/...nd-use/fraction-retail-of-urban-data.json → ...nd-use/fraction-retail-of-urban-data.json
diff --git a/...d-use/fraction-retail-of-urban-field.json → ...d-use/fraction-retail-of-urban-field.json b/...d-use/fraction-retail-of-urban-field.json → ...d-use/fraction-retail-of-urban-field.json
diff --git a/...nd-use-coefficient-of-variation-data.json → ...nd-use-coefficient-of-variation-data.json b/...nd-use-coefficient-of-variation-data.json → ...nd-use-coefficient-of-variation-data.json
diff --git a/...d-use-coefficient-of-variation-field.json → ...d-use-coefficient-of-variation-field.json b/...d-use-coefficient-of-variation-field.json → ...d-use-coefficient-of-variation-field.json
diff --git a/...and-use/land-use-urban-variance-data.json → ...and-use/land-use-urban-variance-data.json b/...and-use/land-use-urban-variance-data.json → ...and-use/land-use-urban-variance-data.json
diff --git a/...nd-use/land-use-urban-variance-field.json → ...nd-use/land-use-urban-variance-field.json b/...nd-use/land-use-urban-variance-field.json → ...nd-use/land-use-urban-variance-field.json
diff --git a/...elds/land-use/land-use-variance-data.json → ...elds/land-use/land-use-variance-data.json b/...elds/land-use/land-use-variance-data.json → ...elds/land-use/land-use-variance-data.json
diff --git a/...lds/land-use/land-use-variance-field.json → ...lds/land-use/land-use-variance-field.json b/...lds/land-use/land-use-variance-field.json → ...lds/land-use/land-use-variance-field.json
diff --git a/...ling-fields/land-use/urban-area-data.json → ...ling-fields/land-use/urban-area-data.json b/...ling-fields/land-use/urban-area-data.json → ...ling-fields/land-use/urban-area-data.json
diff --git a/...ing-fields/land-use/urban-area-field.json → ...ing-fields/land-use/urban-area-field.json b/...ing-fields/land-use/urban-area-field.json → ...ing-fields/land-use/urban-area-field.json
diff --git a/...rces/modelling-fields/transport/README.md → ...rces/modelling-fields/transport/README.md b/...rces/modelling-fields/transport/README.md → ...rces/modelling-fields/transport/README.md
diff --git a/...ffic-counts-aggregated-bicycles-data.json → ...ffic-counts-aggregated-bicycles-data.json b/...ffic-counts-aggregated-bicycles-data.json → ...ffic-counts-aggregated-bicycles-data.json
diff --git a/...fic-counts-aggregated-bicycles-field.json → ...fic-counts-aggregated-bicycles-field.json b/...fic-counts-aggregated-bicycles-field.json → ...fic-counts-aggregated-bicycles-field.json
diff --git a/...gregated-bicycles-to-cars-ratio-data.json → ...gregated-bicycles-to-cars-ratio-data.json b/...gregated-bicycles-to-cars-ratio-data.json → ...gregated-bicycles-to-cars-ratio-data.json
diff --git a/...regated-bicycles-to-cars-ratio-field.json → ...regated-bicycles-to-cars-ratio-field.json b/...regated-bicycles-to-cars-ratio-field.json → ...regated-bicycles-to-cars-ratio-field.json
diff --git a/.../traffic-counts-aggregated-cars-data.json → .../traffic-counts-aggregated-cars-data.json b/.../traffic-counts-aggregated-cars-data.json → .../traffic-counts-aggregated-cars-data.json
diff --git a/...traffic-counts-aggregated-cars-field.json → ...traffic-counts-aggregated-cars-field.json b/...traffic-counts-aggregated-cars-field.json → ...traffic-counts-aggregated-cars-field.json
diff --git a/src/main/resources/sql/create_database.sql → ...rc/main/resources/sql/create_database.sql b/src/main/resources/sql/create_database.sql → ...rc/main/resources/sql/create_database.sql
diff --git a/...est/java/uk/org/tombolo/AbstractTest.java → ...est/java/uk/org/tombolo/AbstractTest.java b/...est/java/uk/org/tombolo/AbstractTest.java → ...est/java/uk/org/tombolo/AbstractTest.java
diff --git a/...rg/tombolo/CatalogueExportRunnerTest.java → ...rg/tombolo/CatalogueExportRunnerTest.java b/...rg/tombolo/CatalogueExportRunnerTest.java → ...rg/tombolo/CatalogueExportRunnerTest.java
diff --git a/.../uk/org/tombolo/DataExportEngineTest.java → .../uk/org/tombolo/DataExportEngineTest.java b/.../uk/org/tombolo/DataExportEngineTest.java → .../uk/org/tombolo/DataExportEngineTest.java
diff --git a/...mbolo/DataExportSpecificationBuilder.java → ...mbolo/DataExportSpecificationBuilder.java b/...mbolo/DataExportSpecificationBuilder.java → ...mbolo/DataExportSpecificationBuilder.java
diff --git a/...est/java/uk/org/tombolo/FieldBuilder.java → ...est/java/uk/org/tombolo/FieldBuilder.java b/...est/java/uk/org/tombolo/FieldBuilder.java → ...est/java/uk/org/tombolo/FieldBuilder.java
diff --git a/...k/org/tombolo/ImporterInfoRunnerTest.java → ...k/org/tombolo/ImporterInfoRunnerTest.java b/...k/org/tombolo/ImporterInfoRunnerTest.java → ...k/org/tombolo/ImporterInfoRunnerTest.java
diff --git a/.../tombolo/SubjectSpecificationBuilder.java → .../tombolo/SubjectSpecificationBuilder.java b/.../tombolo/SubjectSpecificationBuilder.java → .../tombolo/SubjectSpecificationBuilder.java
diff --git a/...test/java/uk/org/tombolo/TestFactory.java → ...test/java/uk/org/tombolo/TestFactory.java b/...test/java/uk/org/tombolo/TestFactory.java → ...test/java/uk/org/tombolo/TestFactory.java
diff --git a/...va/uk/org/tombolo/core/AttributeTest.java → ...va/uk/org/tombolo/core/AttributeTest.java b/...va/uk/org/tombolo/core/AttributeTest.java → ...va/uk/org/tombolo/core/AttributeTest.java
diff --git a/...a/uk/org/tombolo/core/DatasourceTest.java → ...a/uk/org/tombolo/core/DatasourceTest.java b/...a/uk/org/tombolo/core/DatasourceTest.java → ...a/uk/org/tombolo/core/DatasourceTest.java
diff --git a/...ava/uk/org/tombolo/core/ProviderTest.java → ...ava/uk/org/tombolo/core/ProviderTest.java b/...ava/uk/org/tombolo/core/ProviderTest.java → ...ava/uk/org/tombolo/core/ProviderTest.java
diff --git a/.../uk/org/tombolo/core/SubjectTypeTest.java → .../uk/org/tombolo/core/SubjectTypeTest.java b/.../uk/org/tombolo/core/SubjectTypeTest.java → .../uk/org/tombolo/core/SubjectTypeTest.java