From 473df79f8ed1ef03c970b216e36a3d9ae83becbb Mon Sep 17 00:00:00 2001
From: Lyn Elisa Goltz <goltz@lat-lon.de>
Date: Wed, 10 Jan 2024 09:14:58 +0100
Subject: [PATCH] XPLANBOX-2216 - renamed core modules

---
 pom.xml                                             |  12 ++++++------
 .../xplan-evaluation-schema-synchronize-cli/pom.xml |   2 +-
 xplan-cli/xplan-manager-cli/pom.xml                 |   9 +++------
 xplan-cli/xplan-transform-cli/pom.xml               |   6 +++---
 xplan-cli/xplan-update-data-cli/pom.xml             |   4 ++--
 xplan-cli/xplan-validatedb-cli/pom.xml              |   6 +++---
 xplan-cli/xplan-validator-cli/pom.xml               |   2 +-
 xplan-core/pom.xml                                  |  12 ++++++------
 xplan-core/xplan-core-api/pom.xml                   |   2 +-
 .../{xplan-commons-cli => xplan-core-cli}/pom.xml   |   2 +-
 .../de/latlon/xplan/commons/cli/DatabaseUtils.java  |   0
 .../java/de/latlon/xplan/commons/cli/Operation.java |   0
 .../xplan/commons/cli/SynchronizationException.java |   0
 .../xplan/commons/cli/SynchronizeAllExecutor.java   |   0
 .../xplan/commons/cli/SynchronizeExecutor.java      |   0
 .../de/latlon/xplan/commons/cli/Synchronizer.java   |   0
 .../{xplan-commons => xplan-core-commons}/pom.xml   |   2 +-
 .../java/de/latlon/xplan/commons/XPlanSchemas.java  |   0
 .../java/de/latlon/xplan/commons/XPlanType.java     |   0
 .../java/de/latlon/xplan/commons/XPlanVersion.java  |   0
 .../latlon/xplan/commons/archive/ArchiveEntry.java  |   0
 .../xplan/commons/archive/ArchiveMetadata.java      |   0
 .../xplan/commons/archive/ArchiveZipEntry.java      |   0
 .../latlon/xplan/commons/archive/ArtefactEntry.java |   0
 .../archive/LocalCenterToDistrictMapper.java        |   0
 .../latlon/xplan/commons/archive/MainZipEntry.java  |   0
 .../archive/SemanticValidableXPlanArchive.java      |   0
 .../latlon/xplan/commons/archive/XPlanArchive.java  |   0
 .../commons/archive/XPlanArchiveContentAccess.java  |   0
 .../xplan/commons/archive/XPlanArchiveCreator.java  |   0
 .../xplan/commons/archive/XPlanGmlReader.java       |   0
 .../xplan/commons/archive/XPlanGmlWriterFilter.java |   0
 .../xplan/commons/archive/XPlanPartArchive.java     |   0
 .../xplan/commons/archive/ZipEntryWithContent.java  |   0
 .../configuration/AbstractPropertiesLoader.java     |   0
 .../ConfigurationDirectoryPropertiesLoader.java     |   0
 .../configuration/DefaultPropertiesLoader.java      |   0
 .../commons/configuration/PropertiesLoader.java     |   0
 .../SemanticConformityLinkConfiguration.java        |   0
 .../commons/configuration/SortConfiguration.java    |   0
 .../SystemPropertyPropertiesLoader.java             |   0
 .../feature/FeatureCollectionManipulator.java       |   0
 .../feature/FeatureCollectionParseException.java    |   0
 .../commons/feature/MultipleInstanceParser.java     |   0
 .../xplan/commons/feature/OrientationFixer.java     |   0
 .../xplan/commons/feature/SortPropertyReader.java   |   0
 .../commons/feature/WfsFeatureInputStream.java      |   0
 .../commons/feature/XPlanFeatureCollection.java     |   0
 .../feature/XPlanFeatureCollectionBuilder.java      |   0
 .../commons/feature/XPlanFeatureCollections.java    |   0
 .../xplan/commons/feature/XPlanGmlParser.java       |   0
 .../commons/feature/XPlanGmlParserBuilder.java      |   0
 .../XPlanMultipleInstanceFeatureCollection.java     |   0
 .../XPlanSingleInstanceFeatureCollection.java       |   0
 .../latlon/xplan/commons/hale/HaleIOProvider.java   |   0
 .../latlon/xplan/commons/hale/HaleTransformer.java  |   0
 .../xplan/commons/hale/TransformationException.java |   0
 .../java/de/latlon/xplan/commons/jts/JtsParser.java |   0
 .../xplan/commons/reference/ExternalReference.java  |   0
 .../commons/reference/ExternalReferenceInfo.java    |   0
 .../reference/ExternalReferenceInfoBuilder.java     |   0
 .../commons/reference/ExternalReferenceScanner.java |   0
 .../latlon/xplan/commons/synthesizer/Features.java  |   0
 .../xplan/commons/util/ContentTypeChecker.java      |   0
 .../xplan/commons/util/FeatureCollectionUtils.java  |   0
 .../latlon/xplan/commons/util/MimeTypeDetector.java |   0
 .../xplan/commons/util/TextPatternConstants.java    |   0
 .../util/UnsupportedContentTypeException.java       |   0
 .../xplan/commons/util/XPlanVersionUtils.java       |   0
 .../manager/web/shared/AdditionalPlanData.java      |   0
 .../xplan/manager/web/shared/AuthorizationInfo.java |   0
 .../de/latlon/xplan/manager/web/shared/Bereich.java |   0
 .../manager/web/shared/ConfigurationException.java  |   0
 .../web/shared/PlanNameWithStatusResult.java        |   0
 .../latlon/xplan/manager/web/shared/PlanStatus.java |   0
 .../manager/web/shared/RasterEvaluationResult.java  |   0
 .../xplan/manager/web/shared/Rechtsstand.java       |   0
 .../de/latlon/xplan/manager/web/shared/XPlan.java   |   0
 .../manager/web/shared/edit/AbstractReference.java  |   0
 .../xplan/manager/web/shared/edit/BaseData.java     |   0
 .../xplan/manager/web/shared/edit/Change.java       |   0
 .../xplan/manager/web/shared/edit/ChangeType.java   |   0
 .../manager/web/shared/edit/ExterneReferenzArt.java |   0
 .../xplan/manager/web/shared/edit/MimeTypes.java    |   0
 .../xplan/manager/web/shared/edit/RasterBasis.java  |   0
 .../manager/web/shared/edit/RasterReference.java    |   0
 .../web/shared/edit/RasterReferenceType.java        |   0
 .../xplan/manager/web/shared/edit/Reference.java    |   0
 .../manager/web/shared/edit/ReferenceType.java      |   0
 .../latlon/xplan/manager/web/shared/edit/Text.java  |   0
 .../web/shared/edit/TextRechtscharacterType.java    |   0
 .../manager/web/shared/edit/ValidityPeriod.java     |   0
 .../xplan/manager/web/shared/edit/XPlanToEdit.java  |   0
 .../xplan/validator/web/shared/ArtifactType.java    |   0
 .../validator/web/shared/MapPreviewMetadata.java    |   0
 .../validator/web/shared/ValidationOption.java      |   0
 .../validator/web/shared/ValidationSettings.java    |   0
 .../xplan/validator/web/shared/ValidationType.java  |   0
 .../xplan/validator/web/shared/XPlanEnvelope.java   |   0
 .../java/org/deegree/gml/XPlanGmlFeatureWriter.java |   0
 .../main/java/org/deegree/gml/XPlanGmlWriter.java   |   0
 .../de/latlon/xplan/commons/minimalist-format.json  |   0
 .../commons/util/contentTypeChecker.properties      |   0
 .../latlon/xplan/manager/XPlanManagerCore.gwt.xml   |   0
 .../xplan/validator/XPlanValidatorCore.gwt.xml      |   0
 .../org/apache/tika/mime/custom-mimetypes.xml       |   0
 .../xplan/commons/XPlanFeatureCollectionTest.java   |   0
 .../commons/archive/XPlanArchiveCreatorTest.java    |   0
 .../SemanticConformityLinkConfigurationTest.java    |   0
 .../configuration/SortConfigurationTest.java        |   0
 .../SystemPropertyPropertiesLoaderTest.java         |   0
 .../feature/FeatureCollectionManipulatorTest.java   |   0
 .../xplan/commons/feature/OrientationFixerTest.java |   0
 .../feature/ParameterizedXPlanGmlParserTest.java    |   0
 .../commons/feature/SortPropertyReaderTest.java     |   0
 .../xplan/commons/feature/XPlanGmlParserTest.java   |   0
 .../ParameterizedExternalReferenceScannerTest.java  |   0
 .../xplan/commons/util/ContentTypeCheckerTest.java  |   0
 .../commons/util/FeatureCollectionUtilsTest.java    |   0
 .../xplan/commons/util/MimeTypeDetectorTest.java    |   0
 .../xplan/commons/util/XPlanVersionUtilsTest.java   |   0
 .../xplan/manager/web/shared/PlanStatusTest.java    |   0
 .../shared/edit/TextRechtscharacterTypeTest.java    |   0
 .../org/deegree/gml/XPlanGmlFeatureWriterTest.java  |   0
 .../archive/Blankenese29_Test_60_withEntity.zip     | Bin
 .../archive/V4_1_ID_103-asWfsFeatureCollection.gml  |   0
 .../archive/V4_1_ID_103-noXPlanGmlCollection.gml    |   0
 .../commons/feature/geometryOrientationInvalid.gml  |   0
 .../commons/feature/geometryOrientationValid.gml    |   0
 .../wfs20FeatureCollection-additionalObjects.gml    |   0
 .../commons/feature/wfs20FeatureCollection.gml      |   0
 .../xplan-multipleInstances-withUnreferenced.gml    |   0
 .../xplan-multipleInstances-withVerbundenerPlan.gml |   0
 .../commons/feature/xplan-multipleInstances.gml     |   0
 .../de/latlon/xplan/commons/util/Blankenese29.pgw   |   0
 .../de/latlon/xplan/commons/util/Blankenese29.png   | Bin
 .../xplan/commons/util/Blankenese29_Test_60.zip     | Bin
 .../util/Blankenese29_Test_60_InvalidContent.zip    | Bin
 .../resources/de/latlon/xplan/commons/util/test.odt | Bin
 xplan-core/xplan-core-gwt/pom.xml                   |   7 +++----
 .../pom.xml                                         |   4 ++--
 .../plu/transformation/InspirePluTransformator.java |   0
 .../hale/HaleCliInspirePluTransformator.java        |   0
 .../HaleCliInspirePluTransformatorTest.java         |   0
 xplan-core/xplan-core-job/pom.xml                   |   2 +-
 xplan-core/xplan-core-manager-db/pom.xml            |   2 +-
 .../pom.xml                                         |   8 ++++----
 .../de/latlon/xplan/manager/CategoryMapper.java     |   0
 .../main/java/de/latlon/xplan/manager/CrsUtils.java |   0
 .../java/de/latlon/xplan/manager/XPlanManager.java  |   0
 .../configuration/ConfigurationException.java       |   0
 .../configuration/CoupledResourceConfiguration.java |   0
 .../InternalIdRetrieverConfiguration.java           |   0
 .../manager/configuration/ManagerConfiguration.java |   0
 .../configuration/ManagerConfigurationAnalyser.java |   0
 .../database/AmbiguousBereichNummernException.java  |   0
 .../xplan/manager/database/DatabaseUtils.java       |   0
 .../manager/database/ManagerWorkspaceWrapper.java   |   0
 .../manager/database/PlanNotFoundException.java     |   0
 .../de/latlon/xplan/manager/database/XPlanDao.java  |   0
 .../xplan/manager/database/XPlanDbAdapter.java      |   0
 .../manager/database/XPlanInspirePluAdapter.java    |   0
 .../xplan/manager/database/XPlanManagerDao.java     |   0
 .../xplan/manager/database/XPlanSynWfsAdapter.java  |   0
 .../manager/database/XPlanVersionAndPlanStatus.java |   0
 .../xplan/manager/database/XPlanWfsAdapter.java     |   0
 .../xplan/manager/document/DocumentStorage.java     |   0
 .../manager/document/XPlanDocumentManager.java      |   0
 .../document/config/DocumentStorageContext.java     |   0
 .../manager/document/s3/S3DocumentStorage.java      |   0
 .../s3/config/AmazonS3DocumentStorageContext.java   |   0
 .../de/latlon/xplan/manager/edit/ArtefactType.java  |   0
 .../de/latlon/xplan/manager/edit/EditException.java |   0
 .../java/de/latlon/xplan/manager/edit/EditType.java |   0
 .../latlon/xplan/manager/edit/EditedArtefact.java   |   0
 .../latlon/xplan/manager/edit/EditedArtefacts.java  |   0
 .../xplan/manager/edit/ExternalReferenceUtils.java  |   0
 .../latlon/xplan/manager/edit/XPlanManipulator.java |   0
 .../xplan/manager/edit/XPlanToEditFactory.java      |   0
 .../xplan/manager/export/XPlanExportException.java  |   0
 .../latlon/xplan/manager/export/XPlanExporter.java  |   0
 .../inspireplu/InspirePluPublishException.java      |   0
 .../manager/inspireplu/InspirePluPublisher.java     |   0
 .../manager/internalid/InternalIdRetriever.java     |   0
 .../java/de/latlon/xplan/manager/log/SystemLog.java |   0
 .../metadata/DataServiceCouplingException.java      |   0
 .../manager/metadata/MetadataCouplingHandler.java   |   0
 .../metadata/ServiceMetadataDocumentWriter.java     |   0
 .../metadata/TemplateXmlStreamWriterFilter.java     |   0
 .../xplan/manager/metadata/csw/CswClient.java       |   0
 .../manager/metadata/csw/PlanRecordMetadata.java    |   0
 .../planwerkwms/PlanwerkServiceMetadata.java        |   0
 .../planwerkwms/PlanwerkServiceMetadataBuilder.java |   0
 .../manager/storage/StorageCleanUpManager.java      |   0
 .../latlon/xplan/manager/storage/StorageEvent.java  |   0
 .../storage/config/StorageCleanUpContext.java       |   0
 .../filesystem/FilesystemStorageCleanUpManager.java |   0
 .../listener/FilesystemTransactionListener.java     |   0
 .../latlon/xplan/manager/storage/s3/S3Metadata.java |   0
 .../latlon/xplan/manager/storage/s3/S3Object.java   |   0
 .../latlon/xplan/manager/storage/s3/S3Storage.java  |   0
 .../manager/storage/s3/S3StorageCleanUpManager.java |   0
 .../manager/storage/s3/config/AmazonS3Context.java  |   0
 .../storage/s3/listener/S3TransactionListener.java  |   0
 .../manager/transaction/AttachmentUrlHandler.java   |   0
 .../xplan/manager/transaction/PlanImportData.java   |   0
 .../xplan/manager/transaction/TransactionUtils.java |   0
 .../manager/transaction/UnsupportPlanException.java |   0
 .../manager/transaction/XPlanDeleteManager.java     |   0
 .../xplan/manager/transaction/XPlanEditManager.java |   0
 .../manager/transaction/XPlanInsertManager.java     |   0
 .../transaction/XPlanTransactionManager.java        |   0
 .../transaction/service/XPlanDeleteService.java     |   0
 .../transaction/service/XPlanEditService.java       |   0
 .../transaction/service/XPlanInsertService.java     |   0
 .../HaleXplan41ToXplan51Transformer.java            |   0
 .../transformation/TransformationResult.java        |   0
 .../manager/transformation/XPlanGmlTransformer.java |   0
 .../xplan/manager/wmsconfig/WmsThemesConfig.java    |   0
 .../manager/wmsconfig/WmsWorkspaceWrapper.java      |   0
 .../wmsconfig/config/RasterStorageContext.java      |   0
 .../wmsconfig/raster/RasterConfigurationSorter.java |   0
 .../wmsconfig/raster/RasterConfigurationType.java   |   0
 .../xplan/manager/wmsconfig/raster/RasterUtils.java |   0
 .../wmsconfig/raster/XPlanRasterManager.java        |   0
 .../wmsconfig/raster/access/GdalRasterAdapter.java  |   0
 .../wmsconfig/raster/config/ConfigWriterUtils.java  |   0
 .../raster/config/DeegreeRasterConfigManager.java   |   0
 .../raster/config/NoConfigRasterConfigManager.java  |   0
 .../raster/config/RasterConfigManager.java          |   0
 .../raster/config/WorkspaceRasterLayerManager.java  |   0
 .../raster/config/WorkspaceRasterThemeManager.java  |   0
 .../raster/evaluation/GdalRasterEvaluation.java     |   0
 .../raster/evaluation/GeotiffRasterEvaluation.java  |   0
 .../raster/evaluation/RasterEvaluation.java         |   0
 .../raster/evaluation/XPlanRasterEvaluator.java     |   0
 .../wmsconfig/raster/storage/FileSystemStorage.java |   0
 .../wmsconfig/raster/storage/GdalRasterStorage.java |   0
 .../wmsconfig/raster/storage/RasterStorage.java     |   0
 .../wmsconfig/raster/storage/StorageException.java  |   0
 .../raster/storage/s3/S3RasterStorage.java          |   0
 .../s3/config/AmazonS3RasterStorageContext.java     |   0
 .../manager/workspace/DeegreeWorkspaceWrapper.java  |   0
 .../xplan/manager/workspace/WorkspaceException.java |   0
 .../manager/workspace/WorkspaceReloadAction.java    |   0
 .../xplan/manager/workspace/WorkspaceReloader.java  |   0
 .../workspace/WorkspaceReloaderConfiguration.java   |   0
 .../xplan/manager/workspace/WorkspaceUtils.java     |   0
 .../configuration/managerConfiguration.properties   |   0
 .../de/latlon/xplan/manager/CategoryMapperTest.java |   0
 .../de/latlon/xplan/manager/XPlanManagerTest.java   |   0
 .../xplan/manager/config/CoreTestContext.java       |   0
 .../configuration/ManagerConfigurationTest.java     |   0
 .../manager/document/XPlanDocumentManagerTest.java  |   0
 .../manager/document/s3/S3DocumentStorageIT.java    |   0
 .../manager/edit/ExternalReferenceUtilsTest.java    |   0
 .../xplan/manager/edit/XPlanManipulatorTest.java    |   0
 .../xplan/manager/edit/XPlanToEditFactoryTest.java  |   0
 .../xplan/manager/export/XPlanExporterTest.java     |   0
 .../manager/internalid/InternalIdRetrieverTest.java |   0
 .../metadata/MetadataCouplingHandlerTest.java       |   0
 .../metadata/ServiceMetadataDocumentWriterTest.java |   0
 .../manager/metadata/csw/CswClientTestManual.java   |   0
 .../PlanwerkServiceMetadataBuilderTest.java         |   0
 .../storage/s3/S3StorageCleanUpManagerTest.java     |   0
 .../manager/storage/s3/S3StorageTestManual.java     |   0
 .../storage/s3/config/AmazonS3TestContext.java      |   0
 .../storage/s3/config/S3StorageTestContext.java     |   0
 .../attachment/AttachmentUrlHandlerTest.java        |   0
 .../manager/wmsconfig/ConfigWriterUtilsTest.java    |   0
 .../raster/RasterConfigurationSorterTest.java       |   0
 .../raster/access/GdalRasterAdapterTest.java        |   0
 .../WorkspaceRasterLayerManagerTestManual.java      |   0
 .../raster/evaluation/XPlanRasterEvaluatorTest.java |   0
 .../raster/storage/s3/S3RasterStorageTest.java      |   0
 .../storage/s3/S3RasterStorageTestManual.java       |   0
 .../s3/config/S3RasterStorageTestContext.java       |   0
 .../workspace/DeegreeWorkspaceWrapperTest.java      |   0
 .../manager/workspace/WorkspaceReloaderTest.java    |   0
 .../xplan/manager/workspace/WorkspaceUtilsTest.java |   0
 .../edit/xplan41/Eidelstedt_4_V4-Blankenese.gml     |   0
 .../xplan/manager/edit/xplan41/V4_1_ID_103.gml      |   0
 .../manager/edit/xplan41/V4_1_ID_103_references.gml |   0
 .../manager/edit/xplan41/V4_1_ID_103_texts.gml      |   0
 .../de/latlon/xplan/manager/edit/xplan50/BP2070.gml |   0
 .../xplan/manager/edit/xplan50/V4_1_ID_103.gml      |   0
 .../de/latlon/xplan/manager/edit/xplan51/BP2070.gml |   0
 .../xplan/manager/edit/xplan51/V4_1_ID_103.gml      |   0
 .../manager/edit/xplan51/V4_1_ID_103_refScan.gml    |   0
 .../manager/edit/xplan53/BPlan_ohneBereich.gml      |   0
 .../xplan/manager/edit/xplan54/BPlan002_5-4.gml     |   0
 .../iso-service-metadata-example-template.xml       |   0
 .../manager/wmsconfig/raster/evaluation/dem30.tiff  | Bin
 .../manager/wmsconfig/raster/evaluation/dem30.wld   |   0
 .../raster/evaluation/dem30_geotiff_tiled.tiff      | Bin
 .../evaluation/dem30_geotiff_tiled_epsg4326.tiff    | Bin
 .../wmsconfig/raster/evaluation/png_25833.png       | Bin
 .../raster/evaluation/png_25833.png.aux.xml         |   0
 .../wmsconfig/raster/evaluation/png_nocrs.png       | Bin
 .../manager/wmsconfig/raster/evaluation/test.txt    |   0
 .../src/test/resources/log4j2-test.yaml             |   0
 .../src/test/resources/s3Mock.properties            |   0
 .../LICENSE_UNKNOWN.txt                             |   0
 .../pom.xml                                         |   4 ++--
 .../xplan/manager/dictionary/XPlanCodelists.java    |   0
 .../xplan/manager/dictionary/XPlanDictionaries.java |   0
 .../manager/dictionary/XPlanDictionariesParser.java |   0
 .../xplan/manager/dictionary/XPlanDictionary.java   |   0
 .../manager/dictionary/XPlanDictionaryEntry.java    |   0
 .../manager/dictionary/XPlanEnumerationFactory.java |   0
 .../synthesizer/FeatureTypeNameSynthesizer.java     |   0
 .../xplan/manager/synthesizer/PlanContext.java      |   0
 .../xplan/manager/synthesizer/RuleParser.java       |   0
 .../xplan/manager/synthesizer/XPlanSynthesizer.java |   0
 .../manager/synthesizer/expression/Expression.java  |   0
 .../manager/synthesizer/expression/LatestDate.java  |   0
 .../synthesizer/expression/StringConstant.java      |   0
 .../synthesizer/expression/XPlanGeometry.java       |   0
 .../synthesizer/expression/XPlanGmlDescription.java |   0
 .../manager/synthesizer/expression/XPlanName.java   |   0
 .../manager/synthesizer/expression/XPlanType.java   |   0
 .../xplan/manager/synthesizer/expression/Xpath.java |   0
 .../expression/XplanBaugebietFlaechenteile.java     |   0
 .../synthesizer/expression/XplanGmlName.java        |   0
 .../dictionary/AbstractXPlanDictionaryLookup.java   |   0
 .../dictionary/XPlanEnumerationLookup.java          |   0
 .../dictionary/XPlanExternalCodeLookup.java         |   0
 .../expression/flatten/AbstractFlattener.java       |   0
 .../expression/flatten/DefaultFlattener.java        |   0
 .../synthesizer/expression/flatten/Flattener.java   |   0
 .../expression/flatten/XplanFlattenProperty.java    |   0
 .../flatten/complex/ComplexFlattener.java           |   0
 .../lp/LpBiologischeVielfaltKomplexFlattener.java   |   0
 .../expression/flatten/model/DataTypeFlattener.java |   0
 .../expression/flatten/model/FlattenerProperty.java |   0
 .../xp/AbstractTextlicherAbschnittFlattener.java    |   0
 .../flatten/xp/XpBegruendungAbschnittFlattener.java |   0
 .../flatten/xp/XpExterneReferenzFlattener.java      |   0
 .../flatten/xp/XpGenerAttributFlattener.java        |   0
 .../flatten/xp/XpRasterplanFlattener.java           |   0
 .../flatten/xp/XpTextAbschnittFlattener.java        |   0
 .../flatten/xp/XpVerfahrensMerkmalFlattener.java    |   0
 .../expression/praesentation/Ausrichtung.java       |   0
 .../praesentation/GeometryTypeAbbreviation.java     |   0
 .../praesentation/PraesentationsobjektLookup.java   |   0
 .../praesentation/SchriftinhaltLookup.java          |   0
 .../expression/praesentation/SkalierungLookup.java  |   0
 .../praesentation/StylesheetIdLookup.java           |   0
 .../praesentation/attribute/AttributeProperty.java  |   0
 .../attribute/AttributePropertyParser.java          |   0
 .../attribute/AttributePropertyType.java            |   0
 .../manager/synthesizer/rules/SynRulesAccessor.java |   0
 .../synthesizer/utils/AlphanumericComparator.java   |   0
 .../xplan/manager/synthesizer/utils/CastUtils.java  |   0
 .../enumeration/XPlanGML_4_0_Enumerationen.xml      |   0
 .../enumeration/XPlanGML_5_0_Enumerationen.xml      |   0
 .../enumeration/XPlanGML_5_1_Enumerationen.xml      |   0
 .../enumeration/XPlanGML_5_2_Enumerationen.xml      |   0
 .../enumeration/XPlanGML_5_3_Enumerationen.xml      |   0
 .../enumeration/XPlanGML_5_4_Enumerationen.xml      |   0
 .../enumeration/XPlanGML_6_0_2_Enumerationen.xml    |   0
 .../enumeration/XPlanGML_Enumerationen_4_1.xml      |   0
 .../featuretypes/renamedFeatureTypes.properties     |   0
 .../main/resources/flattener/complexFlattener.yaml  |   0
 .../src/main/resources/junit-platform.properties    |   0
 .../src/main/resources/rules/xplan40.syn            |   0
 .../src/main/resources/rules/xplan41.syn            |   0
 .../src/main/resources/rules/xplan50.syn            |   0
 .../src/main/resources/rules/xplan51.syn            |   0
 .../src/main/resources/rules/xplan52.syn            |   0
 .../src/main/resources/rules/xplan53.syn            |   0
 .../src/main/resources/rules/xplan54.syn            |   0
 .../src/main/resources/rules/xplan60.syn            |   0
 .../manager/dictionary/XPlanCodelistsTest.java      |   0
 .../manager/dictionary/XPlanDictionariesTest.java   |   0
 .../dictionary/XPlanEnumerationFactoryTest.java     |   0
 .../synthesizer/AbstractXplanSynthesizerTest.java   |   0
 .../synthesizer/FeatureTypeNameSynthesizerTest.java |   0
 .../xplan/manager/synthesizer/RuleParserTest.java   |   0
 .../synthesizer/XPlanSynthesizerComparisonTest.java |   0
 .../XPlanSynthesizerConcurrencyTest.java            |   0
 .../manager/synthesizer/XPlanSynthesizerTest.java   |   0
 .../synthesizer/XplanSynthesizerXplan40Test.java    |   0
 .../synthesizer/XplanSynthesizerXplan41Test.java    |   0
 .../synthesizer/XplanSynthesizerXplan50Test.java    |   0
 .../synthesizer/XplanSynthesizerXplan51Test.java    |   0
 .../synthesizer/XplanSynthesizerXplan52Test.java    |   0
 .../synthesizer/expression/LatestDateTest.java      |   0
 .../synthesizer/expression/StringConstantTest.java  |   0
 .../synthesizer/expression/TestFeaturesUtils.java   |   0
 .../manager/synthesizer/expression/XpathTest.java   |   0
 .../expression/XplanBaugebietFlaechenteileTest.java |   0
 .../expression/XplanFlattenPropertyTest.java        |   0
 .../synthesizer/expression/XplanGeometryTest.java   |   0
 .../expression/XplanGmlDescriptionTest.java         |   0
 .../synthesizer/expression/XplanGmlNameTest.java    |   0
 .../dictionary/XplanEnumerationLookupTest.java      |   0
 .../flatten/complex/ComplexFlattenerTest.java       |   0
 .../LpBiologischeVielfaltKomplexFlattenerTest.java  |   0
 .../xp/XpBegruendungAbschnittFlattenerTest.java     |   0
 .../flatten/xp/XpTextAbschnittFlattenerTest.java    |   0
 .../AbstractPraesentationsobjektLookupTest.java     |   0
 .../expression/praesentation/AusrichtungTest.java   |   0
 .../praesentation/SchriftinhaltLookupTest.java      |   0
 .../praesentation/SkalierungLookupTest.java         |   0
 .../praesentation/StylesheetIdLookupTest.java       |   0
 .../attribute/AttributePropertyParserTest.java      |   0
 .../utils/AlphanumericComparatorTest.java           |   0
 .../src/test/resources/HafenCity7.gml               |   0
 .../src/test/resources/Rotherbaum27.gml             |   0
 .../xplan/manager/dictionary/exampleCodelist.xml    |   0
 .../synthesizer/BP_DetailArtDerBaulNutzung.xml      |   0
 .../XP_BesondereArtDerBaulNutzung-XPlan4.xml        |   0
 .../XP_BesondereArtDerBaulNutzung-XPlan5.xml        |   0
 .../synthesizer/expression/FeatureWithCurve.xml     |   0
 .../synthesizer/expression/MultipleDates.gml        |   0
 .../expression/Praesentationsobjekte.gml            |   0
 .../flatten/BP_KomplexeZweckbestGruen.xml           |   0
 .../expression/flatten/BpDachgestaltung.xml         |   0
 .../expression/flatten/XpSPEMassnahmenDaten.xml     |   0
 .../expression/flatten/XpTextAbschnittFlattener.xml |   0
 .../flatten/XpTextAbschnittWithRefText.xml          |   0
 .../flatten/XpVerbundenerPlanFlattener.xml          |   0
 .../manager/synthesizer/expression/xplan40.xml      |   0
 .../manager/synthesizer/expression/xplan41.xml      |   0
 .../manager/synthesizer/expression/xplan50.xml      |   0
 .../manager/synthesizer/expression/xplan53.xml      |   0
 .../manager/synthesizer/expression/xplan60.xml      |   0
 .../manager/synthesizer/plans/xplan41/BP2070.xml    |   0
 .../manager/synthesizer/plans/xplan41/BP2135.xml    |   0
 .../manager/synthesizer/plans/xplan41/LA22.xml      |   0
 .../manager/synthesizer/plans/xplan41/LA67.xml      |   0
 .../manager/synthesizer/plans/xplan50/BP2070.xml    |   0
 .../manager/synthesizer/plans/xplan50/BP2135.xml    |   0
 .../manager/synthesizer/plans/xplan50/LA22.xml      |   0
 .../manager/synthesizer/plans/xplan50/LA67.xml      |   0
 .../manager/synthesizer/plans/xplan51/BP2070.xml    |   0
 .../manager/synthesizer/plans/xplan51/BP2135.xml    |   0
 .../manager/synthesizer/plans/xplan51/LA22.xml      |   0
 .../manager/synthesizer/plans/xplan51/LA67.xml      |   0
 .../manager/synthesizer/plans/xplan52/BP2070.xml    |   0
 .../manager/synthesizer/plans/xplan52/BP2135.xml    |   0
 .../manager/synthesizer/plans/xplan52/LA22.xml      |   0
 .../manager/synthesizer/plans/xplan52/LA67.xml      |   0
 .../synthesizer/praesentation/BPlan002_5-4.gml      |   0
 .../BPlan002_5-4_ohneErstellungsMassstab.gml        |   0
 .../synthesizer/praesentation/BPlan003_4-1.gml      |   0
 .../synthesizer/praesentation/FP_5-2_PPO-Test.gml   |   0
 .../synthesizer/praesentation/Test_PPO_index-1.gml  |   0
 .../de/latlon/xplan/manager/synthesizer/xplan41.syn |   0
 .../xplan41_BP_DetailArtDerBaulNutzung.syn          |   0
 .../xplan41_XP_BesondereArtDerBaulNutzung.syn       |   0
 .../src/test/resources/log4j2-test.yaml             |   0
 .../LICENSE_UNKNOWN.txt                             |   0
 .../pom.xml                                         |   4 ++--
 .../de/latlon/xplan/validator/ValidationType.java   |   0
 .../latlon/xplan/validator/ValidatorException.java  |   0
 .../de/latlon/xplan/validator/XPlanValidator.java   |   0
 .../configuration/ValidatorConfiguration.java       |   0
 .../configuration/ValidatorConfigurationParser.java |   0
 .../validator/configuration/ValidatorProfile.java   |   0
 .../validator/geometric/GeometricValidator.java     |   0
 .../validator/geometric/GeometricValidatorImpl.java |   0
 .../validator/geometric/XPlanGeometryInspector.java |   0
 .../inspector/GeometricFeatureInspector.java        |   0
 .../inspector/InvalidGeometryException.java         |   0
 .../inspector/aenderungen/AenderungenInspector.java |   0
 .../doppelbelegung/DoppelbelegungInspector.java     |   0
 .../inspector/flaechenschluss/ControlPoint.java     |   0
 .../flaechenschluss/FlaechenschlussContext.java     |   0
 .../FlaechenschlussFeatureInspector.java            |   0
 .../flaechenschluss/FlaechenschlussTolerance.java   |   0
 .../OptimisedFlaechenschlussInspector.java          |   0
 .../GeltungsbereichFeatureAnalyser.java             |   0
 .../geltungsbereich/GeltungsbereichInspector.java   |   0
 .../GeltungsbereichInspectorContext.java            |   0
 .../model/AbstractGeltungsbereichFeature.java       |   0
 .../geometric/inspector/model/BereichFeature.java   |   0
 .../geometric/inspector/model/FeatureUnderTest.java |   0
 .../inspector/model/FeaturesUnderTest.java          |   0
 .../inspector/model/GeltungsbereichFeature.java     |   0
 .../geometric/inspector/model/InspectorContext.java |   0
 .../geometric/inspector/model/PlanFeature.java      |   0
 .../validator/geometric/report/BadGeometry.java     |   0
 .../geometric/report/GeometricValidatorResult.java  |   0
 .../xplan/validator/i18n/ValidationMessages.java    |   0
 .../reference/ExternalReferenceEvaluator.java       |   0
 .../validator/report/ReportArchiveGenerator.java    |   0
 .../validator/report/ReportGenerationException.java |   0
 .../latlon/xplan/validator/report/ReportUtils.java  |   0
 .../latlon/xplan/validator/report/ReportWriter.java |   0
 .../xplan/validator/report/ValidatorDetail.java     |   0
 .../xplan/validator/report/ValidatorReport.java     |   0
 .../xplan/validator/report/ValidatorResult.java     |   0
 .../validator/report/html/HtmlReportGenerator.java  |   0
 .../validator/report/pdf/PdfReportGenerator.java    |   0
 .../xplan/validator/report/pdf/ReportBuilder.java   |   0
 .../xplan/validator/report/pdf/Templates.java       |   0
 .../report/reference/ExternalReferenceReport.java   |   0
 .../report/reference/ExternalReferenceStatus.java   |   0
 .../report/shapefile/ShapefileBuilder.java          |   0
 .../report/shapefile/ShapefileGenerator.java        |   0
 .../xplan/validator/report/xml/JaxbConverter.java   |   0
 .../validator/report/xml/XmlReportGenerator.java    |   0
 .../xplan/validator/semantic/SemanticValidator.java |   0
 .../validator/semantic/SemanticValidatorRule.java   |   0
 .../configuration/SemanticRulesConfiguration.java   |   0
 .../SemanticRulesMainConfiguration.java             |   0
 .../SemanticRulesProfileConfiguration.java          |   0
 .../configuration/SemanticValidationOptions.java    |   0
 .../SemanticValidatorConfiguration.java             |   0
 .../SemanticValidatorConfigurationRetriever.java    |   0
 .../message/DefaultRulesMessagesAccessor.java       |   0
 .../message/FileRulesMessagesAccessor.java          |   0
 .../message/RulesMessagesAccessor.java              |   0
 .../configuration/metadata/RulesMetadata.java       |   0
 .../configuration/metadata/RulesVersion.java        |   0
 .../configuration/metadata/RulesVersionParser.java  |   0
 ...uerySemanticValidatorConfigurationRetriever.java |   0
 .../profile/DelegatingSemanticProfileValidator.java |   0
 .../semantic/profile/SemanticProfileValidator.java  |   0
 .../semantic/profile/SemanticProfiles.java          |   0
 .../semantic/profile/SemanticProfilesCreator.java   |   0
 .../semantic/report/InvalidFeaturesResult.java      |   0
 .../semantic/report/InvalidRuleResult.java          |   0
 .../xplan/validator/semantic/report/RuleResult.java |   0
 .../semantic/report/SemanticValidatorResult.java    |   0
 .../semantic/report/ValidationResultType.java       |   0
 .../semantic/xquery/XQuerySemanticValidator.java    |   0
 .../xquery/XQuerySemanticValidatorRule.java         |   0
 .../validator/syntactic/SyntacticValidator.java     |   0
 .../validator/syntactic/SyntacticValidatorImpl.java |   0
 .../syntactic/report/SyntacticValidatorResult.java  |   0
 .../validator/wms/MapPreviewCreationException.java  |   0
 .../xplan/validator/wms/MapPreviewManager.java      |   0
 .../validator/wms/MasterportalConfigWriter.java     |   0
 .../xplan/validator/wms/ValidatorWmsManager.java    |   0
 .../validator/wms/config/ValidatorWmsContext.java   |   0
 .../wms/config/ValidatorWmsSqlContext.java          |   0
 .../wms/config/ValidatorWmsWorkspaceContext.java    |   0
 .../xplan/validator/wms/storage/PlanStorage.java    |   0
 .../xplan/validator/wms/storage/SqlPlanStorage.java |   0
 .../validator/wms/storage/WorkspacePlanStorage.java |   0
 .../configuration/validatorConfiguration.properties |   0
 .../validator/i18n/validationMessages.properties    |   0
 .../semantic/configuration/rulesMessages.properties |   0
 .../de/latlon/xplan/validator/wms/xplansyn.xml      |   0
 .../src/main/resources/jrxml/metadata.jrxml         |   0
 .../xerces/impl/msg/DOMMessages_de.properties       |   0
 .../xerces/impl/msg/DatatypeMessages_de.properties  |   0
 .../impl/msg/JAXPValidationMessages_de.properties   |   0
 .../xerces/impl/msg/SAXMessages_de.properties       |   0
 .../xerces/impl/msg/XIncludeMessages_de.properties  |   0
 .../xerces/impl/msg/XMLMessages_de.properties       |   0
 .../xerces/impl/msg/XMLSchemaMessages_de.properties |   0
 .../impl/msg/XMLSerializerMessages_de.properties    |   0
 .../xerces/impl/msg/XPointerMessages_de.properties  |   0
 .../src/main/resources/schemas/validationReport.xsd |   0
 .../src/main/resources/xslt/report.xslt             |   0
 .../latlon/xplan/validator/FeatureParserUtils.java  |   0
 .../latlon/xplan/validator/XPlanValidatorTest.java  |   0
 .../ValidatorConfigurationParserTest.java           |   0
 .../geometric/GeometricValidatorImplTest.java       |   0
 .../ParameterizedGeometricValidatorImplTest.java    |   0
 .../geometric/XPlanGeometryInspectorTest.java       |   0
 .../aenderungen/AenderungenInspectorTest.java       |   0
 .../doppelbelegung/DoppelbelegungInspectorTest.java |   0
 .../OptimisedFlaechenschlussInspectorTest.java      |   0
 .../GeltungsbereichInspectorTest.java               |   0
 .../reference/ExternalReferenceEvaluatorTest.java   |   0
 .../xplan/validator/report/ReportUtilsTest.java     |   0
 .../xplan/validator/report/ReportWriterTest.java    |   0
 .../xplan/validator/report/ValidatorDetailTest.java |   0
 .../report/html/HtmlReportGeneratorTest.java        |   0
 .../report/pdf/PdfReportGeneratorTest.java          |   0
 .../validator/report/pdf/ReportBuilderTest.java     |   0
 .../report/shapefile/ShapefileGeneratorTest.java    |   0
 .../report/xml/XmlReportGeneratorTest.java          |   0
 .../DefaultRulesMessagesAccessorTest.java           |   0
 .../FileRulesMessagesAccessorTest.java              |   0
 .../SemanticValidationOptionsTest.java              |   0
 .../SemanticValidatorConfigurationTest.java         |   0
 .../metadata/RulesVersionParserTest.java            |   0
 ...SemanticValidatorConfigurationRetrieverTest.java |   0
 .../profile/SemanticProfilesCreatorTest.java        |   0
 .../validator/semantic/profile/TestContext.java     |   0
 .../report/SemanticValidatorResultTest.java         |   0
 .../xquery/XQuerySemanticValidatorRuleTest.java     |   0
 .../xquery/XQuerySemanticValidatorTest.java         |   0
 .../ParameterizedSyntacticValidatorTest.java        |   0
 .../validator/syntactic/SyntacticValidatorTest.java |   0
 .../validator/wms/ValidatorWmsManagerTest.java      |   0
 .../xplan/validator/wms/config/TestContext.java     |   0
 .../validator/wms/storage/SqlPlanStorageTest.java   |   0
 .../validator/configuration/profile-invalidId.yaml  |   0
 .../configuration/profile-invalidName.yaml          |   0
 .../xplan/validator/configuration/profile.yaml      |   0
 .../configuration/profiles-duplicateId.yaml         |   0
 .../configuration/profiles-duplicateName.yaml       |   0
 .../xplan/validator/configuration/profiles.yaml     |   0
 .../validator/configuration/rules/rules.properties  |   0
 .../configuration/rules/version.properties          |   0
 .../configuration/validatorConfiguration.properties |   0
 .../de/latlon/xplan/validator/geometric/curve.gml   |   0
 .../geometric/duplicateControlPointRing.gml         |   0
 .../geometric/geometryOrientationInvalid.gml        |   0
 .../geometric/geometryOrientationValid.gml          |   0
 .../validator/geometric/identicalControlPoints.gml  |   0
 .../aendertPlanUndAendertPlanBereich.gml            |   0
 .../aenderungen/aendertUndWurdeGeandertVon.gml      |   0
 .../BPlan_6-0_4-5-2-4-Ueberlappung_valide.gml       |   0
 .../inspector/doppelbelegung/xplan60-4_5_2_4.gml    |   0
 .../inspector/flaechenschluss/BP_Alles_Parmis.gfs   |   0
 .../inspector/flaechenschluss/BP_Alles_Parmis.gml   |   0
 .../BPlan001_5-4_Toleranz_Geltungsbereich_0008.gml  |   0
 .../BPlan_Kompensationsbereich_6-0-2.gml            |   0
 .../BPlan_Kompensationsbereich_6-0-2_Luecke.gml     |   0
 ...Plan_Kompensationsbereich_6-0-2_Ueberlappung.gml |   0
 ...BPlan_TeilbereichAusserhalbPlanbereich_6-0-2.gml |   0
 .../BPlan_Wirksamkeit_6-0-2_invalide.gml            |   0
 .../BPlan_Wirksamkeit_6-0-2_valide.gml              |   0
 .../FNP_031545401000_Zusammenzeichnung.gml          |   0
 .../inspector/flaechenschluss/FNP_Insel-Test.gml    |   0
 .../Flaechenschluss-Test_1mm-nichtUeberlappend.gml  |   0
 .../flaechenschluss/Flaechenschluss-Test_1mm.gml    |   0
 .../flaechenschluss/Test_Insel_Luecke_5mm.gml       |   0
 .../inspector/flaechenschluss/Test_Luecke.gml       |   0
 .../V4_1_ID_103_kein-flaechenschluss.gml            |   0
 .../flaechenschluss/V4_1_ID_103_wirksamkeit.gml     |   0
 .../equalFlaechenschlussGeometries.gml              |   0
 ..._1-missing-gehoertZuBereich-multipleBereiche.gml |   0
 .../test41-54_1-missing-gehoertZuBereich.gml        |   0
 .../xplan51-5_1_4_1_Flaechenschlussfehler.gml       |   0
 .../xplan51-5_1_4_2_Flaechenschlussfehler.gml       |   0
 .../xplan51-5_5_4_2_Flaechenschlussfehler.gml       |   0
 ...Flaechenschlussfehler_Luecke_Geltungsbereich.gml |   0
 ...chenschlussfehler_vollstaendige_Ueberlappung.gml |   0
 .../xplan53-4_1_7_1_Flaechenschlussfehler.gml       |   0
 .../xplan54_Flaechenschlussfehler_Luecken.gml       |   0
 .../xplan60_Aenderungsplan_Luecke.gml               |   0
 .../xplan60_Aenderungsplan_valide.gml               |   0
 .../geltungsbereich/1_Geltungsbereich-Test.gml      |   0
 .../1_Schnittpunkte_Geltungsbereich_Polygon.gml     |   0
 .../geltungsbereich/2_Geltungsbereich-Test.gml      |   0
 .../2_Schnittpunkte_Geltungsbereich_Polygon.gml     |   0
 .../geltungsbereich/3_Geltungsbereich-Test.gml      |   0
 .../3_Schnittpunkte_Geltungsbereich_Polygon.gml     |   0
 .../geltungsbereich/4_Geltungsbereich-Test.gml      |   0
 .../4_Schnittpunkte_Geltungsbereich_Polygon.gml     |   0
 .../geltungsbereich/5_Geltungsbereich-Test.gml      |   0
 .../5_Schnittpunkte_Geltungsbereich_Linie.gml       |   0
 .../geltungsbereich/6_Geltungsbereich-Test.gml      |   0
 .../6_Schnittpunkte_Geltungsbereich_Linie.gml       |   0
 .../geltungsbereich/7_Geltungsbereich-Test.gml      |   0
 .../7_Schnittpunkte_Geltungsbereich_Linie.gml       |   0
 .../8_Schnittpunkte_Geltungsbereich_Linie.gml       |   0
 .../geltungsbereich/BPlan001_5-4_Sliver-Polygon.gml |   0
 .../BPlan002_5-2_Schnittpunkt_Geltungsbereich.gml   |   0
 .../BPlan_Kompensationsbereich_6-0-2_valide.gml     |   0
 .../BPlan_Teilbereich_6-0-2_invalide.gml            |   0
 ...fenCity11_HafenCity14_Bereich_ohne_Geometrie.gml |   0
 ...ystematischeGeltungsbereichspruefung_GPundGB.jpg | Bin
 .../Testplan_position_geltungsbereich.gml           |   0
 .../Testplan_position_geltungsbereichLoch.gml       |   0
 .../geltungsbereich/V4_1_ID_103_withtolerance.gml   |   0
 ..._1-missing-gehoertZuBereich-multipleBereiche.gml |   0
 .../test41-54_1-missing-gehoertZuBereich.gml        |   0
 .../geometric/invalidSelfintersectionDeteced.gml    |   0
 .../validator/geometric/multiSurface-covering.gml   |   0
 .../geometric/multiSurface-intersection.gml         |   0
 .../multiSurface-intersectionInIntersection.gml     |   0
 .../validator/geometric/multiSurface-touches.gml    |   0
 .../xplan/validator/geometric/multiSurface.gml      |   0
 .../geometric/polygon-orientation-invalid.gml       |   0
 .../geometric/polygonWithInteriorRing-touching.gml  |   0
 .../validator/geometric/polygonWithInteriorRing.gml |   0
 .../geometric/polygonWithInteriorRings-touching.gml |   0
 .../selfIntersectingRIng-2intersections.gml         |   0
 .../geometric/selfIntersectingRing-samePoint.gml    |   0
 .../validator/geometric/selfIntersectingRing.gml    |   0
 .../de/latlon/xplan/validator/geometric/surface.gml |   0
 .../semantic/configuration/xquery/rules/exists.xq   |   0
 .../configuration/xquery/rules/falseStatement.xq    |   0
 .../xquery/rules/gmlId-warningsAndErrors.xq         |   0
 .../semantic/configuration/xquery/rules/gmlId.xq    |   0
 .../semantic/configuration/xquery/rules/gmlIds.xq   |   0
 .../configuration/xquery/rules/so/SOignore.unrule   |   0
 .../configuration/xquery/rules/so/SOignore.xq       |   0
 .../semantic/configuration/xquery/rules/sub/Sub.xq  |   0
 .../configuration/xquery/rules/xplangml40/hello.xq  |   0
 .../configuration/xquery/rules/xplangml41/41.xq     |   0
 .../xquery/rules/xplangml41/xp/41_XPignore.xq       |   0
 .../rules/xplangml41/xp/subXp/41_XPignore_Sub.xq    |   0
 .../xplan/validator/semantic/xquery/5.0/BP2070.gml  |   0
 .../BP_GemeinschaftsanlagenZuordnung-LineString.gml |   0
 ...nlagenZuordnung-Polygon-flaechenschlussFalse.gml |   0
 ...anlagenZuordnung-Polygon-flaechenschlussTrue.gml |   0
 .../xquery/5.0/BP_Landwirtschaft-LineString.gml     |   0
 ..._Landwirtschaft-Polygon-flaechenschlussFalse.gml |   0
 ...P_Landwirtschaft-Polygon-flaechenschlussTrue.gml |   0
 .../semantic/xquery/5.0/Demo-bereich-invalid.gml    |   0
 .../xquery/5.0/Demo-gehoertZuBereich-invalid.gml    |   0
 .../xquery/5.0/Demo-gehoertZuPlan-invalid.gml       |   0
 .../semantic/xquery/5.0/Demo-planinhalt-invalid.gml |   0
 .../5.0/Demo-refBegruendungInhalt-invalid.gml       |   0
 .../xplan/validator/semantic/xquery/5.0/Demo.gml    |   0
 .../xplan/validator/semantic/xquery/5.0/FPlan.gml   |   0
 .../xplan/validator/semantic/xquery/5.0/LA67.gml    |   0
 .../validator/semantic/xquery/5.0/V4_1_ID_103.gml   |   0
 ...BindungErhaltung-Polygon-flaechenschlussTrue.xml |   0
 .../BP_BaugebietsTeilFlaeche-GFZ_GF_GRZ_GZ.xml      |   0
 ...BP_NebenanlagenFlaeche-mehrfacheZBUndWeitere.xml |   0
 .../xquery/BP_NebenanlagenFlaeche-nurWeitereZB.xml  |   0
 ...dlicheVormerkung-Polygon-flaechenschlussTrue.xml |   0
 .../BP_Wegerecht-Polygon-flaechenschlussFehlt.xml   |   0
 .../XP_PPO-positionPoint-keinFlaechenschluss.xml    |   0
 .../semantic/xquery/inhaltBPPlan-referenziertSO.xml |   0
 .../xplan/validator/semantic/xquery/xplan.gml       |   0
 .../src/test/resources/log4j2-test.yaml             |   0
 .../src/test/resources/profiles-test1.yml           |   0
 .../src/test/resources/profiles-test2.yaml          |   0
 .../src/xjc/bindings.xjc                            |   0
 xplan-dokumente/xplan-dokumente-api/pom.xml         |   2 +-
 xplan-manager/xplan-manager-api/pom.xml             |   2 +-
 xplan-manager/xplan-manager-web/pom.xml             |   6 +++---
 xplan-validator/xplan-validator-api/pom.xml         |   2 +-
 xplan-validator/xplan-validator-web/pom.xml         |   6 +++---
 727 files changed, 52 insertions(+), 56 deletions(-)
 rename xplan-core/{xplan-commons-cli => xplan-core-cli}/pom.xml (93%)
 rename xplan-core/{xplan-commons-cli => xplan-core-cli}/src/main/java/de/latlon/xplan/commons/cli/DatabaseUtils.java (100%)
 rename xplan-core/{xplan-commons-cli => xplan-core-cli}/src/main/java/de/latlon/xplan/commons/cli/Operation.java (100%)
 rename xplan-core/{xplan-commons-cli => xplan-core-cli}/src/main/java/de/latlon/xplan/commons/cli/SynchronizationException.java (100%)
 rename xplan-core/{xplan-commons-cli => xplan-core-cli}/src/main/java/de/latlon/xplan/commons/cli/SynchronizeAllExecutor.java (100%)
 rename xplan-core/{xplan-commons-cli => xplan-core-cli}/src/main/java/de/latlon/xplan/commons/cli/SynchronizeExecutor.java (100%)
 rename xplan-core/{xplan-commons-cli => xplan-core-cli}/src/main/java/de/latlon/xplan/commons/cli/Synchronizer.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/pom.xml (98%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/XPlanSchemas.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/XPlanType.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/XPlanVersion.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/ArchiveEntry.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/ArchiveMetadata.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/ArchiveZipEntry.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/ArtefactEntry.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/LocalCenterToDistrictMapper.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/MainZipEntry.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/SemanticValidableXPlanArchive.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/XPlanArchive.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveContentAccess.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveCreator.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlReader.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlWriterFilter.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/XPlanPartArchive.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/archive/ZipEntryWithContent.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/configuration/AbstractPropertiesLoader.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/configuration/ConfigurationDirectoryPropertiesLoader.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/configuration/DefaultPropertiesLoader.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/configuration/PropertiesLoader.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfiguration.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/configuration/SortConfiguration.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoader.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionParseException.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/MultipleInstanceParser.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/OrientationFixer.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/SortPropertyReader.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/WfsFeatureInputStream.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollection.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollectionBuilder.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollections.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParser.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParserBuilder.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/XPlanMultipleInstanceFeatureCollection.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/feature/XPlanSingleInstanceFeatureCollection.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/hale/HaleIOProvider.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/hale/HaleTransformer.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/hale/TransformationException.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/jts/JtsParser.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/reference/ExternalReference.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfo.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfoBuilder.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceScanner.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/synthesizer/Features.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/util/ContentTypeChecker.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/util/FeatureCollectionUtils.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/util/MimeTypeDetector.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/util/TextPatternConstants.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/util/UnsupportedContentTypeException.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/commons/util/XPlanVersionUtils.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/AdditionalPlanData.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/AuthorizationInfo.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/Bereich.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/ConfigurationException.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/PlanNameWithStatusResult.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/PlanStatus.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/RasterEvaluationResult.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/Rechtsstand.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/XPlan.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/AbstractReference.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/BaseData.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/Change.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/ChangeType.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/ExterneReferenzArt.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/MimeTypes.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterBasis.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReference.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReferenceType.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/Reference.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/ReferenceType.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/Text.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterType.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/validator/web/shared/ArtifactType.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewMetadata.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/validator/web/shared/ValidationOption.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSettings.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/validator/web/shared/ValidationType.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/de/latlon/xplan/validator/web/shared/XPlanEnvelope.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/org/deegree/gml/XPlanGmlFeatureWriter.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/java/org/deegree/gml/XPlanGmlWriter.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/resources/de/latlon/xplan/commons/minimalist-format.json (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/resources/de/latlon/xplan/commons/util/contentTypeChecker.properties (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/resources/de/latlon/xplan/manager/XPlanManagerCore.gwt.xml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/resources/de/latlon/xplan/validator/XPlanValidatorCore.gwt.xml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/archive/Blankenese29_Test_60_withEntity.zip (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-asWfsFeatureCollection.gml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-noXPlanGmlCollection.gml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationInvalid.gml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationValid.gml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection-additionalObjects.gml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection.gml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withUnreferenced.gml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withVerbundenerPlan.gml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances.gml (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.pgw (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.png (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60.zip (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60_InvalidContent.zip (100%)
 rename xplan-core/{xplan-commons => xplan-core-commons}/src/test/resources/de/latlon/xplan/commons/util/test.odt (100%)
 rename xplan-core/{xplan-inspireplu-transformation => xplan-core-inspireplu}/pom.xml (91%)
 rename xplan-core/{xplan-inspireplu-transformation => xplan-core-inspireplu}/src/main/java/de/latlon/xplan/inspire/plu/transformation/InspirePluTransformator.java (100%)
 rename xplan-core/{xplan-inspireplu-transformation => xplan-core-inspireplu}/src/main/java/de/latlon/xplan/inspire/plu/transformation/hale/HaleCliInspirePluTransformator.java (100%)
 rename xplan-core/{xplan-inspireplu-transformation => xplan-core-inspireplu}/src/test/java/de/latlon/xplan/inspire/plu/transformation/HaleCliInspirePluTransformatorTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/pom.xml (96%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/CategoryMapper.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/CrsUtils.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/XPlanManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/configuration/ConfigurationException.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/configuration/CoupledResourceConfiguration.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/configuration/InternalIdRetrieverConfiguration.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfiguration.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfigurationAnalyser.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/AmbiguousBereichNummernException.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/DatabaseUtils.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/ManagerWorkspaceWrapper.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/PlanNotFoundException.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/XPlanInspirePluAdapter.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/XPlanManagerDao.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/XPlanSynWfsAdapter.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/XPlanVersionAndPlanStatus.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/database/XPlanWfsAdapter.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/document/DocumentStorage.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/document/XPlanDocumentManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/document/config/DocumentStorageContext.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/document/s3/S3DocumentStorage.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/document/s3/config/AmazonS3DocumentStorageContext.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/edit/ArtefactType.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/edit/EditException.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/edit/EditType.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/edit/EditedArtefact.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/edit/EditedArtefacts.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/edit/ExternalReferenceUtils.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/edit/XPlanManipulator.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/export/XPlanExportException.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/export/XPlanExporter.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublishException.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublisher.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/internalid/InternalIdRetriever.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/log/SystemLog.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/metadata/DataServiceCouplingException.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandler.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriter.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/metadata/TemplateXmlStreamWriterFilter.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/metadata/csw/CswClient.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/metadata/csw/PlanRecordMetadata.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadata.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilder.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/StorageCleanUpManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/StorageEvent.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/filesystem/listener/FilesystemTransactionListener.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/s3/S3Metadata.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/s3/S3Object.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/s3/S3Storage.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3Context.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/storage/s3/listener/S3TransactionListener.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/AttachmentUrlHandler.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/PlanImportData.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/TransactionUtils.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/UnsupportPlanException.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/XPlanDeleteManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/XPlanInsertManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanDeleteService.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanEditService.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanInsertService.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transformation/HaleXplan41ToXplan51Transformer.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transformation/TransformationResult.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/transformation/XPlanGmlTransformer.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsThemesConfig.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorter.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationType.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterUtils.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapter.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/ConfigWriterUtils.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GdalRasterEvaluation.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GeotiffRasterEvaluation.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/RasterEvaluation.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluator.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/RasterStorage.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/StorageException.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorage.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/AmazonS3RasterStorageContext.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapper.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceException.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloadAction.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloader.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderConfiguration.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/main/resources/de/latlon/xplan/manager/configuration/managerConfiguration.properties (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/CategoryMapperTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/config/CoreTestContext.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/configuration/ManagerConfigurationTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/edit/ExternalReferenceUtilsTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/internalid/InternalIdRetrieverTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandlerTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriterTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/metadata/csw/CswClientTestManual.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilderTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManagerTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3TestContext.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/storage/s3/config/S3StorageTestContext.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/wmsconfig/ConfigWriterUtilsTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorterTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManagerTestManual.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluatorTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/S3RasterStorageTestContext.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapperTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceUtilsTest.java (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan41/Eidelstedt_4_V4-Blankenese.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_references.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_texts.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan50/BP2070.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan50/V4_1_ID_103.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan51/BP2070.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103_refScan.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan53/BPlan_ohneBereich.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/metadata/iso-service-metadata-example-template.xml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.tiff (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.wld (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled.tiff (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled_epsg4326.tiff (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png.aux.xml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_nocrs.png (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/test.txt (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/log4j2-test.yaml (100%)
 rename xplan-core/{xplan-manager-core => xplan-core-manager}/src/test/resources/s3Mock.properties (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/LICENSE_UNKNOWN.txt (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/pom.xml (95%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/dictionary/XPlanCodelists.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaries.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesParser.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionary.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaryEntry.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactory.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizer.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/PlanContext.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/RuleParser.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizer.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Expression.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/LatestDate.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/StringConstant.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGeometry.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGmlDescription.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanName.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanType.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Xpath.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteile.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlName.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/AbstractXPlanDictionaryLookup.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanEnumerationLookup.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanExternalCodeLookup.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/AbstractFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/DefaultFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/Flattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/XplanFlattenProperty.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/DataTypeFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/FlattenerProperty.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/AbstractTextlicherAbschnittFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpExterneReferenzFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpGenerAttributFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpRasterplanFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpVerfahrensMerkmalFlattener.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/Ausrichtung.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/GeometryTypeAbbreviation.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/PraesentationsobjektLookup.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookup.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookup.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookup.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributeProperty.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParser.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyType.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/rules/SynRulesAccessor.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparator.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/java/de/latlon/xplan/manager/synthesizer/utils/CastUtils.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/enumeration/XPlanGML_4_0_Enumerationen.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/enumeration/XPlanGML_5_0_Enumerationen.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/enumeration/XPlanGML_5_1_Enumerationen.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/enumeration/XPlanGML_5_2_Enumerationen.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/enumeration/XPlanGML_5_3_Enumerationen.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/enumeration/XPlanGML_5_4_Enumerationen.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/enumeration/XPlanGML_6_0_2_Enumerationen.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/enumeration/XPlanGML_Enumerationen_4_1.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/featuretypes/renamedFeatureTypes.properties (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/flattener/complexFlattener.yaml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/junit-platform.properties (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/rules/xplan40.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/rules/xplan41.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/rules/xplan50.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/rules/xplan51.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/rules/xplan52.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/rules/xplan53.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/rules/xplan54.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/main/resources/rules/xplan60.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/dictionary/XPlanCodelistsTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactoryTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizerTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/RuleParserTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerComparisonTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerConcurrencyTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan40Test.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan41Test.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan50Test.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan51Test.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan52Test.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/LatestDateTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/StringConstantTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XpathTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteileTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanFlattenPropertyTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGeometryTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlDescriptionTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlNameTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XplanEnumerationLookupTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattenerTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattenerTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattenerTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattenerTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AusrichtungTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookupTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookupTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookupTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParserTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparatorTest.java (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/HafenCity7.gml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/Rotherbaum27.gml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/dictionary/exampleCodelist.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/BP_DetailArtDerBaulNutzung.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan4.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan5.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/FeatureWithCurve.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/MultipleDates.gml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/Praesentationsobjekte.gml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BP_KomplexeZweckbestGruen.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BpDachgestaltung.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpSPEMassnahmenDaten.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittFlattener.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittWithRefText.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpVerbundenerPlanFlattener.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan40.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan41.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan50.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan53.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan60.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2070.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2135.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA22.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA67.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2070.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2135.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA22.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA67.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2070.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2135.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA22.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA67.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2070.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2135.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA22.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA67.xml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4.gml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4_ohneErstellungsMassstab.gml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan003_4-1.gml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/FP_5-2_PPO-Test.gml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/Test_PPO_index-1.gml (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_BP_DetailArtDerBaulNutzung.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_XP_BesondereArtDerBaulNutzung.syn (100%)
 rename xplan-core/{xplan-synthesizer => xplan-core-synthesizer}/src/test/resources/log4j2-test.yaml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/LICENSE_UNKNOWN.txt (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/pom.xml (98%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/ValidationType.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/ValidatorException.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/XPlanValidator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfiguration.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParser.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/configuration/ValidatorProfile.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidatorImpl.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspector.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/GeometricFeatureInspector.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/InvalidGeometryException.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspector.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspector.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/ControlPoint.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussContext.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussFeatureInspector.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussTolerance.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichFeatureAnalyser.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspector.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorContext.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/AbstractGeltungsbereichFeature.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/BereichFeature.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeatureUnderTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeaturesUnderTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/GeltungsbereichFeature.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/InspectorContext.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/PlanFeature.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/report/BadGeometry.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/geometric/report/GeometricValidatorResult.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/i18n/ValidationMessages.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/ReportArchiveGenerator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/ReportGenerationException.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/ReportUtils.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/ReportWriter.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/ValidatorDetail.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/ValidatorResult.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/html/HtmlReportGenerator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/pdf/PdfReportGenerator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/pdf/ReportBuilder.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/pdf/Templates.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceReport.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceStatus.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileBuilder.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileGenerator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/xml/JaxbConverter.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/report/xml/XmlReportGenerator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidatorRule.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesConfiguration.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesMainConfiguration.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesProfileConfiguration.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptions.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfiguration.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationRetriever.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/DefaultRulesMessagesAccessor.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/FileRulesMessagesAccessor.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/RulesMessagesAccessor.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesMetadata.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersion.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParser.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetriever.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/profile/DelegatingSemanticProfileValidator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfileValidator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfiles.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidFeaturesResult.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidRuleResult.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/report/RuleResult.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResult.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/report/ValidationResultType.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRule.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidator.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorImpl.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/syntactic/report/SyntacticValidatorResult.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/wms/MapPreviewCreationException.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/wms/MapPreviewManager.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/wms/MasterportalConfigWriter.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsContext.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsSqlContext.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/wms/storage/PlanStorage.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorage.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/java/de/latlon/xplan/validator/wms/storage/WorkspacePlanStorage.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/de/latlon/xplan/validator/i18n/validationMessages.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/de/latlon/xplan/validator/semantic/configuration/rulesMessages.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/de/latlon/xplan/validator/wms/xplansyn.xml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/jrxml/metadata.jrxml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/org/apache/xerces/impl/msg/DOMMessages_de.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/org/apache/xerces/impl/msg/DatatypeMessages_de.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/org/apache/xerces/impl/msg/JAXPValidationMessages_de.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/org/apache/xerces/impl/msg/SAXMessages_de.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/org/apache/xerces/impl/msg/XIncludeMessages_de.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/org/apache/xerces/impl/msg/XMLMessages_de.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/org/apache/xerces/impl/msg/XMLSchemaMessages_de.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/org/apache/xerces/impl/msg/XMLSerializerMessages_de.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/org/apache/xerces/impl/msg/XPointerMessages_de.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/schemas/validationReport.xsd (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/main/resources/xslt/report.xslt (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParserTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspectorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspectorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspectorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspectorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/report/ReportUtilsTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/report/ReportWriterTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/report/ValidatorDetailTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/report/html/HtmlReportGeneratorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/report/pdf/PdfReportGeneratorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/report/pdf/ReportBuilderTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/report/xml/XmlReportGeneratorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/configuration/DefaultRulesMessagesAccessorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/configuration/FileRulesMessagesAccessorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptionsTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParserTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetrieverTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreatorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/profile/TestContext.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResultTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/wms/config/TestContext.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidId.yaml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidName.yaml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/configuration/profile.yaml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateId.yaml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateName.yaml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/configuration/profiles.yaml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/configuration/rules/rules.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/configuration/rules/version.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/curve.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/duplicateControlPointRing.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationInvalid.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationValid.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/identicalControlPoints.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertPlanUndAendertPlanBereich.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertUndWurdeGeandertVon.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/BPlan_6-0_4-5-2-4-Ueberlappung_valide.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/xplan60-4_5_2_4.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gfs (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan001_5-4_Toleranz_Geltungsbereich_0008.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Luecke.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Ueberlappung.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_TeilbereichAusserhalbPlanbereich_6-0-2.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_invalide.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_valide.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_031545401000_Zusammenzeichnung.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_Insel-Test.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm-nichtUeberlappend.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Insel_Luecke_5mm.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Luecke.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_kein-flaechenschluss.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_wirksamkeit.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/equalFlaechenschlussGeometries.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_1_Flaechenschlussfehler.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_2_Flaechenschlussfehler.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_5_4_2_Flaechenschlussfehler.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_Luecke_Geltungsbereich.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_vollstaendige_Ueberlappung.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan53-4_1_7_1_Flaechenschlussfehler.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan54_Flaechenschlussfehler_Luecken.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_Luecke.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_valide.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Geltungsbereich-Test.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Schnittpunkte_Geltungsbereich_Polygon.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Geltungsbereich-Test.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Schnittpunkte_Geltungsbereich_Polygon.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Geltungsbereich-Test.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Schnittpunkte_Geltungsbereich_Polygon.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Geltungsbereich-Test.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Schnittpunkte_Geltungsbereich_Polygon.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Geltungsbereich-Test.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Schnittpunkte_Geltungsbereich_Linie.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Geltungsbereich-Test.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Schnittpunkte_Geltungsbereich_Linie.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Geltungsbereich-Test.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Schnittpunkte_Geltungsbereich_Linie.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/8_Schnittpunkte_Geltungsbereich_Linie.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan001_5-4_Sliver-Polygon.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan002_5-2_Schnittpunkt_Geltungsbereich.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Kompensationsbereich_6-0-2_valide.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Teilbereich_6-0-2_invalide.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/HafenCity11_HafenCity14_Bereich_ohne_Geometrie.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/SystematischeGeltungsbereichspruefung_GPundGB.jpg (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereich.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereichLoch.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/V4_1_ID_103_withtolerance.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/invalidSelfintersectionDeteced.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-covering.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersection.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersectionInIntersection.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-touches.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/polygon-orientation-invalid.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing-touching.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRings-touching.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRIng-2intersections.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing-samePoint.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/geometric/surface.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/exists.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/falseStatement.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId-warningsAndErrors.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlIds.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.unrule (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/sub/Sub.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml40/hello.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/41.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/41_XPignore.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/subXp/41_XPignore_Sub.xq (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP2070.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-LineString.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussFalse.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussTrue.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-LineString.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussFalse.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussTrue.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-bereich-invalid.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuBereich-invalid.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuPlan-invalid.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-planinhalt-invalid.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-refBegruendungInhalt-invalid.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/FPlan.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/LA67.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/V4_1_ID_103.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_AnpflanzungBindungErhaltung-Polygon-flaechenschlussTrue.xml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_BaugebietsTeilFlaeche-GFZ_GF_GRZ_GZ.xml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-mehrfacheZBUndWeitere.xml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-nurWeitereZB.xml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_UnverbindlicheVormerkung-Polygon-flaechenschlussTrue.xml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_Wegerecht-Polygon-flaechenschlussFehlt.xml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/XP_PPO-positionPoint-keinFlaechenschluss.xml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/inhaltBPPlan-referenziertSO.xml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/de/latlon/xplan/validator/semantic/xquery/xplan.gml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/log4j2-test.yaml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/profiles-test1.yml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/test/resources/profiles-test2.yaml (100%)
 rename xplan-core/{xplan-validator-core => xplan-core-validator}/src/xjc/bindings.xjc (100%)

diff --git a/pom.xml b/pom.xml
index 3d86aa68a5..4a3b2b00c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1100,23 +1100,23 @@
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>xplan-commons</artifactId>
+        <artifactId>xplan-core-commons</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>xplan-commons</artifactId>
+        <artifactId>xplan-core-commons</artifactId>
         <classifier>sources</classifier>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>xplan-commons-cli</artifactId>
+        <artifactId>xplan-core-cli</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>xplan-validator-core</artifactId>
+        <artifactId>xplan-core-validator</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -1137,7 +1137,7 @@
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>xplan-manager-core</artifactId>
+        <artifactId>xplan-core-manager</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -1152,7 +1152,7 @@
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>xplan-inspireplu-transformation</artifactId>
+        <artifactId>xplan-core-inspireplu</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
diff --git a/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml b/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
index d883c4a86d..16579eba64 100644
--- a/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
+++ b/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
@@ -111,7 +111,7 @@
     </dependency>
     <dependency>
       <groupId>de.latlon.product.xplanbox</groupId>
-      <artifactId>xplan-commons-cli</artifactId>
+      <artifactId>xplan-core-cli</artifactId>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
diff --git a/xplan-cli/xplan-manager-cli/pom.xml b/xplan-cli/xplan-manager-cli/pom.xml
index e73362a09f..3c4754fda1 100644
--- a/xplan-cli/xplan-manager-cli/pom.xml
+++ b/xplan-cli/xplan-manager-cli/pom.xml
@@ -101,18 +101,15 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-manager-core</artifactId>
-      <version>${project.version}</version>
+      <artifactId>xplan-core-manager</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
-      <version>${project.version}</version>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-validator-core</artifactId>
-      <version>${project.version}</version>
+      <artifactId>xplan-core-validator</artifactId>
     </dependency>
     <dependency>
       <groupId>de.latlon</groupId>
diff --git a/xplan-cli/xplan-transform-cli/pom.xml b/xplan-cli/xplan-transform-cli/pom.xml
index 70162eb8e2..165017bf1c 100644
--- a/xplan-cli/xplan-transform-cli/pom.xml
+++ b/xplan-cli/xplan-transform-cli/pom.xml
@@ -100,15 +100,15 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-manager-core</artifactId>
+      <artifactId>xplan-core-manager</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons-cli</artifactId>
+      <artifactId>xplan-core-cli</artifactId>
     </dependency>
     <dependency>
       <groupId>de.latlon</groupId>
diff --git a/xplan-cli/xplan-update-data-cli/pom.xml b/xplan-cli/xplan-update-data-cli/pom.xml
index bec2b00f17..302a50a808 100644
--- a/xplan-cli/xplan-update-data-cli/pom.xml
+++ b/xplan-cli/xplan-update-data-cli/pom.xml
@@ -113,11 +113,11 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-manager-core</artifactId>
+      <artifactId>xplan-core-manager</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>de.latlon</groupId>
diff --git a/xplan-cli/xplan-validatedb-cli/pom.xml b/xplan-cli/xplan-validatedb-cli/pom.xml
index 996707a836..f2706c57ed 100644
--- a/xplan-cli/xplan-validatedb-cli/pom.xml
+++ b/xplan-cli/xplan-validatedb-cli/pom.xml
@@ -99,15 +99,15 @@
   <dependencies>
     <dependency>
       <groupId>de.latlon.product.xplanbox</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>de.latlon.product.xplanbox</groupId>
-      <artifactId>xplan-manager-core</artifactId>
+      <artifactId>xplan-core-manager</artifactId>
     </dependency>
     <dependency>
       <groupId>de.latlon.product.xplanbox</groupId>
-      <artifactId>xplan-validator-core</artifactId>
+      <artifactId>xplan-core-validator</artifactId>
       <exclusions>
         <exclusion>
           <groupId>de.latlon.product.xplanbox</groupId>
diff --git a/xplan-cli/xplan-validator-cli/pom.xml b/xplan-cli/xplan-validator-cli/pom.xml
index 5502f6c7fd..96ec66ac85 100644
--- a/xplan-cli/xplan-validator-cli/pom.xml
+++ b/xplan-cli/xplan-validator-cli/pom.xml
@@ -88,7 +88,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-validator-core</artifactId>
+      <artifactId>xplan-core-validator</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/xplan-core/pom.xml b/xplan-core/pom.xml
index 69db45f91a..d3ceb01e78 100644
--- a/xplan-core/pom.xml
+++ b/xplan-core/pom.xml
@@ -13,16 +13,16 @@
 
   <modules>
     <module>xplan-core-api</module>
+    <module>xplan-core-cli</module>
+    <module>xplan-core-commons</module>
     <module>xplan-core-gwt</module>
-    <module>xplan-commons</module>
-    <module>xplan-inspireplu-transformation</module>
-    <module>xplan-manager-core</module>
-    <module>xplan-synthesizer</module>
-    <module>xplan-validator-core</module>
-    <module>xplan-commons-cli</module>
+    <module>xplan-core-inspireplu</module>
     <module>xplan-core-job</module>
+    <module>xplan-core-manager</module>
     <module>xplan-core-manager-db</module>
     <module>xplan-core-manager-deegree</module>
+    <module>xplan-core-synthesizer</module>
+    <module>xplan-core-validator</module>
   </modules>
 
 </project>
diff --git a/xplan-core/xplan-core-api/pom.xml b/xplan-core/xplan-core-api/pom.xml
index 7e1dfe8e11..c534aa2b7d 100644
--- a/xplan-core/xplan-core-api/pom.xml
+++ b/xplan-core/xplan-core-api/pom.xml
@@ -13,7 +13,7 @@
   <dependencies>
     <dependency>
       <groupId>de.latlon.product.xplanbox</groupId>
-      <artifactId>xplan-validator-core</artifactId>
+      <artifactId>xplan-core-validator</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
diff --git a/xplan-core/xplan-commons-cli/pom.xml b/xplan-core/xplan-core-cli/pom.xml
similarity index 93%
rename from xplan-core/xplan-commons-cli/pom.xml
rename to xplan-core/xplan-core-cli/pom.xml
index 1d187bd3c0..7557109807 100644
--- a/xplan-core/xplan-commons-cli/pom.xml
+++ b/xplan-core/xplan-core-cli/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>xplan-commons-cli</artifactId>
+  <artifactId>xplan-core-cli</artifactId>
   <description>Commons Paket fuer CLIs</description>
 
   <parent>
diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/DatabaseUtils.java b/xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/DatabaseUtils.java
similarity index 100%
rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/DatabaseUtils.java
rename to xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/DatabaseUtils.java
diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/Operation.java b/xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/Operation.java
similarity index 100%
rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/Operation.java
rename to xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/Operation.java
diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizationException.java b/xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizationException.java
similarity index 100%
rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizationException.java
rename to xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizationException.java
diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeAllExecutor.java b/xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeAllExecutor.java
similarity index 100%
rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeAllExecutor.java
rename to xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeAllExecutor.java
diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeExecutor.java b/xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeExecutor.java
similarity index 100%
rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeExecutor.java
rename to xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/SynchronizeExecutor.java
diff --git a/xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/Synchronizer.java b/xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/Synchronizer.java
similarity index 100%
rename from xplan-core/xplan-commons-cli/src/main/java/de/latlon/xplan/commons/cli/Synchronizer.java
rename to xplan-core/xplan-core-cli/src/main/java/de/latlon/xplan/commons/cli/Synchronizer.java
diff --git a/xplan-core/xplan-commons/pom.xml b/xplan-core/xplan-core-commons/pom.xml
similarity index 98%
rename from xplan-core/xplan-commons/pom.xml
rename to xplan-core/xplan-core-commons/pom.xml
index 0f03104757..6ba4599f46 100644
--- a/xplan-core/xplan-commons/pom.xml
+++ b/xplan-core/xplan-core-commons/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>xplan-commons</artifactId>
+  <artifactId>xplan-core-commons</artifactId>
   <packaging>jar</packaging>
   <description>Commons Paket fuer XPlan Manager und XPlan Validator</description>
 
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanSchemas.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanSchemas.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanSchemas.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanSchemas.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanType.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanType.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanType.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanVersion.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanVersion.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/XPlanVersion.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/XPlanVersion.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveEntry.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveEntry.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveEntry.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveEntry.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveMetadata.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveMetadata.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveMetadata.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveMetadata.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveZipEntry.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveZipEntry.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveZipEntry.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArchiveZipEntry.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArtefactEntry.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArtefactEntry.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ArtefactEntry.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ArtefactEntry.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/LocalCenterToDistrictMapper.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/LocalCenterToDistrictMapper.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/LocalCenterToDistrictMapper.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/LocalCenterToDistrictMapper.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/MainZipEntry.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/MainZipEntry.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/MainZipEntry.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/MainZipEntry.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/SemanticValidableXPlanArchive.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/SemanticValidableXPlanArchive.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/SemanticValidableXPlanArchive.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/SemanticValidableXPlanArchive.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchive.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchive.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchive.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchive.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveContentAccess.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveContentAccess.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveContentAccess.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveContentAccess.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveCreator.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveCreator.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveCreator.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanArchiveCreator.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlReader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlReader.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlReader.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlReader.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlWriterFilter.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlWriterFilter.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlWriterFilter.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanGmlWriterFilter.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanPartArchive.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanPartArchive.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanPartArchive.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/XPlanPartArchive.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ZipEntryWithContent.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ZipEntryWithContent.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/archive/ZipEntryWithContent.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/archive/ZipEntryWithContent.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/AbstractPropertiesLoader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/AbstractPropertiesLoader.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/AbstractPropertiesLoader.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/AbstractPropertiesLoader.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/ConfigurationDirectoryPropertiesLoader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/ConfigurationDirectoryPropertiesLoader.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/ConfigurationDirectoryPropertiesLoader.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/ConfigurationDirectoryPropertiesLoader.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/DefaultPropertiesLoader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/DefaultPropertiesLoader.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/DefaultPropertiesLoader.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/DefaultPropertiesLoader.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/PropertiesLoader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/PropertiesLoader.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/PropertiesLoader.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/PropertiesLoader.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfiguration.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfiguration.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfiguration.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfiguration.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SortConfiguration.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SortConfiguration.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SortConfiguration.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SortConfiguration.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoader.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoader.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoader.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulator.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionParseException.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionParseException.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionParseException.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/FeatureCollectionParseException.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/MultipleInstanceParser.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/MultipleInstanceParser.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/MultipleInstanceParser.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/MultipleInstanceParser.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/OrientationFixer.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/OrientationFixer.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/OrientationFixer.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/OrientationFixer.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/SortPropertyReader.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/SortPropertyReader.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/SortPropertyReader.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/SortPropertyReader.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/WfsFeatureInputStream.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/WfsFeatureInputStream.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/WfsFeatureInputStream.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/WfsFeatureInputStream.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollection.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollection.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollection.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollection.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollectionBuilder.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollectionBuilder.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollectionBuilder.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollectionBuilder.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollections.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollections.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollections.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanFeatureCollections.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParser.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParser.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParser.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParser.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParserBuilder.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParserBuilder.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParserBuilder.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanGmlParserBuilder.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanMultipleInstanceFeatureCollection.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanMultipleInstanceFeatureCollection.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanMultipleInstanceFeatureCollection.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanMultipleInstanceFeatureCollection.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanSingleInstanceFeatureCollection.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanSingleInstanceFeatureCollection.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanSingleInstanceFeatureCollection.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/feature/XPlanSingleInstanceFeatureCollection.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/HaleIOProvider.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/HaleIOProvider.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/HaleIOProvider.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/HaleIOProvider.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/HaleTransformer.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/HaleTransformer.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/HaleTransformer.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/HaleTransformer.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/TransformationException.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/TransformationException.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/hale/TransformationException.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/hale/TransformationException.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/jts/JtsParser.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/jts/JtsParser.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/jts/JtsParser.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/jts/JtsParser.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReference.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReference.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReference.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReference.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfo.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfo.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfo.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfo.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfoBuilder.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfoBuilder.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfoBuilder.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceInfoBuilder.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceScanner.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceScanner.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceScanner.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/reference/ExternalReferenceScanner.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/synthesizer/Features.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/synthesizer/Features.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/synthesizer/Features.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/synthesizer/Features.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/ContentTypeChecker.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/ContentTypeChecker.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/ContentTypeChecker.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/ContentTypeChecker.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/FeatureCollectionUtils.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/FeatureCollectionUtils.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/FeatureCollectionUtils.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/FeatureCollectionUtils.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/MimeTypeDetector.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/MimeTypeDetector.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/MimeTypeDetector.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/MimeTypeDetector.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/TextPatternConstants.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/TextPatternConstants.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/TextPatternConstants.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/TextPatternConstants.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/UnsupportedContentTypeException.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/UnsupportedContentTypeException.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/UnsupportedContentTypeException.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/UnsupportedContentTypeException.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/XPlanVersionUtils.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/XPlanVersionUtils.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/commons/util/XPlanVersionUtils.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/commons/util/XPlanVersionUtils.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/AdditionalPlanData.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/AdditionalPlanData.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/AdditionalPlanData.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/AdditionalPlanData.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/AuthorizationInfo.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/AuthorizationInfo.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/AuthorizationInfo.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/AuthorizationInfo.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/Bereich.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/Bereich.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/Bereich.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/Bereich.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/ConfigurationException.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/ConfigurationException.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/ConfigurationException.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/ConfigurationException.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanNameWithStatusResult.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanNameWithStatusResult.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanNameWithStatusResult.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanNameWithStatusResult.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanStatus.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanStatus.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanStatus.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/PlanStatus.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/RasterEvaluationResult.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/RasterEvaluationResult.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/RasterEvaluationResult.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/RasterEvaluationResult.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/Rechtsstand.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/Rechtsstand.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/Rechtsstand.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/Rechtsstand.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/XPlan.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/XPlan.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/XPlan.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/XPlan.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/AbstractReference.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/AbstractReference.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/AbstractReference.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/AbstractReference.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/BaseData.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/BaseData.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/BaseData.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/BaseData.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Change.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Change.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Change.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Change.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ChangeType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ChangeType.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ChangeType.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ChangeType.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ExterneReferenzArt.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ExterneReferenzArt.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ExterneReferenzArt.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ExterneReferenzArt.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/MimeTypes.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/MimeTypes.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/MimeTypes.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/MimeTypes.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterBasis.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterBasis.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterBasis.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterBasis.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReference.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReference.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReference.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReference.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReferenceType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReferenceType.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReferenceType.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/RasterReferenceType.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Reference.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Reference.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Reference.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Reference.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ReferenceType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ReferenceType.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ReferenceType.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ReferenceType.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Text.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Text.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Text.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/Text.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterType.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterType.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterType.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/ValidityPeriod.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/manager/web/shared/edit/XPlanToEdit.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ArtifactType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ArtifactType.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ArtifactType.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ArtifactType.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewMetadata.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewMetadata.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewMetadata.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/MapPreviewMetadata.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationOption.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationOption.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationOption.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationOption.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSettings.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSettings.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSettings.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationSettings.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationType.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationType.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationType.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/ValidationType.java
diff --git a/xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/XPlanEnvelope.java b/xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/XPlanEnvelope.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/de/latlon/xplan/validator/web/shared/XPlanEnvelope.java
rename to xplan-core/xplan-core-commons/src/main/java/de/latlon/xplan/validator/web/shared/XPlanEnvelope.java
diff --git a/xplan-core/xplan-commons/src/main/java/org/deegree/gml/XPlanGmlFeatureWriter.java b/xplan-core/xplan-core-commons/src/main/java/org/deegree/gml/XPlanGmlFeatureWriter.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/org/deegree/gml/XPlanGmlFeatureWriter.java
rename to xplan-core/xplan-core-commons/src/main/java/org/deegree/gml/XPlanGmlFeatureWriter.java
diff --git a/xplan-core/xplan-commons/src/main/java/org/deegree/gml/XPlanGmlWriter.java b/xplan-core/xplan-core-commons/src/main/java/org/deegree/gml/XPlanGmlWriter.java
similarity index 100%
rename from xplan-core/xplan-commons/src/main/java/org/deegree/gml/XPlanGmlWriter.java
rename to xplan-core/xplan-core-commons/src/main/java/org/deegree/gml/XPlanGmlWriter.java
diff --git a/xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/commons/minimalist-format.json b/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/commons/minimalist-format.json
similarity index 100%
rename from xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/commons/minimalist-format.json
rename to xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/commons/minimalist-format.json
diff --git a/xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/commons/util/contentTypeChecker.properties b/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/commons/util/contentTypeChecker.properties
similarity index 100%
rename from xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/commons/util/contentTypeChecker.properties
rename to xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/commons/util/contentTypeChecker.properties
diff --git a/xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/manager/XPlanManagerCore.gwt.xml b/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/manager/XPlanManagerCore.gwt.xml
similarity index 100%
rename from xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/manager/XPlanManagerCore.gwt.xml
rename to xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/manager/XPlanManagerCore.gwt.xml
diff --git a/xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/validator/XPlanValidatorCore.gwt.xml b/xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/validator/XPlanValidatorCore.gwt.xml
similarity index 100%
rename from xplan-core/xplan-commons/src/main/resources/de/latlon/xplan/validator/XPlanValidatorCore.gwt.xml
rename to xplan-core/xplan-core-commons/src/main/resources/de/latlon/xplan/validator/XPlanValidatorCore.gwt.xml
diff --git a/xplan-core/xplan-commons/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml b/xplan-core/xplan-core-commons/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml
similarity index 100%
rename from xplan-core/xplan-commons/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml
rename to xplan-core/xplan-core-commons/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/XPlanFeatureCollectionTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/archive/XPlanArchiveCreatorTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SemanticConformityLinkConfigurationTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SortConfigurationTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/configuration/SystemPropertyPropertiesLoaderTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/FeatureCollectionManipulatorTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/OrientationFixerTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/ParameterizedXPlanGmlParserTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/SortPropertyReaderTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/feature/XPlanGmlParserTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/reference/ParameterizedExternalReferenceScannerTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/ContentTypeCheckerTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/FeatureCollectionUtilsTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/MimeTypeDetectorTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/commons/util/XPlanVersionUtilsTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/manager/web/shared/PlanStatusTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java b/xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java
rename to xplan-core/xplan-core-commons/src/test/java/de/latlon/xplan/manager/web/shared/edit/TextRechtscharacterTypeTest.java
diff --git a/xplan-core/xplan-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java b/xplan-core/xplan-core-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java
similarity index 100%
rename from xplan-core/xplan-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java
rename to xplan-core/xplan-core-commons/src/test/java/org/deegree/gml/XPlanGmlFeatureWriterTest.java
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/Blankenese29_Test_60_withEntity.zip b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/Blankenese29_Test_60_withEntity.zip
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/Blankenese29_Test_60_withEntity.zip
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/Blankenese29_Test_60_withEntity.zip
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-asWfsFeatureCollection.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-asWfsFeatureCollection.gml
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-asWfsFeatureCollection.gml
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-asWfsFeatureCollection.gml
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-noXPlanGmlCollection.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-noXPlanGmlCollection.gml
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-noXPlanGmlCollection.gml
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/archive/V4_1_ID_103-noXPlanGmlCollection.gml
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationInvalid.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationInvalid.gml
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationInvalid.gml
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationInvalid.gml
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationValid.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationValid.gml
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationValid.gml
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/geometryOrientationValid.gml
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection-additionalObjects.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection-additionalObjects.gml
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection-additionalObjects.gml
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection-additionalObjects.gml
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection.gml
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection.gml
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/wfs20FeatureCollection.gml
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withUnreferenced.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withUnreferenced.gml
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withUnreferenced.gml
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withUnreferenced.gml
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withVerbundenerPlan.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withVerbundenerPlan.gml
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withVerbundenerPlan.gml
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances-withVerbundenerPlan.gml
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances.gml b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances.gml
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances.gml
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/feature/xplan-multipleInstances.gml
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.pgw b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.pgw
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.pgw
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.pgw
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.png b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.png
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.png
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29.png
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60.zip b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60.zip
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60.zip
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60.zip
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60_InvalidContent.zip b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60_InvalidContent.zip
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60_InvalidContent.zip
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/Blankenese29_Test_60_InvalidContent.zip
diff --git a/xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/test.odt b/xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/test.odt
similarity index 100%
rename from xplan-core/xplan-commons/src/test/resources/de/latlon/xplan/commons/util/test.odt
rename to xplan-core/xplan-core-commons/src/test/resources/de/latlon/xplan/commons/util/test.odt
diff --git a/xplan-core/xplan-core-gwt/pom.xml b/xplan-core/xplan-core-gwt/pom.xml
index fc3eee51bb..2720f54151 100644
--- a/xplan-core/xplan-core-gwt/pom.xml
+++ b/xplan-core/xplan-core-gwt/pom.xml
@@ -8,7 +8,7 @@
 
   <parent>
     <groupId>de.latlon.product.xplanbox</groupId>
-    <artifactId>xplan-webapps</artifactId>
+    <artifactId>xplan-core</artifactId>
     <version>7.2-SNAPSHOT</version>
   </parent>
 
@@ -61,8 +61,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-validator-core</artifactId>
-      <version>${project.version}</version>
+      <artifactId>xplan-core-validator</artifactId>
       <exclusions>
         <exclusion>
           <groupId>jakarta.validation</groupId>
@@ -76,7 +75,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
       <classifier>sources</classifier>
       <exclusions>
         <exclusion>
diff --git a/xplan-core/xplan-inspireplu-transformation/pom.xml b/xplan-core/xplan-core-inspireplu/pom.xml
similarity index 91%
rename from xplan-core/xplan-inspireplu-transformation/pom.xml
rename to xplan-core/xplan-core-inspireplu/pom.xml
index 75b96d368c..a44d65bb35 100644
--- a/xplan-core/xplan-inspireplu-transformation/pom.xml
+++ b/xplan-core/xplan-core-inspireplu/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>xplan-inspireplu-transformation</artifactId>
+  <artifactId>xplan-core-inspireplu</artifactId>
   <packaging>jar</packaging>
   <description>Transformation XPlanGML nach INSPIRE PLU</description>
 
@@ -14,7 +14,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
diff --git a/xplan-core/xplan-inspireplu-transformation/src/main/java/de/latlon/xplan/inspire/plu/transformation/InspirePluTransformator.java b/xplan-core/xplan-core-inspireplu/src/main/java/de/latlon/xplan/inspire/plu/transformation/InspirePluTransformator.java
similarity index 100%
rename from xplan-core/xplan-inspireplu-transformation/src/main/java/de/latlon/xplan/inspire/plu/transformation/InspirePluTransformator.java
rename to xplan-core/xplan-core-inspireplu/src/main/java/de/latlon/xplan/inspire/plu/transformation/InspirePluTransformator.java
diff --git a/xplan-core/xplan-inspireplu-transformation/src/main/java/de/latlon/xplan/inspire/plu/transformation/hale/HaleCliInspirePluTransformator.java b/xplan-core/xplan-core-inspireplu/src/main/java/de/latlon/xplan/inspire/plu/transformation/hale/HaleCliInspirePluTransformator.java
similarity index 100%
rename from xplan-core/xplan-inspireplu-transformation/src/main/java/de/latlon/xplan/inspire/plu/transformation/hale/HaleCliInspirePluTransformator.java
rename to xplan-core/xplan-core-inspireplu/src/main/java/de/latlon/xplan/inspire/plu/transformation/hale/HaleCliInspirePluTransformator.java
diff --git a/xplan-core/xplan-inspireplu-transformation/src/test/java/de/latlon/xplan/inspire/plu/transformation/HaleCliInspirePluTransformatorTest.java b/xplan-core/xplan-core-inspireplu/src/test/java/de/latlon/xplan/inspire/plu/transformation/HaleCliInspirePluTransformatorTest.java
similarity index 100%
rename from xplan-core/xplan-inspireplu-transformation/src/test/java/de/latlon/xplan/inspire/plu/transformation/HaleCliInspirePluTransformatorTest.java
rename to xplan-core/xplan-core-inspireplu/src/test/java/de/latlon/xplan/inspire/plu/transformation/HaleCliInspirePluTransformatorTest.java
diff --git a/xplan-core/xplan-core-job/pom.xml b/xplan-core/xplan-core-job/pom.xml
index 07c8b4884e..8193f56798 100644
--- a/xplan-core/xplan-core-job/pom.xml
+++ b/xplan-core/xplan-core-job/pom.xml
@@ -12,7 +12,7 @@
   <dependencies>
     <dependency>
       <groupId>de.latlon.product.xplanbox</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>de.latlon</groupId>
diff --git a/xplan-core/xplan-core-manager-db/pom.xml b/xplan-core/xplan-core-manager-db/pom.xml
index d5d357a9db..9c5b99b706 100644
--- a/xplan-core/xplan-core-manager-db/pom.xml
+++ b/xplan-core/xplan-core-manager-db/pom.xml
@@ -13,7 +13,7 @@
     <!-- xPlanBox -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>de.latlon</groupId>
diff --git a/xplan-core/xplan-manager-core/pom.xml b/xplan-core/xplan-core-manager/pom.xml
similarity index 96%
rename from xplan-core/xplan-manager-core/pom.xml
rename to xplan-core/xplan-core-manager/pom.xml
index 371218159e..a2f95fc907 100644
--- a/xplan-core/xplan-manager-core/pom.xml
+++ b/xplan-core/xplan-core-manager/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>xplan-manager-core</artifactId>
+  <artifactId>xplan-core-manager</artifactId>
   <packaging>jar</packaging>
   <description>XPlan Manager Core Komponente</description>
 
@@ -52,11 +52,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-validator-core</artifactId>
+      <artifactId>xplan-core-validator</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-inspireplu-transformation</artifactId>
+      <artifactId>xplan-core-inspireplu</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/CategoryMapper.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/CategoryMapper.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/CategoryMapper.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/CategoryMapper.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/CrsUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/CrsUtils.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/CrsUtils.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/CrsUtils.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/XPlanManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/XPlanManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/XPlanManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/XPlanManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ConfigurationException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ConfigurationException.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ConfigurationException.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ConfigurationException.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/CoupledResourceConfiguration.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/CoupledResourceConfiguration.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/CoupledResourceConfiguration.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/CoupledResourceConfiguration.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/InternalIdRetrieverConfiguration.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/InternalIdRetrieverConfiguration.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/InternalIdRetrieverConfiguration.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/InternalIdRetrieverConfiguration.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfiguration.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfiguration.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfiguration.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfiguration.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfigurationAnalyser.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfigurationAnalyser.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfigurationAnalyser.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/configuration/ManagerConfigurationAnalyser.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/AmbiguousBereichNummernException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/AmbiguousBereichNummernException.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/AmbiguousBereichNummernException.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/AmbiguousBereichNummernException.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/DatabaseUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/DatabaseUtils.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/DatabaseUtils.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/DatabaseUtils.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/ManagerWorkspaceWrapper.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/ManagerWorkspaceWrapper.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/ManagerWorkspaceWrapper.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/ManagerWorkspaceWrapper.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/PlanNotFoundException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/PlanNotFoundException.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/PlanNotFoundException.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/PlanNotFoundException.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanDao.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanDbAdapter.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanInspirePluAdapter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanInspirePluAdapter.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanInspirePluAdapter.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanInspirePluAdapter.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanManagerDao.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanManagerDao.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanManagerDao.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanManagerDao.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanSynWfsAdapter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanSynWfsAdapter.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanSynWfsAdapter.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanSynWfsAdapter.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanVersionAndPlanStatus.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanVersionAndPlanStatus.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanVersionAndPlanStatus.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanVersionAndPlanStatus.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanWfsAdapter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanWfsAdapter.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/database/XPlanWfsAdapter.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/database/XPlanWfsAdapter.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/DocumentStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/DocumentStorage.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/DocumentStorage.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/DocumentStorage.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/XPlanDocumentManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/XPlanDocumentManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/XPlanDocumentManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/XPlanDocumentManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/config/DocumentStorageContext.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/config/DocumentStorageContext.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/config/DocumentStorageContext.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/config/DocumentStorageContext.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/s3/S3DocumentStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/s3/S3DocumentStorage.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/s3/S3DocumentStorage.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/s3/S3DocumentStorage.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/s3/config/AmazonS3DocumentStorageContext.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/s3/config/AmazonS3DocumentStorageContext.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/document/s3/config/AmazonS3DocumentStorageContext.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/document/s3/config/AmazonS3DocumentStorageContext.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/ArtefactType.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/ArtefactType.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/ArtefactType.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/ArtefactType.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditException.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditException.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditException.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditType.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditType.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditType.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditType.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditedArtefact.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditedArtefact.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditedArtefact.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditedArtefact.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditedArtefacts.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditedArtefacts.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/EditedArtefacts.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/EditedArtefacts.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/ExternalReferenceUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/ExternalReferenceUtils.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/ExternalReferenceUtils.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/ExternalReferenceUtils.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanManipulator.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/XPlanManipulator.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanManipulator.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/XPlanManipulator.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/export/XPlanExportException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/export/XPlanExportException.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/export/XPlanExportException.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/export/XPlanExportException.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/export/XPlanExporter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/export/XPlanExporter.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/export/XPlanExporter.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/export/XPlanExporter.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublishException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublishException.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublishException.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublishException.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublisher.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublisher.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublisher.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/inspireplu/InspirePluPublisher.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/internalid/InternalIdRetriever.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/internalid/InternalIdRetriever.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/internalid/InternalIdRetriever.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/internalid/InternalIdRetriever.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/log/SystemLog.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/log/SystemLog.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/log/SystemLog.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/log/SystemLog.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/DataServiceCouplingException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/DataServiceCouplingException.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/DataServiceCouplingException.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/DataServiceCouplingException.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandler.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandler.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandler.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandler.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriter.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriter.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriter.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/TemplateXmlStreamWriterFilter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/TemplateXmlStreamWriterFilter.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/TemplateXmlStreamWriterFilter.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/TemplateXmlStreamWriterFilter.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/csw/CswClient.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/csw/CswClient.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/csw/CswClient.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/csw/CswClient.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/csw/PlanRecordMetadata.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/csw/PlanRecordMetadata.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/metadata/csw/PlanRecordMetadata.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/metadata/csw/PlanRecordMetadata.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadata.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadata.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadata.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadata.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilder.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilder.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilder.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilder.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/StorageCleanUpManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/StorageCleanUpManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/StorageCleanUpManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/StorageCleanUpManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/StorageEvent.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/StorageEvent.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/StorageEvent.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/StorageEvent.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/config/StorageCleanUpContext.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/filesystem/FilesystemStorageCleanUpManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/listener/FilesystemTransactionListener.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/filesystem/listener/FilesystemTransactionListener.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/filesystem/listener/FilesystemTransactionListener.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/filesystem/listener/FilesystemTransactionListener.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Metadata.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Metadata.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Metadata.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Metadata.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Object.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Object.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Object.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Object.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Storage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Storage.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3Storage.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3Storage.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3Context.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3Context.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3Context.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3Context.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/listener/S3TransactionListener.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/listener/S3TransactionListener.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/storage/s3/listener/S3TransactionListener.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/storage/s3/listener/S3TransactionListener.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/AttachmentUrlHandler.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/AttachmentUrlHandler.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/AttachmentUrlHandler.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/AttachmentUrlHandler.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/PlanImportData.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/PlanImportData.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/PlanImportData.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/PlanImportData.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/TransactionUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/TransactionUtils.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/TransactionUtils.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/TransactionUtils.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/UnsupportPlanException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/UnsupportPlanException.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/UnsupportPlanException.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/UnsupportPlanException.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanDeleteManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanDeleteManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanDeleteManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanDeleteManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanEditManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanInsertManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanInsertManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanInsertManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanInsertManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/XPlanTransactionManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanDeleteService.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanDeleteService.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanDeleteService.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanDeleteService.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanEditService.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanEditService.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanEditService.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanEditService.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanInsertService.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanInsertService.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanInsertService.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transaction/service/XPlanInsertService.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/HaleXplan41ToXplan51Transformer.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/HaleXplan41ToXplan51Transformer.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/HaleXplan41ToXplan51Transformer.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/HaleXplan41ToXplan51Transformer.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/TransformationResult.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/TransformationResult.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/TransformationResult.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/TransformationResult.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/XPlanGmlTransformer.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/XPlanGmlTransformer.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/transformation/XPlanGmlTransformer.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/transformation/XPlanGmlTransformer.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsThemesConfig.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsThemesConfig.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsThemesConfig.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsThemesConfig.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/WmsWorkspaceWrapper.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/config/RasterStorageContext.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorter.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorter.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorter.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationType.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationType.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationType.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationType.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterUtils.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterUtils.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/RasterUtils.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/XPlanRasterManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapter.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapter.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapter.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapter.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/ConfigWriterUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/ConfigWriterUtils.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/ConfigWriterUtils.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/ConfigWriterUtils.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/DeegreeRasterConfigManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/NoConfigRasterConfigManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/RasterConfigManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterThemeManager.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GdalRasterEvaluation.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GdalRasterEvaluation.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GdalRasterEvaluation.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GdalRasterEvaluation.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GeotiffRasterEvaluation.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GeotiffRasterEvaluation.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GeotiffRasterEvaluation.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/GeotiffRasterEvaluation.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/RasterEvaluation.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/RasterEvaluation.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/RasterEvaluation.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/RasterEvaluation.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluator.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluator.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluator.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluator.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/FileSystemStorage.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/GdalRasterStorage.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/RasterStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/RasterStorage.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/RasterStorage.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/RasterStorage.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/StorageException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/StorageException.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/StorageException.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/StorageException.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorage.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorage.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorage.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorage.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/AmazonS3RasterStorageContext.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/AmazonS3RasterStorageContext.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/AmazonS3RasterStorageContext.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/AmazonS3RasterStorageContext.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapper.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapper.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapper.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapper.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceException.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceException.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceException.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceException.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloadAction.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloadAction.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloadAction.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloadAction.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloader.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloader.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloader.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloader.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderConfiguration.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderConfiguration.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderConfiguration.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderConfiguration.java
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.java b/xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.java
rename to xplan-core/xplan-core-manager/src/main/java/de/latlon/xplan/manager/workspace/WorkspaceUtils.java
diff --git a/xplan-core/xplan-manager-core/src/main/resources/de/latlon/xplan/manager/configuration/managerConfiguration.properties b/xplan-core/xplan-core-manager/src/main/resources/de/latlon/xplan/manager/configuration/managerConfiguration.properties
similarity index 100%
rename from xplan-core/xplan-manager-core/src/main/resources/de/latlon/xplan/manager/configuration/managerConfiguration.properties
rename to xplan-core/xplan-core-manager/src/main/resources/de/latlon/xplan/manager/configuration/managerConfiguration.properties
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/CategoryMapperTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/CategoryMapperTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/CategoryMapperTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/CategoryMapperTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/XPlanManagerTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/config/CoreTestContext.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/config/CoreTestContext.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/config/CoreTestContext.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/config/CoreTestContext.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/configuration/ManagerConfigurationTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/configuration/ManagerConfigurationTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/configuration/ManagerConfigurationTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/configuration/ManagerConfigurationTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/document/XPlanDocumentManagerTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/document/s3/S3DocumentStorageIT.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/ExternalReferenceUtilsTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/ExternalReferenceUtilsTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/ExternalReferenceUtilsTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/ExternalReferenceUtilsTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/XPlanManipulatorTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/edit/XPlanToEditFactoryTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/export/XPlanExporterTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/internalid/InternalIdRetrieverTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/internalid/InternalIdRetrieverTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/internalid/InternalIdRetrieverTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/internalid/InternalIdRetrieverTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandlerTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandlerTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandlerTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/MetadataCouplingHandlerTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriterTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriterTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriterTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/ServiceMetadataDocumentWriterTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/csw/CswClientTestManual.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/csw/CswClientTestManual.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/metadata/csw/CswClientTestManual.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/metadata/csw/CswClientTestManual.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilderTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilderTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilderTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/planwerkwms/PlanwerkServiceMetadataBuilderTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManagerTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManagerTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManagerTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageCleanUpManagerTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/S3StorageTestManual.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3TestContext.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3TestContext.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3TestContext.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/config/AmazonS3TestContext.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/config/S3StorageTestContext.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/config/S3StorageTestContext.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/storage/s3/config/S3StorageTestContext.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/storage/s3/config/S3StorageTestContext.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/transaction/attachment/AttachmentUrlHandlerTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/ConfigWriterUtilsTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/ConfigWriterUtilsTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/ConfigWriterUtilsTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/ConfigWriterUtilsTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorterTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorterTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorterTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/RasterConfigurationSorterTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/access/GdalRasterAdapterTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManagerTestManual.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManagerTestManual.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManagerTestManual.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/config/WorkspaceRasterLayerManagerTestManual.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluatorTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluatorTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluatorTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/evaluation/XPlanRasterEvaluatorTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/S3RasterStorageTestManual.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/S3RasterStorageTestContext.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/S3RasterStorageTestContext.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/S3RasterStorageTestContext.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/wmsconfig/raster/storage/s3/config/S3RasterStorageTestContext.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapperTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapperTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapperTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/DeegreeWorkspaceWrapperTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceReloaderTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceUtilsTest.java b/xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceUtilsTest.java
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceUtilsTest.java
rename to xplan-core/xplan-core-manager/src/test/java/de/latlon/xplan/manager/workspace/WorkspaceUtilsTest.java
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/Eidelstedt_4_V4-Blankenese.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/Eidelstedt_4_V4-Blankenese.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/Eidelstedt_4_V4-Blankenese.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/Eidelstedt_4_V4-Blankenese.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_references.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_references.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_references.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_references.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_texts.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_texts.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_texts.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan41/V4_1_ID_103_texts.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan50/BP2070.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan50/BP2070.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan50/BP2070.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan50/BP2070.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan50/V4_1_ID_103.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan50/V4_1_ID_103.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan50/V4_1_ID_103.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan50/V4_1_ID_103.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/BP2070.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/BP2070.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/BP2070.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/BP2070.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103_refScan.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103_refScan.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103_refScan.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan51/V4_1_ID_103_refScan.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan53/BPlan_ohneBereich.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan53/BPlan_ohneBereich.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan53/BPlan_ohneBereich.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan53/BPlan_ohneBereich.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/metadata/iso-service-metadata-example-template.xml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/metadata/iso-service-metadata-example-template.xml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/metadata/iso-service-metadata-example-template.xml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/metadata/iso-service-metadata-example-template.xml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.tiff b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.tiff
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.tiff
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.tiff
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.wld b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.wld
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.wld
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30.wld
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled.tiff b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled.tiff
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled.tiff
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled.tiff
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled_epsg4326.tiff b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled_epsg4326.tiff
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled_epsg4326.tiff
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/dem30_geotiff_tiled_epsg4326.tiff
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png.aux.xml b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png.aux.xml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png.aux.xml
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_25833.png.aux.xml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_nocrs.png b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_nocrs.png
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_nocrs.png
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/png_nocrs.png
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/test.txt b/xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/test.txt
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/test.txt
rename to xplan-core/xplan-core-manager/src/test/resources/de/latlon/xplan/manager/wmsconfig/raster/evaluation/test.txt
diff --git a/xplan-core/xplan-manager-core/src/test/resources/log4j2-test.yaml b/xplan-core/xplan-core-manager/src/test/resources/log4j2-test.yaml
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/log4j2-test.yaml
rename to xplan-core/xplan-core-manager/src/test/resources/log4j2-test.yaml
diff --git a/xplan-core/xplan-manager-core/src/test/resources/s3Mock.properties b/xplan-core/xplan-core-manager/src/test/resources/s3Mock.properties
similarity index 100%
rename from xplan-core/xplan-manager-core/src/test/resources/s3Mock.properties
rename to xplan-core/xplan-core-manager/src/test/resources/s3Mock.properties
diff --git a/xplan-core/xplan-synthesizer/LICENSE_UNKNOWN.txt b/xplan-core/xplan-core-synthesizer/LICENSE_UNKNOWN.txt
similarity index 100%
rename from xplan-core/xplan-synthesizer/LICENSE_UNKNOWN.txt
rename to xplan-core/xplan-core-synthesizer/LICENSE_UNKNOWN.txt
diff --git a/xplan-core/xplan-synthesizer/pom.xml b/xplan-core/xplan-core-synthesizer/pom.xml
similarity index 95%
rename from xplan-core/xplan-synthesizer/pom.xml
rename to xplan-core/xplan-core-synthesizer/pom.xml
index f040458008..81a3f13004 100644
--- a/xplan-core/xplan-synthesizer/pom.xml
+++ b/xplan-core/xplan-core-synthesizer/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>xplan-synthesizer</artifactId>
+  <artifactId>xplan-core-synthesizer</artifactId>
   <packaging>jar</packaging>
   <description>XPlan Manager Synthesizer Komponente</description>
 
@@ -14,7 +14,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>de.latlon</groupId>
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanCodelists.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanCodelists.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanCodelists.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanCodelists.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaries.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaries.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaries.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaries.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesParser.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesParser.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesParser.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesParser.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionary.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionary.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionary.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionary.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaryEntry.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaryEntry.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaryEntry.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanDictionaryEntry.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactory.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactory.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactory.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactory.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizer.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizer.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizer.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizer.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/PlanContext.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/PlanContext.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/PlanContext.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/PlanContext.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/RuleParser.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/RuleParser.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/RuleParser.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/RuleParser.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizer.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizer.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizer.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizer.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Expression.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Expression.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Expression.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Expression.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/LatestDate.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/LatestDate.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/LatestDate.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/LatestDate.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/StringConstant.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/StringConstant.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/StringConstant.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/StringConstant.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGeometry.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGeometry.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGeometry.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGeometry.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGmlDescription.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGmlDescription.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGmlDescription.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanGmlDescription.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanName.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanName.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanName.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanName.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanType.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanType.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanType.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XPlanType.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Xpath.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Xpath.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Xpath.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/Xpath.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteile.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteile.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteile.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteile.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlName.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlName.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlName.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlName.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/AbstractXPlanDictionaryLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/AbstractXPlanDictionaryLookup.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/AbstractXPlanDictionaryLookup.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/AbstractXPlanDictionaryLookup.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanEnumerationLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanEnumerationLookup.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanEnumerationLookup.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanEnumerationLookup.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanExternalCodeLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanExternalCodeLookup.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanExternalCodeLookup.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XPlanExternalCodeLookup.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/AbstractFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/AbstractFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/AbstractFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/AbstractFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/DefaultFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/DefaultFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/DefaultFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/DefaultFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/Flattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/Flattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/Flattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/Flattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/XplanFlattenProperty.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/XplanFlattenProperty.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/XplanFlattenProperty.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/XplanFlattenProperty.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/DataTypeFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/DataTypeFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/DataTypeFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/DataTypeFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/FlattenerProperty.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/FlattenerProperty.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/FlattenerProperty.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/model/FlattenerProperty.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/AbstractTextlicherAbschnittFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/AbstractTextlicherAbschnittFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/AbstractTextlicherAbschnittFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/AbstractTextlicherAbschnittFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpExterneReferenzFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpExterneReferenzFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpExterneReferenzFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpExterneReferenzFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpGenerAttributFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpGenerAttributFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpGenerAttributFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpGenerAttributFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpRasterplanFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpRasterplanFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpRasterplanFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpRasterplanFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpVerfahrensMerkmalFlattener.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpVerfahrensMerkmalFlattener.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpVerfahrensMerkmalFlattener.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpVerfahrensMerkmalFlattener.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/Ausrichtung.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/Ausrichtung.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/Ausrichtung.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/Ausrichtung.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/GeometryTypeAbbreviation.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/GeometryTypeAbbreviation.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/GeometryTypeAbbreviation.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/GeometryTypeAbbreviation.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/PraesentationsobjektLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/PraesentationsobjektLookup.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/PraesentationsobjektLookup.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/PraesentationsobjektLookup.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookup.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookup.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookup.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookup.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookup.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookup.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookup.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookup.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookup.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookup.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributeProperty.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributeProperty.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributeProperty.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributeProperty.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParser.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParser.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParser.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParser.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyType.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyType.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyType.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyType.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/rules/SynRulesAccessor.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/rules/SynRulesAccessor.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/rules/SynRulesAccessor.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/rules/SynRulesAccessor.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparator.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparator.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparator.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparator.java
diff --git a/xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/CastUtils.java b/xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/CastUtils.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/CastUtils.java
rename to xplan-core/xplan-core-synthesizer/src/main/java/de/latlon/xplan/manager/synthesizer/utils/CastUtils.java
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_4_0_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_4_0_Enumerationen.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_4_0_Enumerationen.xml
rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_4_0_Enumerationen.xml
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_0_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_0_Enumerationen.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_0_Enumerationen.xml
rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_0_Enumerationen.xml
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_1_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_1_Enumerationen.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_1_Enumerationen.xml
rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_1_Enumerationen.xml
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_2_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_2_Enumerationen.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_2_Enumerationen.xml
rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_2_Enumerationen.xml
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_3_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_3_Enumerationen.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_3_Enumerationen.xml
rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_3_Enumerationen.xml
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_4_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_4_Enumerationen.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_5_4_Enumerationen.xml
rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_5_4_Enumerationen.xml
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_6_0_2_Enumerationen.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_6_0_2_Enumerationen.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_6_0_2_Enumerationen.xml
rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_6_0_2_Enumerationen.xml
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_Enumerationen_4_1.xml b/xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_Enumerationen_4_1.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/enumeration/XPlanGML_Enumerationen_4_1.xml
rename to xplan-core/xplan-core-synthesizer/src/main/resources/enumeration/XPlanGML_Enumerationen_4_1.xml
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/featuretypes/renamedFeatureTypes.properties b/xplan-core/xplan-core-synthesizer/src/main/resources/featuretypes/renamedFeatureTypes.properties
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/featuretypes/renamedFeatureTypes.properties
rename to xplan-core/xplan-core-synthesizer/src/main/resources/featuretypes/renamedFeatureTypes.properties
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/flattener/complexFlattener.yaml b/xplan-core/xplan-core-synthesizer/src/main/resources/flattener/complexFlattener.yaml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/flattener/complexFlattener.yaml
rename to xplan-core/xplan-core-synthesizer/src/main/resources/flattener/complexFlattener.yaml
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/junit-platform.properties b/xplan-core/xplan-core-synthesizer/src/main/resources/junit-platform.properties
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/junit-platform.properties
rename to xplan-core/xplan-core-synthesizer/src/main/resources/junit-platform.properties
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan40.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan40.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan40.syn
rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan40.syn
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan41.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan41.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan41.syn
rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan41.syn
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan50.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan50.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan50.syn
rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan50.syn
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan51.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan51.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan51.syn
rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan51.syn
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan52.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan52.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan52.syn
rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan52.syn
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan53.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan53.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan53.syn
rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan53.syn
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan54.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan54.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan54.syn
rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan54.syn
diff --git a/xplan-core/xplan-synthesizer/src/main/resources/rules/xplan60.syn b/xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan60.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/main/resources/rules/xplan60.syn
rename to xplan-core/xplan-core-synthesizer/src/main/resources/rules/xplan60.syn
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanCodelistsTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanCodelistsTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanCodelistsTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanCodelistsTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanDictionariesTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactoryTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactoryTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactoryTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/dictionary/XPlanEnumerationFactoryTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/AbstractXplanSynthesizerTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizerTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizerTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/FeatureTypeNameSynthesizerTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/RuleParserTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/RuleParserTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/RuleParserTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/RuleParserTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerComparisonTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerComparisonTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerComparisonTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerComparisonTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerConcurrencyTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerConcurrencyTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerConcurrencyTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerConcurrencyTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XPlanSynthesizerTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan40Test.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan40Test.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan40Test.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan40Test.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan41Test.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan41Test.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan41Test.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan41Test.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan50Test.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan50Test.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan50Test.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan50Test.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan51Test.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan51Test.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan51Test.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan51Test.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan52Test.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan52Test.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan52Test.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/XplanSynthesizerXplan52Test.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/LatestDateTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/LatestDateTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/LatestDateTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/LatestDateTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/StringConstantTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/StringConstantTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/StringConstantTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/StringConstantTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/TestFeaturesUtils.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XpathTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XpathTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XpathTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XpathTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteileTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteileTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteileTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanBaugebietFlaechenteileTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanFlattenPropertyTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanFlattenPropertyTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanFlattenPropertyTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanFlattenPropertyTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGeometryTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGeometryTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGeometryTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGeometryTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlDescriptionTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlDescriptionTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlDescriptionTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlDescriptionTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlNameTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlNameTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlNameTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/XplanGmlNameTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XplanEnumerationLookupTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XplanEnumerationLookupTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XplanEnumerationLookupTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/dictionary/XplanEnumerationLookupTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattenerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattenerTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattenerTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/complex/ComplexFlattenerTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattenerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattenerTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattenerTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/lp/LpBiologischeVielfaltKomplexFlattenerTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattenerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattenerTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattenerTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpBegruendungAbschnittFlattenerTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattenerTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattenerTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattenerTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/flatten/xp/XpTextAbschnittFlattenerTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AbstractPraesentationsobjektLookupTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AusrichtungTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AusrichtungTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AusrichtungTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/AusrichtungTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookupTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookupTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookupTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SchriftinhaltLookupTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookupTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookupTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookupTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/SkalierungLookupTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookupTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookupTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookupTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/StylesheetIdLookupTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParserTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParserTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParserTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/expression/praesentation/attribute/AttributePropertyParserTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparatorTest.java b/xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparatorTest.java
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparatorTest.java
rename to xplan-core/xplan-core-synthesizer/src/test/java/de/latlon/xplan/manager/synthesizer/utils/AlphanumericComparatorTest.java
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/HafenCity7.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/HafenCity7.gml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/HafenCity7.gml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/HafenCity7.gml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/Rotherbaum27.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/Rotherbaum27.gml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/Rotherbaum27.gml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/Rotherbaum27.gml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/dictionary/exampleCodelist.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/dictionary/exampleCodelist.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/dictionary/exampleCodelist.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/dictionary/exampleCodelist.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/BP_DetailArtDerBaulNutzung.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/BP_DetailArtDerBaulNutzung.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/BP_DetailArtDerBaulNutzung.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/BP_DetailArtDerBaulNutzung.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan4.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan4.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan4.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan4.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan5.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan5.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan5.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/XP_BesondereArtDerBaulNutzung-XPlan5.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/FeatureWithCurve.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/FeatureWithCurve.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/FeatureWithCurve.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/FeatureWithCurve.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/MultipleDates.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/MultipleDates.gml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/MultipleDates.gml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/MultipleDates.gml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/Praesentationsobjekte.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/Praesentationsobjekte.gml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/Praesentationsobjekte.gml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/Praesentationsobjekte.gml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BP_KomplexeZweckbestGruen.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BP_KomplexeZweckbestGruen.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BP_KomplexeZweckbestGruen.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BP_KomplexeZweckbestGruen.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BpDachgestaltung.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BpDachgestaltung.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BpDachgestaltung.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/BpDachgestaltung.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpSPEMassnahmenDaten.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpSPEMassnahmenDaten.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpSPEMassnahmenDaten.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpSPEMassnahmenDaten.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittFlattener.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittFlattener.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittFlattener.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittFlattener.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittWithRefText.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittWithRefText.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittWithRefText.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpTextAbschnittWithRefText.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpVerbundenerPlanFlattener.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpVerbundenerPlanFlattener.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpVerbundenerPlanFlattener.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/flatten/XpVerbundenerPlanFlattener.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan40.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan40.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan40.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan40.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan41.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan41.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan41.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan41.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan50.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan50.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan50.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan50.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan53.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan53.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan53.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan53.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan60.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan60.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan60.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/expression/xplan60.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2070.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2070.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2070.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2070.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2135.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2135.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2135.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/BP2135.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA22.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA22.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA22.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA22.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA67.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA67.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA67.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan41/LA67.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2070.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2070.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2070.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2070.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2135.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2135.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2135.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/BP2135.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA22.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA22.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA22.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA22.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA67.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA67.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA67.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan50/LA67.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2070.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2070.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2070.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2070.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2135.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2135.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2135.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/BP2135.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA22.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA22.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA22.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA22.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA67.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA67.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA67.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan51/LA67.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2070.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2070.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2070.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2070.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2135.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2135.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2135.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/BP2135.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA22.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA22.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA22.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA22.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA67.xml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA67.xml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA67.xml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/plans/xplan52/LA67.xml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4.gml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4.gml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4.gml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4_ohneErstellungsMassstab.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4_ohneErstellungsMassstab.gml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4_ohneErstellungsMassstab.gml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan002_5-4_ohneErstellungsMassstab.gml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan003_4-1.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan003_4-1.gml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan003_4-1.gml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/BPlan003_4-1.gml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/FP_5-2_PPO-Test.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/FP_5-2_PPO-Test.gml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/FP_5-2_PPO-Test.gml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/FP_5-2_PPO-Test.gml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/Test_PPO_index-1.gml b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/Test_PPO_index-1.gml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/Test_PPO_index-1.gml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/praesentation/Test_PPO_index-1.gml
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41.syn b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41.syn
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41.syn
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_BP_DetailArtDerBaulNutzung.syn b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_BP_DetailArtDerBaulNutzung.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_BP_DetailArtDerBaulNutzung.syn
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_BP_DetailArtDerBaulNutzung.syn
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_XP_BesondereArtDerBaulNutzung.syn b/xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_XP_BesondereArtDerBaulNutzung.syn
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_XP_BesondereArtDerBaulNutzung.syn
rename to xplan-core/xplan-core-synthesizer/src/test/resources/de/latlon/xplan/manager/synthesizer/xplan41_XP_BesondereArtDerBaulNutzung.syn
diff --git a/xplan-core/xplan-synthesizer/src/test/resources/log4j2-test.yaml b/xplan-core/xplan-core-synthesizer/src/test/resources/log4j2-test.yaml
similarity index 100%
rename from xplan-core/xplan-synthesizer/src/test/resources/log4j2-test.yaml
rename to xplan-core/xplan-core-synthesizer/src/test/resources/log4j2-test.yaml
diff --git a/xplan-core/xplan-validator-core/LICENSE_UNKNOWN.txt b/xplan-core/xplan-core-validator/LICENSE_UNKNOWN.txt
similarity index 100%
rename from xplan-core/xplan-validator-core/LICENSE_UNKNOWN.txt
rename to xplan-core/xplan-core-validator/LICENSE_UNKNOWN.txt
diff --git a/xplan-core/xplan-validator-core/pom.xml b/xplan-core/xplan-core-validator/pom.xml
similarity index 98%
rename from xplan-core/xplan-validator-core/pom.xml
rename to xplan-core/xplan-core-validator/pom.xml
index f7e6c0b148..d60d23b6a1 100644
--- a/xplan-core/xplan-validator-core/pom.xml
+++ b/xplan-core/xplan-core-validator/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>xplan-validator-core</artifactId>
+  <artifactId>xplan-core-validator</artifactId>
   <packaging>jar</packaging>
   <description>XPlan Validator Core Komponente</description>
 
@@ -73,7 +73,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/ValidationType.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/ValidationType.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/ValidationType.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/ValidationType.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/ValidatorException.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/ValidatorException.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/ValidatorException.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/ValidatorException.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/XPlanValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/XPlanValidator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/XPlanValidator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/XPlanValidator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfiguration.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfiguration.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfiguration.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfiguration.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParser.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParser.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParser.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParser.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorProfile.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorProfile.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/configuration/ValidatorProfile.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/configuration/ValidatorProfile.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidatorImpl.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidatorImpl.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidatorImpl.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/GeometricValidatorImpl.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspector.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspector.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspector.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/GeometricFeatureInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/GeometricFeatureInspector.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/GeometricFeatureInspector.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/GeometricFeatureInspector.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/InvalidGeometryException.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/InvalidGeometryException.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/InvalidGeometryException.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/InvalidGeometryException.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspector.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspector.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspector.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspector.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspector.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspector.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/ControlPoint.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/ControlPoint.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/ControlPoint.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/ControlPoint.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussContext.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussContext.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussContext.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussFeatureInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussFeatureInspector.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussFeatureInspector.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussFeatureInspector.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussTolerance.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussTolerance.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussTolerance.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FlaechenschlussTolerance.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichFeatureAnalyser.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichFeatureAnalyser.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichFeatureAnalyser.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichFeatureAnalyser.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspector.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspector.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspector.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspector.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorContext.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorContext.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorContext.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/AbstractGeltungsbereichFeature.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/AbstractGeltungsbereichFeature.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/AbstractGeltungsbereichFeature.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/AbstractGeltungsbereichFeature.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/BereichFeature.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/BereichFeature.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/BereichFeature.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/BereichFeature.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeatureUnderTest.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeatureUnderTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeatureUnderTest.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeatureUnderTest.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeaturesUnderTest.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeaturesUnderTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeaturesUnderTest.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/FeaturesUnderTest.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/GeltungsbereichFeature.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/GeltungsbereichFeature.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/GeltungsbereichFeature.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/GeltungsbereichFeature.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/InspectorContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/InspectorContext.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/InspectorContext.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/InspectorContext.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/PlanFeature.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/PlanFeature.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/PlanFeature.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/inspector/model/PlanFeature.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/report/BadGeometry.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/report/BadGeometry.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/report/BadGeometry.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/report/BadGeometry.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/report/GeometricValidatorResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/report/GeometricValidatorResult.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/report/GeometricValidatorResult.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/geometric/report/GeometricValidatorResult.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/i18n/ValidationMessages.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/i18n/ValidationMessages.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/i18n/ValidationMessages.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/i18n/ValidationMessages.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportArchiveGenerator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportArchiveGenerator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportArchiveGenerator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportArchiveGenerator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportGenerationException.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportGenerationException.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportGenerationException.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportGenerationException.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportUtils.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportUtils.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportUtils.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportUtils.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportWriter.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportWriter.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ReportWriter.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ReportWriter.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorDetail.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorDetail.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorDetail.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorDetail.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorReport.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorResult.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/ValidatorResult.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/ValidatorResult.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/html/HtmlReportGenerator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/html/HtmlReportGenerator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/html/HtmlReportGenerator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/html/HtmlReportGenerator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/PdfReportGenerator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/PdfReportGenerator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/PdfReportGenerator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/PdfReportGenerator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/ReportBuilder.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/ReportBuilder.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/ReportBuilder.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/ReportBuilder.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/Templates.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/Templates.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/pdf/Templates.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/pdf/Templates.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceReport.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceReport.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceReport.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceReport.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceStatus.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceStatus.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceStatus.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/reference/ExternalReferenceStatus.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileBuilder.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileBuilder.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileBuilder.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileBuilder.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileGenerator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileGenerator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileGenerator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/shapefile/ShapefileGenerator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/xml/JaxbConverter.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/xml/JaxbConverter.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/xml/JaxbConverter.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/xml/JaxbConverter.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/xml/XmlReportGenerator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/xml/XmlReportGenerator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/report/xml/XmlReportGenerator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/report/xml/XmlReportGenerator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidatorRule.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidatorRule.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidatorRule.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/SemanticValidatorRule.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesConfiguration.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesConfiguration.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesConfiguration.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesConfiguration.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesMainConfiguration.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesMainConfiguration.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesMainConfiguration.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesMainConfiguration.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesProfileConfiguration.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesProfileConfiguration.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesProfileConfiguration.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticRulesProfileConfiguration.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptions.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptions.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptions.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptions.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfiguration.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfiguration.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfiguration.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfiguration.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationRetriever.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationRetriever.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationRetriever.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationRetriever.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/DefaultRulesMessagesAccessor.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/DefaultRulesMessagesAccessor.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/DefaultRulesMessagesAccessor.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/DefaultRulesMessagesAccessor.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/FileRulesMessagesAccessor.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/FileRulesMessagesAccessor.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/FileRulesMessagesAccessor.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/FileRulesMessagesAccessor.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/RulesMessagesAccessor.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/RulesMessagesAccessor.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/RulesMessagesAccessor.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/message/RulesMessagesAccessor.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesMetadata.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesMetadata.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesMetadata.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesMetadata.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersion.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersion.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersion.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersion.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParser.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParser.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParser.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParser.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetriever.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetriever.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetriever.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetriever.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/DelegatingSemanticProfileValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/DelegatingSemanticProfileValidator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/DelegatingSemanticProfileValidator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/DelegatingSemanticProfileValidator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfileValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfileValidator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfileValidator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfileValidator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfiles.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfiles.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfiles.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfiles.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidFeaturesResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidFeaturesResult.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidFeaturesResult.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidFeaturesResult.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidRuleResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidRuleResult.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidRuleResult.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/InvalidRuleResult.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/RuleResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/RuleResult.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/RuleResult.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/RuleResult.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResult.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResult.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResult.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/ValidationResultType.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/ValidationResultType.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/report/ValidationResultType.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/report/ValidationResultType.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRule.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRule.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRule.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRule.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidator.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidator.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidator.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidator.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorImpl.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorImpl.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorImpl.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorImpl.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/report/SyntacticValidatorResult.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/report/SyntacticValidatorResult.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/syntactic/report/SyntacticValidatorResult.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/syntactic/report/SyntacticValidatorResult.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MapPreviewCreationException.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MapPreviewCreationException.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MapPreviewCreationException.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MapPreviewCreationException.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MapPreviewManager.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MapPreviewManager.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MapPreviewManager.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MapPreviewManager.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MasterportalConfigWriter.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MasterportalConfigWriter.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/MasterportalConfigWriter.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/MasterportalConfigWriter.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/ValidatorWmsManager.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsContext.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsContext.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsContext.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsSqlContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsSqlContext.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsSqlContext.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsSqlContext.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/config/ValidatorWmsWorkspaceContext.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/PlanStorage.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/PlanStorage.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/PlanStorage.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/PlanStorage.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorage.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorage.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorage.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorage.java
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/WorkspacePlanStorage.java b/xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/WorkspacePlanStorage.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/wms/storage/WorkspacePlanStorage.java
rename to xplan-core/xplan-core-validator/src/main/java/de/latlon/xplan/validator/wms/storage/WorkspacePlanStorage.java
diff --git a/xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties b/xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties
rename to xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/i18n/validationMessages.properties b/xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/i18n/validationMessages.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/i18n/validationMessages.properties
rename to xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/i18n/validationMessages.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/semantic/configuration/rulesMessages.properties b/xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/semantic/configuration/rulesMessages.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/semantic/configuration/rulesMessages.properties
rename to xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/semantic/configuration/rulesMessages.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/wms/xplansyn.xml b/xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/wms/xplansyn.xml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/de/latlon/xplan/validator/wms/xplansyn.xml
rename to xplan-core/xplan-core-validator/src/main/resources/de/latlon/xplan/validator/wms/xplansyn.xml
diff --git a/xplan-core/xplan-validator-core/src/main/resources/jrxml/metadata.jrxml b/xplan-core/xplan-core-validator/src/main/resources/jrxml/metadata.jrxml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/jrxml/metadata.jrxml
rename to xplan-core/xplan-core-validator/src/main/resources/jrxml/metadata.jrxml
diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/DOMMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/DOMMessages_de.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/DOMMessages_de.properties
rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/DOMMessages_de.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/DatatypeMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/DatatypeMessages_de.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/DatatypeMessages_de.properties
rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/DatatypeMessages_de.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/JAXPValidationMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/JAXPValidationMessages_de.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/JAXPValidationMessages_de.properties
rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/JAXPValidationMessages_de.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/SAXMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/SAXMessages_de.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/SAXMessages_de.properties
rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/SAXMessages_de.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XIncludeMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XIncludeMessages_de.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XIncludeMessages_de.properties
rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XIncludeMessages_de.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLMessages_de.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLMessages_de.properties
rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLMessages_de.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLSchemaMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLSchemaMessages_de.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLSchemaMessages_de.properties
rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLSchemaMessages_de.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLSerializerMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLSerializerMessages_de.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XMLSerializerMessages_de.properties
rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XMLSerializerMessages_de.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XPointerMessages_de.properties b/xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XPointerMessages_de.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/org/apache/xerces/impl/msg/XPointerMessages_de.properties
rename to xplan-core/xplan-core-validator/src/main/resources/org/apache/xerces/impl/msg/XPointerMessages_de.properties
diff --git a/xplan-core/xplan-validator-core/src/main/resources/schemas/validationReport.xsd b/xplan-core/xplan-core-validator/src/main/resources/schemas/validationReport.xsd
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/schemas/validationReport.xsd
rename to xplan-core/xplan-core-validator/src/main/resources/schemas/validationReport.xsd
diff --git a/xplan-core/xplan-validator-core/src/main/resources/xslt/report.xslt b/xplan-core/xplan-core-validator/src/main/resources/xslt/report.xslt
similarity index 100%
rename from xplan-core/xplan-validator-core/src/main/resources/xslt/report.xslt
rename to xplan-core/xplan-core-validator/src/main/resources/xslt/report.xslt
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/FeatureParserUtils.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/XPlanValidatorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParserTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParserTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParserTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/configuration/ValidatorConfigurationParserTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/GeometricValidatorImplTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/ParameterizedGeometricValidatorImplTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspectorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspectorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspectorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/XPlanGeometryInspectorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspectorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspectorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspectorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/aenderungen/AenderungenInspectorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspectorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspectorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspectorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/DoppelbelegungInspectorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspectorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspectorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspectorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspectorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/GeltungsbereichInspectorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/reference/ExternalReferenceEvaluatorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ReportUtilsTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ReportUtilsTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ReportUtilsTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ReportUtilsTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ReportWriterTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ReportWriterTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ReportWriterTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ReportWriterTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ValidatorDetailTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ValidatorDetailTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/ValidatorDetailTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/ValidatorDetailTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/html/HtmlReportGeneratorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/html/HtmlReportGeneratorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/html/HtmlReportGeneratorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/html/HtmlReportGeneratorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/pdf/PdfReportGeneratorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/pdf/PdfReportGeneratorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/pdf/PdfReportGeneratorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/pdf/PdfReportGeneratorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/pdf/ReportBuilderTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/pdf/ReportBuilderTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/pdf/ReportBuilderTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/pdf/ReportBuilderTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/shapefile/ShapefileGeneratorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/xml/XmlReportGeneratorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/xml/XmlReportGeneratorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/report/xml/XmlReportGeneratorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/report/xml/XmlReportGeneratorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/DefaultRulesMessagesAccessorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/DefaultRulesMessagesAccessorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/DefaultRulesMessagesAccessorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/DefaultRulesMessagesAccessorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/FileRulesMessagesAccessorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/FileRulesMessagesAccessorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/FileRulesMessagesAccessorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/FileRulesMessagesAccessorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptionsTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptionsTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptionsTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidationOptionsTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/SemanticValidatorConfigurationTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParserTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParserTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParserTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/metadata/RulesVersionParserTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetrieverTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetrieverTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetrieverTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/configuration/xquery/XQuerySemanticValidatorConfigurationRetrieverTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreatorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreatorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/profile/SemanticProfilesCreatorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/profile/TestContext.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/profile/TestContext.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/profile/TestContext.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/profile/TestContext.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResultTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResultTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResultTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/report/SemanticValidatorResultTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorRuleTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/semantic/xquery/XQuerySemanticValidatorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/syntactic/ParameterizedSyntacticValidatorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/syntactic/SyntacticValidatorTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/ValidatorWmsManagerTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/config/TestContext.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/config/TestContext.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/config/TestContext.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/config/TestContext.java
diff --git a/xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java b/xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java
rename to xplan-core/xplan-core-validator/src/test/java/de/latlon/xplan/validator/wms/storage/SqlPlanStorageTest.java
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidId.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidId.yaml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidId.yaml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidId.yaml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidName.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidName.yaml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidName.yaml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile-invalidName.yaml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile.yaml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profile.yaml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profile.yaml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateId.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateId.yaml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateId.yaml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateId.yaml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateName.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateName.yaml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateName.yaml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles-duplicateName.yaml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles.yaml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles.yaml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/profiles.yaml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/profiles.yaml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/rules/rules.properties b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/rules/rules.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/rules/rules.properties
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/rules/rules.properties
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/rules/version.properties b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/rules/version.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/rules/version.properties
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/rules/version.properties
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/configuration/validatorConfiguration.properties
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/curve.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/curve.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/curve.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/curve.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/duplicateControlPointRing.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/duplicateControlPointRing.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/duplicateControlPointRing.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/duplicateControlPointRing.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationInvalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationInvalid.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationInvalid.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationInvalid.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationValid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationValid.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationValid.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/geometryOrientationValid.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/identicalControlPoints.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/identicalControlPoints.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/identicalControlPoints.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/identicalControlPoints.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertPlanUndAendertPlanBereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertPlanUndAendertPlanBereich.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertPlanUndAendertPlanBereich.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertPlanUndAendertPlanBereich.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertUndWurdeGeandertVon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertUndWurdeGeandertVon.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertUndWurdeGeandertVon.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/aenderungen/aendertUndWurdeGeandertVon.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/BPlan_6-0_4-5-2-4-Ueberlappung_valide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/BPlan_6-0_4-5-2-4-Ueberlappung_valide.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/BPlan_6-0_4-5-2-4-Ueberlappung_valide.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/BPlan_6-0_4-5-2-4-Ueberlappung_valide.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/xplan60-4_5_2_4.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/xplan60-4_5_2_4.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/xplan60-4_5_2_4.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/doppelbelegung/xplan60-4_5_2_4.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gfs b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gfs
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gfs
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gfs
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BP_Alles_Parmis.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan001_5-4_Toleranz_Geltungsbereich_0008.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan001_5-4_Toleranz_Geltungsbereich_0008.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan001_5-4_Toleranz_Geltungsbereich_0008.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan001_5-4_Toleranz_Geltungsbereich_0008.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Luecke.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Luecke.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Luecke.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Luecke.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Ueberlappung.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Ueberlappung.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Ueberlappung.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Kompensationsbereich_6-0-2_Ueberlappung.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_TeilbereichAusserhalbPlanbereich_6-0-2.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_TeilbereichAusserhalbPlanbereich_6-0-2.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_TeilbereichAusserhalbPlanbereich_6-0-2.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_TeilbereichAusserhalbPlanbereich_6-0-2.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_invalide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_invalide.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_invalide.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_invalide.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_valide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_valide.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_valide.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/BPlan_Wirksamkeit_6-0-2_valide.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_031545401000_Zusammenzeichnung.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_031545401000_Zusammenzeichnung.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_031545401000_Zusammenzeichnung.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_031545401000_Zusammenzeichnung.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_Insel-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_Insel-Test.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_Insel-Test.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/FNP_Insel-Test.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm-nichtUeberlappend.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm-nichtUeberlappend.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm-nichtUeberlappend.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm-nichtUeberlappend.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Flaechenschluss-Test_1mm.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Insel_Luecke_5mm.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Insel_Luecke_5mm.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Insel_Luecke_5mm.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Insel_Luecke_5mm.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Luecke.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Luecke.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Luecke.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/Test_Luecke.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_kein-flaechenschluss.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_kein-flaechenschluss.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_kein-flaechenschluss.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_kein-flaechenschluss.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_wirksamkeit.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_wirksamkeit.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_wirksamkeit.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/V4_1_ID_103_wirksamkeit.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/equalFlaechenschlussGeometries.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/equalFlaechenschlussGeometries.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/equalFlaechenschlussGeometries.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/equalFlaechenschlussGeometries.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/test41-54_1-missing-gehoertZuBereich.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_1_Flaechenschlussfehler.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_1_Flaechenschlussfehler.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_1_Flaechenschlussfehler.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_1_Flaechenschlussfehler.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_2_Flaechenschlussfehler.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_2_Flaechenschlussfehler.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_2_Flaechenschlussfehler.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_1_4_2_Flaechenschlussfehler.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_5_4_2_Flaechenschlussfehler.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_5_4_2_Flaechenschlussfehler.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_5_4_2_Flaechenschlussfehler.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan51-5_5_4_2_Flaechenschlussfehler.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_Luecke_Geltungsbereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_Luecke_Geltungsbereich.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_Luecke_Geltungsbereich.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_Luecke_Geltungsbereich.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_vollstaendige_Ueberlappung.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_vollstaendige_Ueberlappung.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_vollstaendige_Ueberlappung.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan52_Flaechenschlussfehler_vollstaendige_Ueberlappung.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan53-4_1_7_1_Flaechenschlussfehler.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan53-4_1_7_1_Flaechenschlussfehler.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan53-4_1_7_1_Flaechenschlussfehler.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan53-4_1_7_1_Flaechenschlussfehler.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan54_Flaechenschlussfehler_Luecken.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan54_Flaechenschlussfehler_Luecken.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan54_Flaechenschlussfehler_Luecken.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan54_Flaechenschlussfehler_Luecken.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_Luecke.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_Luecke.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_Luecke.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_Luecke.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_valide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_valide.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_valide.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/xplan60_Aenderungsplan_valide.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Geltungsbereich-Test.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Geltungsbereich-Test.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Geltungsbereich-Test.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Schnittpunkte_Geltungsbereich_Polygon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Schnittpunkte_Geltungsbereich_Polygon.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Schnittpunkte_Geltungsbereich_Polygon.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/1_Schnittpunkte_Geltungsbereich_Polygon.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Geltungsbereich-Test.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Geltungsbereich-Test.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Geltungsbereich-Test.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Schnittpunkte_Geltungsbereich_Polygon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Schnittpunkte_Geltungsbereich_Polygon.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Schnittpunkte_Geltungsbereich_Polygon.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/2_Schnittpunkte_Geltungsbereich_Polygon.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Geltungsbereich-Test.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Geltungsbereich-Test.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Geltungsbereich-Test.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Schnittpunkte_Geltungsbereich_Polygon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Schnittpunkte_Geltungsbereich_Polygon.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Schnittpunkte_Geltungsbereich_Polygon.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/3_Schnittpunkte_Geltungsbereich_Polygon.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Geltungsbereich-Test.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Geltungsbereich-Test.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Geltungsbereich-Test.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Schnittpunkte_Geltungsbereich_Polygon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Schnittpunkte_Geltungsbereich_Polygon.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Schnittpunkte_Geltungsbereich_Polygon.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/4_Schnittpunkte_Geltungsbereich_Polygon.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Geltungsbereich-Test.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Geltungsbereich-Test.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Geltungsbereich-Test.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Schnittpunkte_Geltungsbereich_Linie.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Schnittpunkte_Geltungsbereich_Linie.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Schnittpunkte_Geltungsbereich_Linie.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/5_Schnittpunkte_Geltungsbereich_Linie.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Geltungsbereich-Test.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Geltungsbereich-Test.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Geltungsbereich-Test.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Schnittpunkte_Geltungsbereich_Linie.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Schnittpunkte_Geltungsbereich_Linie.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Schnittpunkte_Geltungsbereich_Linie.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/6_Schnittpunkte_Geltungsbereich_Linie.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Geltungsbereich-Test.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Geltungsbereich-Test.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Geltungsbereich-Test.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Geltungsbereich-Test.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Schnittpunkte_Geltungsbereich_Linie.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Schnittpunkte_Geltungsbereich_Linie.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Schnittpunkte_Geltungsbereich_Linie.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/7_Schnittpunkte_Geltungsbereich_Linie.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/8_Schnittpunkte_Geltungsbereich_Linie.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/8_Schnittpunkte_Geltungsbereich_Linie.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/8_Schnittpunkte_Geltungsbereich_Linie.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/8_Schnittpunkte_Geltungsbereich_Linie.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan001_5-4_Sliver-Polygon.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan001_5-4_Sliver-Polygon.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan001_5-4_Sliver-Polygon.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan001_5-4_Sliver-Polygon.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan002_5-2_Schnittpunkt_Geltungsbereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan002_5-2_Schnittpunkt_Geltungsbereich.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan002_5-2_Schnittpunkt_Geltungsbereich.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan002_5-2_Schnittpunkt_Geltungsbereich.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Kompensationsbereich_6-0-2_valide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Kompensationsbereich_6-0-2_valide.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Kompensationsbereich_6-0-2_valide.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Kompensationsbereich_6-0-2_valide.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Teilbereich_6-0-2_invalide.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Teilbereich_6-0-2_invalide.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Teilbereich_6-0-2_invalide.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/BPlan_Teilbereich_6-0-2_invalide.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/HafenCity11_HafenCity14_Bereich_ohne_Geometrie.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/HafenCity11_HafenCity14_Bereich_ohne_Geometrie.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/HafenCity11_HafenCity14_Bereich_ohne_Geometrie.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/HafenCity11_HafenCity14_Bereich_ohne_Geometrie.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/SystematischeGeltungsbereichspruefung_GPundGB.jpg b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/SystematischeGeltungsbereichspruefung_GPundGB.jpg
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/SystematischeGeltungsbereichspruefung_GPundGB.jpg
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/SystematischeGeltungsbereichspruefung_GPundGB.jpg
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereich.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereich.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereich.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereichLoch.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereichLoch.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereichLoch.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/Testplan_position_geltungsbereichLoch.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/V4_1_ID_103_withtolerance.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/V4_1_ID_103_withtolerance.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/V4_1_ID_103_withtolerance.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/V4_1_ID_103_withtolerance.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich-multipleBereiche.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/inspector/geltungsbereich/test41-54_1-missing-gehoertZuBereich.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/invalidSelfintersectionDeteced.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/invalidSelfintersectionDeteced.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/invalidSelfintersectionDeteced.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/invalidSelfintersectionDeteced.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-covering.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-covering.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-covering.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-covering.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersection.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersection.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersection.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersection.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersectionInIntersection.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersectionInIntersection.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersectionInIntersection.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-intersectionInIntersection.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-touches.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-touches.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-touches.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface-touches.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/multiSurface.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygon-orientation-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygon-orientation-invalid.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygon-orientation-invalid.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygon-orientation-invalid.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing-touching.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing-touching.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing-touching.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing-touching.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRing.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRings-touching.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRings-touching.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRings-touching.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/polygonWithInteriorRings-touching.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRIng-2intersections.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRIng-2intersections.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRIng-2intersections.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRIng-2intersections.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing-samePoint.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing-samePoint.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing-samePoint.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing-samePoint.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/selfIntersectingRing.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/surface.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/surface.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/geometric/surface.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/geometric/surface.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/exists.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/exists.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/exists.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/exists.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/falseStatement.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/falseStatement.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/falseStatement.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/falseStatement.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId-warningsAndErrors.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId-warningsAndErrors.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId-warningsAndErrors.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId-warningsAndErrors.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlId.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlIds.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlIds.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlIds.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/gmlIds.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.unrule b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.unrule
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.unrule
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.unrule
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/so/SOignore.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/sub/Sub.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/sub/Sub.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/sub/Sub.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/sub/Sub.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml40/hello.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml40/hello.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml40/hello.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml40/hello.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/41.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/41.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/41.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/41.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/41_XPignore.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/41_XPignore.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/41_XPignore.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/41_XPignore.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/subXp/41_XPignore_Sub.xq b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/subXp/41_XPignore_Sub.xq
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/subXp/41_XPignore_Sub.xq
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/configuration/xquery/rules/xplangml41/xp/subXp/41_XPignore_Sub.xq
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP2070.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP2070.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP2070.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP2070.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-LineString.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-LineString.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-LineString.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-LineString.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussFalse.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussFalse.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussFalse.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussFalse.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussTrue.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussTrue.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussTrue.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_GemeinschaftsanlagenZuordnung-Polygon-flaechenschlussTrue.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-LineString.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-LineString.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-LineString.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-LineString.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussFalse.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussFalse.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussFalse.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussFalse.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussTrue.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussTrue.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussTrue.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/BP_Landwirtschaft-Polygon-flaechenschlussTrue.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-bereich-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-bereich-invalid.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-bereich-invalid.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-bereich-invalid.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuBereich-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuBereich-invalid.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuBereich-invalid.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuBereich-invalid.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuPlan-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuPlan-invalid.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuPlan-invalid.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-gehoertZuPlan-invalid.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-planinhalt-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-planinhalt-invalid.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-planinhalt-invalid.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-planinhalt-invalid.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-refBegruendungInhalt-invalid.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-refBegruendungInhalt-invalid.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-refBegruendungInhalt-invalid.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo-refBegruendungInhalt-invalid.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/Demo.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/FPlan.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/FPlan.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/FPlan.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/FPlan.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/LA67.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/LA67.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/LA67.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/LA67.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/V4_1_ID_103.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/V4_1_ID_103.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/V4_1_ID_103.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/5.0/V4_1_ID_103.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_AnpflanzungBindungErhaltung-Polygon-flaechenschlussTrue.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_AnpflanzungBindungErhaltung-Polygon-flaechenschlussTrue.xml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_AnpflanzungBindungErhaltung-Polygon-flaechenschlussTrue.xml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_AnpflanzungBindungErhaltung-Polygon-flaechenschlussTrue.xml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_BaugebietsTeilFlaeche-GFZ_GF_GRZ_GZ.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_BaugebietsTeilFlaeche-GFZ_GF_GRZ_GZ.xml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_BaugebietsTeilFlaeche-GFZ_GF_GRZ_GZ.xml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_BaugebietsTeilFlaeche-GFZ_GF_GRZ_GZ.xml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-mehrfacheZBUndWeitere.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-mehrfacheZBUndWeitere.xml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-mehrfacheZBUndWeitere.xml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-mehrfacheZBUndWeitere.xml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-nurWeitereZB.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-nurWeitereZB.xml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-nurWeitereZB.xml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_NebenanlagenFlaeche-nurWeitereZB.xml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_UnverbindlicheVormerkung-Polygon-flaechenschlussTrue.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_UnverbindlicheVormerkung-Polygon-flaechenschlussTrue.xml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_UnverbindlicheVormerkung-Polygon-flaechenschlussTrue.xml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_UnverbindlicheVormerkung-Polygon-flaechenschlussTrue.xml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_Wegerecht-Polygon-flaechenschlussFehlt.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_Wegerecht-Polygon-flaechenschlussFehlt.xml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_Wegerecht-Polygon-flaechenschlussFehlt.xml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/BP_Wegerecht-Polygon-flaechenschlussFehlt.xml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/XP_PPO-positionPoint-keinFlaechenschluss.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/XP_PPO-positionPoint-keinFlaechenschluss.xml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/XP_PPO-positionPoint-keinFlaechenschluss.xml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/XP_PPO-positionPoint-keinFlaechenschluss.xml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/inhaltBPPlan-referenziertSO.xml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/inhaltBPPlan-referenziertSO.xml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/inhaltBPPlan-referenziertSO.xml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/inhaltBPPlan-referenziertSO.xml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/xplan.gml b/xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/xplan.gml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/de/latlon/xplan/validator/semantic/xquery/xplan.gml
rename to xplan-core/xplan-core-validator/src/test/resources/de/latlon/xplan/validator/semantic/xquery/xplan.gml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/log4j2-test.yaml b/xplan-core/xplan-core-validator/src/test/resources/log4j2-test.yaml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/log4j2-test.yaml
rename to xplan-core/xplan-core-validator/src/test/resources/log4j2-test.yaml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/profiles-test1.yml b/xplan-core/xplan-core-validator/src/test/resources/profiles-test1.yml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/profiles-test1.yml
rename to xplan-core/xplan-core-validator/src/test/resources/profiles-test1.yml
diff --git a/xplan-core/xplan-validator-core/src/test/resources/profiles-test2.yaml b/xplan-core/xplan-core-validator/src/test/resources/profiles-test2.yaml
similarity index 100%
rename from xplan-core/xplan-validator-core/src/test/resources/profiles-test2.yaml
rename to xplan-core/xplan-core-validator/src/test/resources/profiles-test2.yaml
diff --git a/xplan-core/xplan-validator-core/src/xjc/bindings.xjc b/xplan-core/xplan-core-validator/src/xjc/bindings.xjc
similarity index 100%
rename from xplan-core/xplan-validator-core/src/xjc/bindings.xjc
rename to xplan-core/xplan-core-validator/src/xjc/bindings.xjc
diff --git a/xplan-dokumente/xplan-dokumente-api/pom.xml b/xplan-dokumente/xplan-dokumente-api/pom.xml
index 67e7650b22..4d64521b46 100755
--- a/xplan-dokumente/xplan-dokumente-api/pom.xml
+++ b/xplan-dokumente/xplan-dokumente-api/pom.xml
@@ -102,7 +102,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-manager-core</artifactId>
+      <artifactId>xplan-core-manager</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/xplan-manager/xplan-manager-api/pom.xml b/xplan-manager/xplan-manager-api/pom.xml
index c37a38a4bd..636668cbf8 100644
--- a/xplan-manager/xplan-manager-api/pom.xml
+++ b/xplan-manager/xplan-manager-api/pom.xml
@@ -99,7 +99,7 @@
     <!-- xPlanBox -->
     <dependency>
       <groupId>de.latlon.product.xplanbox</groupId>
-      <artifactId>xplan-manager-core</artifactId>
+      <artifactId>xplan-core-manager</artifactId>
     </dependency>
     <dependency>
       <groupId>de.latlon.product.xplanbox</groupId>
diff --git a/xplan-manager/xplan-manager-web/pom.xml b/xplan-manager/xplan-manager-web/pom.xml
index c3c862796b..2113ec82bf 100644
--- a/xplan-manager/xplan-manager-web/pom.xml
+++ b/xplan-manager/xplan-manager-web/pom.xml
@@ -169,11 +169,11 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
@@ -187,7 +187,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-manager-core</artifactId>
+      <artifactId>xplan-core-manager</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.eclipse.jdt.core.compiler</groupId>
diff --git a/xplan-validator/xplan-validator-api/pom.xml b/xplan-validator/xplan-validator-api/pom.xml
index 930c778dce..1354550d77 100755
--- a/xplan-validator/xplan-validator-api/pom.xml
+++ b/xplan-validator/xplan-validator-api/pom.xml
@@ -144,7 +144,7 @@
     <!-- xPlanBox -->
     <dependency>
       <groupId>de.latlon.product.xplanbox</groupId>
-      <artifactId>xplan-validator-core</artifactId>
+      <artifactId>xplan-core-validator</artifactId>
       <exclusions>
         <exclusion>
           <groupId>com.google.code.findbugs</groupId>
diff --git a/xplan-validator/xplan-validator-web/pom.xml b/xplan-validator/xplan-validator-web/pom.xml
index 00b0b1285b..37a3dcef48 100644
--- a/xplan-validator/xplan-validator-web/pom.xml
+++ b/xplan-validator/xplan-validator-web/pom.xml
@@ -175,16 +175,16 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-commons</artifactId>
+      <artifactId>xplan-core-commons</artifactId>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>xplan-validator-core</artifactId>
+      <artifactId>xplan-core-validator</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.eclipse.jdt.core.compiler</groupId>
-- 
GitLab