From 14ff803a5c3f5f4e6bff217ba36b3f10f10660e9 Mon Sep 17 00:00:00 2001
From: "Bernhard J. Berger" <bernhard.berger@uni-bremen.de>
Date: Tue, 7 Feb 2023 09:30:41 +0100
Subject: [PATCH] Renamed module de.evoal.core to de.evoal.core.main. Thus,
 this commut implements #2

---
 ci/create-release.sh                          |  6 ++--
 .../src/main/java/module-info.java            |  2 +-
 .../scripts/run-arff-to-ddl.sh                |  6 +---
 .../scripts/run-convert-arff.sh               |  6 +---
 .../src/main/java/module-info.java            |  2 +-
 .../pom.xml                                   | 12 ++++----
 src/core/de.evoal.core.main/scripts/paths.env | 11 +++++++
 .../de.evoal.core.main/scripts/run-search.sh  | 16 ++++++++++
 .../de/evoal/core/api/board/Blackboard.java   |  0
 .../evoal/core/api/board/BlackboardEntry.java |  0
 .../de/evoal/core/api/board/package-info.java |  0
 .../de/evoal/core/api/cdi/BeanFactory.java    |  0
 .../evoal/core/api/cdi/BlackboardValue.java   |  0
 .../core/api/cdi/ConfigurationValue.java      |  0
 .../java/de/evoal/core/api/cdi/MainClass.java |  0
 .../de/evoal/core/api/cdi/package-info.java   |  0
 .../evoal/core/api/ea/codec/CustomCodec.java  |  0
 .../calculation/CalculationFactory.java       |  0
 .../calculation/CalculationStrategy.java      |  0
 .../api/ea/constraints/model/Constraint.java  |  0
 .../constraints/model/ConstraintResult.java   |  0
 .../ea/constraints/model/ConstraintType.java  |  0
 .../api/ea/constraints/model/Constraints.java |  0
 .../ea/constraints/model/DataConstraints.java |  0
 .../ea/constraints/model/package-info.java    |  0
 .../core/api/ea/constraints/package-info.java |  0
 .../strategies/CalculationResult.java         |  0
 .../strategies/HandlingStrategy.java          |  0
 .../strategies/RepairStrategy.java            |  0
 .../fitness/MalusForFitnessStrategy.java      |  0
 .../strategies/fitness/MalusFunction.java     |  0
 .../fitness/internal/ChainFunction.java       |  0
 .../fitness/internal/IdentityFunction.java    |  0
 .../fitness/internal/package-info.java        |  0
 .../strategies/fitness/package-info.java      |  0
 .../core/api/ea/correlations/Correlation.java |  0
 .../api/ea/correlations/Correlations.java     |  0
 .../evoal/core/api/ea/correlations/Range.java |  0
 .../ea/correlations/RangedCorrelation.java    |  0
 .../core/api/ea/fitness/FitnessDecorator.java |  0
 .../core/api/ea/fitness/FitnessFunction.java  |  0
 .../fitness/comparator/FitnessComparator.java |  0
 .../ea/fitness/comparator/FitnessValue.java   |  0
 .../core/api/ea/fitness/package-info.java     |  0
 .../api/ea/initial/InitialPopulation.java     |  0
 .../de/evoal/core/api/ea/package-info.java    |  0
 .../evoal/core/api/properties/Properties.java |  0
 .../core/api/properties/PropertiesPair.java   |  0
 .../properties/PropertiesSpecification.java   |  0
 .../api/properties/PropertySpecification.java |  0
 .../properties/info/PropertiesBoundaries.java |  0
 .../info/PropertiesDependencies.java          |  0
 .../api/properties/info/PropertiesRanges.java |  0
 .../properties/io/PropertiesIOFactory.java    |  0
 .../api/properties/io/PropertiesReader.java   |  0
 .../api/properties/io/PropertiesWriter.java   |  0
 .../FileBasedPropertiesStreamSupplier.java    |  0
 ...tiesBasedPropertiesPairStreamSupplier.java |  0
 ...opertiesBasedPropertiesStreamSupplier.java |  0
 .../stream/PropertiesPairStreamSupplier.java  |  0
 .../stream/PropertiesStreamSupplier.java      |  0
 .../api/search/OptimisationAlgorithm.java     |  0
 .../de/evoal/core/api/statistics/Column.java  |  0
 .../evoal/core/api/statistics/ColumnType.java |  0
 .../core/api/statistics/StatisticsWriter.java |  0
 .../de/evoal/core/api/statistics/Writer.java  |  0
 .../core/api/statistics/WriterContext.java    |  0
 .../core/api/statistics/WriterException.java  |  0
 .../core/api/statistics/WriterStrategy.java   |  0
 .../core/api/statistics/package-info.java     |  0
 .../evoal/core/api/utils/ConstantSwitch.java  |  0
 .../core/api/utils/ConverterFunctions.java    |  0
 .../evoal/core/api/utils/EvoalException.java  |  0
 .../core/api/utils/EvoalIOException.java      |  0
 .../api/utils/InitializationException.java    |  0
 .../evoal/core/api/utils/LanguageHelper.java  |  0
 .../de/evoal/core/api/utils/Requirements.java |  0
 .../main/java/de/evoal/core/main/Evoal.java   |  0
 .../core/main/ea/alterer/AltererFactory.java  |  0
 .../crossover/CorrelationCrossover.java       |  0
 .../CorrelationCrossoverMemento.java          |  0
 .../crossover/LineCorrelationCrossover.java   |  0
 .../LineCorrelationCrossoverMemento.java      |  0
 .../MultiPointCorrelationCrossover.java       |  0
 ...MultiPointCorrelationCrossoverMemento.java |  0
 .../PartiallyMatchedCorrelationCrossover.java |  0
 ...llyMatchedCorrelationCrossoverMemento.java |  0
 .../SinglePointCorrelationCrossover.java      |  0
 ...inglePointCorrelationCrossoverMemento.java |  0
 .../UniformCorrelationCrossover.java          |  0
 .../UniformCorrelationCrossoverMemento.java   |  0
 .../internal/AbstractCorrelationAlterer.java  |  0
 .../internal/CorrelationCombineAlterer.java   |  0
 .../internal/CorrelationRecombinator.java     |  0
 .../internal/MeanCorrelationAlterer.java      |  0
 .../alterer/mutator/CorrelationMutator.java   |  0
 .../mutator/CorrelationMutatorFactory.java    |  0
 .../mutator/CorrelationMutatorMemento.java    |  0
 .../mutator/GaussianCorrelationMutator.java   |  0
 .../GaussianCorrelationMutatorMemento.java    |  0
 .../SingleBitFlipCorrelationMutator.java      |  0
 ...ingleBitFlipCorrelationMutatorMemento.java |  0
 .../alterer/mutator/SingleBitFlipMutator.java |  0
 .../mutator/SwapCorrelationMutator.java       |  0
 .../SwapCorrelationMutatorMemento.java        |  0
 .../core/main/ea/codec/DynamicCodec.java      |  0
 .../main/ea/codec/DynamicCodecProducer.java   |  0
 .../chromosome/DynamicBitChromosome.java      |  0
 .../DynamicBoundedDoubleChromosome.java       |  0
 .../DynamicBoundedIntegerChromosome.java      |  0
 .../codec/chromosome/DynamicChromosome.java   |  0
 .../chromosome/DynamicChromosomeFactory.java  |  0
 .../chromosome/DynamicDoubleChromosome.java   |  0
 .../chromosome/DynamicGrayChromosome.java     |  0
 .../chromosome/DynamicIntegerChromosome.java  |  0
 .../chromosome/DynamicScaledChromosome.java   |  0
 .../main/ea/comparator/ParetoComparator.java  |  0
 .../ea/comparator/ParetoFitnessValue.java     |  0
 .../ea/comparator/WeightedSumComparator.java  |  0
 .../comparator/WeightedSumFitnessValue.java   |  0
 .../constraint/ConstraintProducer.java        |  0
 .../constraint/ast/BoundaryIdentifier.java    |  0
 .../constraint/ast/ConditionConverter.java    |  0
 .../ast/UnaryBoundaryIdentifier.java          |  0
 .../calculations/NormalCalculation.java       |  0
 .../StandardDeviationCalculation.java         |  0
 .../JeneticsConstraintProducer.java           |  0
 .../JeneticsConstraintStrategy.java           |  0
 .../constraint/RandomGenotypeStrategy.java    |  0
 .../fitness/MalusFunctionProducer.java        |  0
 .../internal/MalusForFitnessFunction.java     |  0
 .../utils/ArithmeticNumberOperations.java     |  0
 .../constraint/utils/ConfigurationUtils.java  |  0
 .../correlation/CorrelationsProducer.java     |  0
 .../constraints/correlation/el/AstHelper.java |  0
 .../correlation/el/RangeSwitch.java           |  0
 .../deviation/DeviationProducer.java          |  0
 .../deviation/model/Deviation.java            |  0
 .../deviation/model/Deviations.java           |  0
 .../main/ea/constraints/el/CallSwitch.java    |  0
 .../constraints/el/DataReferenceSwitch.java   |  0
 .../core/main/ea/constraints/el/ElHelper.java |  0
 .../main/ea/constraints/el/NumberSwitch.java  |  0
 .../main/ea/constraints/el/StringSwitch.java  |  0
 .../constraints/el/ValueReferenceSwitch.java  |  0
 .../core/main/ea/fitness/DistanceFitness.java |  0
 .../core/main/ea/fitness/FitnessFactory.java  |  0
 .../ea/fitness/JeneticsFitnessFunction.java   |  0
 .../core/main/ea/fitness/MalusFitness.java    |  0
 .../ea/initial/InitialPopulationFactory.java  |  0
 .../ea/initial/RandomInitialPopulation.java   |  0
 .../core/main/ea/initial/RandomProducer.java  |  0
 .../producer/OptimizingFunctionProducer.java  |  0
 .../main/ea/producer/SelectorFactory.java     |  0
 .../search/EvolutionaryAlgorithmSearch.java   |  0
 .../jenetics/AbstractBoundedChromosome.java   |  0
 .../core/main/jenetics/BitChromosome.java     |  0
 .../evoal/core/main/jenetics/BitHelper.java   |  0
 .../main/jenetics/BoundedBitChromosome.java   |  0
 .../jenetics/BoundedDoubleChromosome.java     |  0
 .../core/main/jenetics/BoundedDoubleGene.java |  0
 .../jenetics/BoundedIntegerChromosome.java    |  0
 .../main/jenetics/BoundedIntegerGene.java     |  0
 .../core/main/jenetics/BoundedOperations.java |  0
 .../core/main/jenetics/ConstraintList.java    |  0
 .../core/main/jenetics/DecimalFactory.java    |  0
 .../jenetics/GrayBoundedBitChromosome.java    |  0
 .../evoal/core/main/jenetics/GrayHelper.java  |  0
 .../jenetics/NaiveBoundedBitChromosome.java   |  0
 .../main/jenetics/VariableChromosome.java     |  0
 .../producer/BlackboardValueProducer.java     |  0
 .../producer/ConfigurationValueProducer.java  |  0
 .../evoal/core/main/producer/DSLFinder.java   |  0
 .../main/producer/DataConstraintProducer.java |  0
 .../producer/OptimisationModelLoader.java     |  0
 .../PropertiesBoundariesProducer.java         |  0
 .../producer/PropertiesRangesProducer.java    |  0
 .../main/producer/SpecificationProducer.java  |  0
 .../main/properties/JsonPropertiesReader.java |  0
 .../main/properties/JsonPropertiesWriter.java |  0
 .../search/HeuristicSearchEvaluation.java     |  0
 .../core/main/search/HeuristicSearchMain.java |  0
 .../main/search/HeuristicSearchUtils.java     |  0
 .../main/statistics/StatisticsFactory.java    |  0
 .../statistics/fitness/FitnessStatistics.java |  0
 .../fitness/OptimizingStatistics.java         |  0
 .../individuals/IndividualStatistics.java     |  0
 .../internal/MultipleStatisticsWriter.java    |  0
 .../main/statistics/nop/NopStatistics.java    |  0
 .../statistics/writer/csv/CsvStrategy.java    |  0
 .../main/statistics/writer/csv/CsvWriter.java |  0
 .../src/main/java/module-info.java            |  3 +-
 .../src/main/resources/META-INF/MANIFEST.MF   |  0
 .../src/main/resources/META-INF/beans.xml     |  0
 .../META-INF/definitions/ddl/si-units.ddl     |  0
 .../resources/META-INF/definitions/ea/core.dl |  0
 .../src/main/resources/logback.xml            |  0
 .../core/api/board/BlackboardEntryTest.java   |  0
 src/core/de.evoal.core.plugin/pom.xml         |  2 +-
 src/core/de.evoal.core/scripts/paths.env      |  2 --
 src/core/de.evoal.core/scripts/run-search.sh  | 23 ---------------
 .../scripts/debug-generator.sh                |  8 ++---
 .../scripts/run-generator.sh                  |  6 +---
 .../src/main/java/module-info.java            |  2 +-
 src/core/de.evoal.releng.parent/pom.xml       |  2 +-
 .../scripts/debug-search-with-surrogate.sh    | 11 ++-----
 .../scripts/debug-training.sh                 |  8 ++---
 .../scripts/run-search-with-surrogate.sh      |  9 +-----
 .../scripts/run-training.sh                   |  6 +---
 .../src/main/java/module-info.java            |  2 +-
 .../src/main/java/module-info.java            |  2 +-
 .../src/main/java/module-info.java            |  2 +-
 .../src/main/java/module-info.java            |  2 +-
 src/core/de.evoal.surrogate.ws/pom.xml        | 23 +++++++++++++++
 .../evoal/surrogate/ws/WebServiceFitness.java | 29 +++++++++++++++++++
 .../src/main/java/module-info.java            | 14 +++++++++
 216 files changed, 123 insertions(+), 94 deletions(-)
 rename src/core/{de.evoal.core => de.evoal.core.main}/pom.xml (98%)
 create mode 100644 src/core/de.evoal.core.main/scripts/paths.env
 create mode 100755 src/core/de.evoal.core.main/scripts/run-search.sh
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/board/Blackboard.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/board/BlackboardEntry.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/board/package-info.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/cdi/BeanFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/cdi/BlackboardValue.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/cdi/ConfigurationValue.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/cdi/MainClass.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/cdi/package-info.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/codec/CustomCodec.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/calculation/CalculationFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/calculation/CalculationStrategy.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/model/Constraint.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/model/ConstraintResult.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/model/ConstraintType.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/model/Constraints.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/model/DataConstraints.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/model/package-info.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/package-info.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/strategies/CalculationResult.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/strategies/HandlingStrategy.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/strategies/RepairStrategy.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/MalusForFitnessStrategy.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/MalusFunction.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/ChainFunction.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/IdentityFunction.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/package-info.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/package-info.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/correlations/Correlation.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/correlations/Correlations.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/correlations/Range.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/correlations/RangedCorrelation.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/fitness/FitnessDecorator.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/fitness/FitnessFunction.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/fitness/comparator/FitnessComparator.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/fitness/comparator/FitnessValue.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/fitness/package-info.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/initial/InitialPopulation.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/ea/package-info.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/Properties.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/PropertiesPair.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/PropertiesSpecification.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/PropertySpecification.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/info/PropertiesBoundaries.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/info/PropertiesDependencies.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/info/PropertiesRanges.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/io/PropertiesIOFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/io/PropertiesReader.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/io/PropertiesWriter.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/stream/FileBasedPropertiesStreamSupplier.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/stream/PropertiesBasedPropertiesPairStreamSupplier.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/stream/PropertiesBasedPropertiesStreamSupplier.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/stream/PropertiesPairStreamSupplier.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/properties/stream/PropertiesStreamSupplier.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/search/OptimisationAlgorithm.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/statistics/Column.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/statistics/ColumnType.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/statistics/StatisticsWriter.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/statistics/Writer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/statistics/WriterContext.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/statistics/WriterException.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/statistics/WriterStrategy.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/statistics/package-info.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/utils/ConstantSwitch.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/utils/ConverterFunctions.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/utils/EvoalException.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/utils/EvoalIOException.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/utils/InitializationException.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/utils/LanguageHelper.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/api/utils/Requirements.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/Evoal.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/AltererFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/CorrelationCrossover.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/CorrelationCrossoverMemento.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/LineCorrelationCrossover.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/LineCorrelationCrossoverMemento.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/MultiPointCorrelationCrossover.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/MultiPointCorrelationCrossoverMemento.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/PartiallyMatchedCorrelationCrossover.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/PartiallyMatchedCorrelationCrossoverMemento.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/SinglePointCorrelationCrossover.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/SinglePointCorrelationCrossoverMemento.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/UniformCorrelationCrossover.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/crossover/UniformCorrelationCrossoverMemento.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/internal/AbstractCorrelationAlterer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/internal/CorrelationCombineAlterer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/internal/CorrelationRecombinator.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/internal/MeanCorrelationAlterer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutator.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutatorFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutatorMemento.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/mutator/GaussianCorrelationMutator.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/mutator/GaussianCorrelationMutatorMemento.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipCorrelationMutator.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipCorrelationMutatorMemento.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipMutator.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/mutator/SwapCorrelationMutator.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/alterer/mutator/SwapCorrelationMutatorMemento.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/DynamicCodec.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/DynamicCodecProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBitChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBoundedDoubleChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBoundedIntegerChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicChromosomeFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicDoubleChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicGrayChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicIntegerChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicScaledChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/comparator/ParetoComparator.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/comparator/ParetoFitnessValue.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumComparator.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumFitnessValue.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/ConstraintProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/BoundaryIdentifier.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/ConditionConverter.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/UnaryBoundaryIdentifier.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/calculations/NormalCalculation.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/calculations/StandardDeviationCalculation.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/JeneticsConstraintProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/JeneticsConstraintStrategy.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/RandomGenotypeStrategy.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/fitness/MalusFunctionProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/fitness/internal/MalusForFitnessFunction.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/utils/ArithmeticNumberOperations.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/constraint/utils/ConfigurationUtils.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/correlation/CorrelationsProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/correlation/el/AstHelper.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/correlation/el/RangeSwitch.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/deviation/DeviationProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/deviation/model/Deviation.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/deviation/model/Deviations.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/el/CallSwitch.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/el/DataReferenceSwitch.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/el/ElHelper.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/el/NumberSwitch.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/el/StringSwitch.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/constraints/el/ValueReferenceSwitch.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/fitness/DistanceFitness.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/fitness/FitnessFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/fitness/JeneticsFitnessFunction.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/fitness/MalusFitness.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/initial/InitialPopulationFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/initial/RandomInitialPopulation.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/initial/RandomProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/producer/OptimizingFunctionProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/producer/SelectorFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/ea/search/EvolutionaryAlgorithmSearch.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/AbstractBoundedChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/BitChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/BitHelper.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/BoundedBitChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/BoundedDoubleChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/BoundedDoubleGene.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/BoundedIntegerChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/BoundedIntegerGene.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/BoundedOperations.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/ConstraintList.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/DecimalFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/GrayBoundedBitChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/GrayHelper.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/NaiveBoundedBitChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/jenetics/VariableChromosome.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/producer/BlackboardValueProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/producer/ConfigurationValueProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/producer/DSLFinder.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/producer/DataConstraintProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/producer/OptimisationModelLoader.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/producer/PropertiesBoundariesProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/producer/PropertiesRangesProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/producer/SpecificationProducer.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/properties/JsonPropertiesReader.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/properties/JsonPropertiesWriter.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/search/HeuristicSearchEvaluation.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/search/HeuristicSearchMain.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/search/HeuristicSearchUtils.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/statistics/StatisticsFactory.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/statistics/fitness/FitnessStatistics.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/statistics/fitness/OptimizingStatistics.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/statistics/internal/MultipleStatisticsWriter.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/statistics/nop/NopStatistics.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/statistics/writer/csv/CsvStrategy.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/de/evoal/core/main/statistics/writer/csv/CsvWriter.java (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/java/module-info.java (99%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/resources/META-INF/MANIFEST.MF (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/resources/META-INF/beans.xml (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/resources/META-INF/definitions/ddl/si-units.ddl (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/resources/META-INF/definitions/ea/core.dl (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/main/resources/logback.xml (100%)
 rename src/core/{de.evoal.core => de.evoal.core.main}/src/test/java/de/evoal/core/api/board/BlackboardEntryTest.java (100%)
 delete mode 100644 src/core/de.evoal.core/scripts/paths.env
 delete mode 100755 src/core/de.evoal.core/scripts/run-search.sh
 create mode 100644 src/core/de.evoal.surrogate.ws/pom.xml
 create mode 100644 src/core/de.evoal.surrogate.ws/src/main/java/de/evoal/surrogate/ws/WebServiceFitness.java
 create mode 100644 src/core/de.evoal.surrogate.ws/src/main/java/module-info.java

diff --git a/ci/create-release.sh b/ci/create-release.sh
index 852f266e..30425971 100755
--- a/ci/create-release.sh
+++ b/ci/create-release.sh
@@ -7,7 +7,7 @@ RELEASE_PLUGINS="generator.main surrogate.api surrogate.simple surrogate.svr app
 mkdir -p evoal/plugins
 
 cp src/languages/de.evoal.languages.releng.site/target/de.evoal.languages.releng.site-*.zip "evoal/eclipse-update-site.zip"
-cp -r src/core/de.evoal.core/target/core evoal/modules
+cp -r src/core/de.evoal.core.main/target/core.main evoal/modules
 
 for NAME in $RELEASE_PLUGINS; do
     echo "Copying plugin $NAME"
@@ -40,11 +40,11 @@ rm -rf xtext-merge
 # let's copy the scripts to the correct location
 mkdir bin
 
-cp -r ../src/core/de.evoal.core/scripts/* "bin"
+cp -r ../src/core/de.evoal.core.main/scripts/* "bin"
 for NAME in $RELEASE_PLUGINS; do
     echo "Copying scripts of plugin $NAME"
 
     if [ -e ../src/core/de.evoal.$NAME/scripts ]; then
       cp -r ../src/core/de.evoal.$NAME/scripts/* bin
     fi
-done
\ No newline at end of file
+done
diff --git a/src/core/de.evoal.approximative.density/src/main/java/module-info.java b/src/core/de.evoal.approximative.density/src/main/java/module-info.java
index 26926022..ceeee4e2 100644
--- a/src/core/de.evoal.approximative.density/src/main/java/module-info.java
+++ b/src/core/de.evoal.approximative.density/src/main/java/module-info.java
@@ -8,7 +8,7 @@ module de.evoal.approximative.density {
 
     requires de.evoal.languages.model.instance;
 
-    requires de.evoal.core;
+    requires de.evoal.core.main;
     requires de.evoal.surrogate.api;
 
     requires smile.math;
diff --git a/src/core/de.evoal.core.arff/scripts/run-arff-to-ddl.sh b/src/core/de.evoal.core.arff/scripts/run-arff-to-ddl.sh
index 7d12bf34..5ae425d2 100755
--- a/src/core/de.evoal.core.arff/scripts/run-arff-to-ddl.sh
+++ b/src/core/de.evoal.core.arff/scripts/run-arff-to-ddl.sh
@@ -10,11 +10,7 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java $CLASSPATH \
      -Bcore:main=extract-data-definition-from-arff \
      -Barff:input=$2 \
      -Barff:output=$3
diff --git a/src/core/de.evoal.core.arff/scripts/run-convert-arff.sh b/src/core/de.evoal.core.arff/scripts/run-convert-arff.sh
index e46d4aa7..9b85fc2b 100755
--- a/src/core/de.evoal.core.arff/scripts/run-convert-arff.sh
+++ b/src/core/de.evoal.core.arff/scripts/run-convert-arff.sh
@@ -10,11 +10,7 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java $CLASSPATH \
      -Bcore:main=convert-arff-to-json \
      -Barff:input=$2 \
      -Barff:ddl-specification=$3 \
diff --git a/src/core/de.evoal.core.arff/src/main/java/module-info.java b/src/core/de.evoal.core.arff/src/main/java/module-info.java
index 0be6a9f5..de1dfb5e 100644
--- a/src/core/de.evoal.core.arff/src/main/java/module-info.java
+++ b/src/core/de.evoal.core.arff/src/main/java/module-info.java
@@ -11,7 +11,7 @@ module de.evoal.core.arff {
 
     requires weka.stable;
 
-    requires de.evoal.core;
+    requires de.evoal.core.main;
     requires de.evoal.languages.model.ddl;
     requires de.evoal.languages.model.ddl.dsl;
 
diff --git a/src/core/de.evoal.core/pom.xml b/src/core/de.evoal.core.main/pom.xml
similarity index 98%
rename from src/core/de.evoal.core/pom.xml
rename to src/core/de.evoal.core.main/pom.xml
index c004fee0..de42bfc5 100644
--- a/src/core/de.evoal.core/pom.xml
+++ b/src/core/de.evoal.core.main/pom.xml
@@ -11,8 +11,8 @@
 		<relativePath>../de.evoal.releng.parent</relativePath>
 	</parent>
 
-	<artifactId>core</artifactId>
-	<name>EvoAl - Core</name>
+	<artifactId>core.main</artifactId>
+	<name>EvoAl - Core - Main</name>
 
 	<properties>
 		<javax.activation.version>1.2.0</javax.activation.version>
@@ -324,13 +324,13 @@
 					</annotationProcessorPaths>
 					<compilerArgs>
 						<arg>--add-exports</arg>
-						<arg>io.jenetics.base/io.jenetics.internal.math=de.evoal.core</arg>
+						<arg>io.jenetics.base/io.jenetics.internal.math=de.evoal.core.main</arg>
 						<arg>--add-exports</arg>
-						<arg>io.jenetics.base/io.jenetics.internal.util=de.evoal.core</arg>
+						<arg>io.jenetics.base/io.jenetics.internal.util=de.evoal.core.main</arg>
 						<arg>--add-exports</arg>
-						<arg>io.jenetics.base/io.jenetics.internal.collection=de.evoal.core</arg>
+						<arg>io.jenetics.base/io.jenetics.internal.collection=de.evoal.core.main</arg>
 						<arg>--add-exports</arg>
-						<arg>org.eclipse.xtext.util/org.eclipse.xtext.util=de.evoal.core</arg>
+						<arg>org.eclipse.xtext.util/org.eclipse.xtext.util=de.evoal.core.main</arg>
 					</compilerArgs>
 					<forceJavacCompilerUse>true</forceJavacCompilerUse>
 				</configuration>
diff --git a/src/core/de.evoal.core.main/scripts/paths.env b/src/core/de.evoal.core.main/scripts/paths.env
new file mode 100644
index 00000000..bd1e3b7e
--- /dev/null
+++ b/src/core/de.evoal.core.main/scripts/paths.env
@@ -0,0 +1,11 @@
+EVOALPATH=$( cd -- "$(dirname $0)/.." >/dev/null 2>&1 ; pwd -P )
+PLUGIN_PATHS=`ls -d "${EVOALPATH}/plugins"/* | tr '\n' ':'`
+
+CLASSPATH="-Dorg.jboss.logging.provider=slf4j \
+          --module-path ${EVOALPATH}/modules/:$PLUGIN_PATHS \
+          --add-modules ALL-MODULE-PATH \
+          --add-opens java.base/java.lang=guice \
+          --add-exports io.jenetics.base/io.jenetics.internal.math=de.evoal.core.main \
+          --add-exports io.jenetics.base/io.jenetics.internal.collection=de.evoal.core.main \
+          --add-exports io.jenetics.base/io.jenetics.internal.util=de.evoal.core.main \
+          -m de.evoal.core.main/de.evoal.core.main.Evoal"
\ No newline at end of file
diff --git a/src/core/de.evoal.core.main/scripts/run-search.sh b/src/core/de.evoal.core.main/scripts/run-search.sh
new file mode 100755
index 00000000..62e72327
--- /dev/null
+++ b/src/core/de.evoal.core.main/scripts/run-search.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+source $( cd -- "$(dirname $0)/" >/dev/null 2>&1 ; pwd -P)/paths.env
+
+if [ "$#" -ne 3 ]; then
+    echo "Usage: $0 <execution-folder> <eal-file> <output-folder>"
+    exit 1
+fi
+
+cd $1
+
+set -x
+java $CLASSPATH \
+     "-Bcore:main=heuristic-search" \
+     "-Bcore:optimisation-configuration-file=$2" \
+     "-Bcore:evaluation-output-folder=$3"
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/board/Blackboard.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/board/Blackboard.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/board/Blackboard.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/board/Blackboard.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/board/BlackboardEntry.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/board/BlackboardEntry.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/board/BlackboardEntry.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/board/BlackboardEntry.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/board/package-info.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/board/package-info.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/board/package-info.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/board/package-info.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/cdi/BeanFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/cdi/BeanFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/cdi/BeanFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/cdi/BeanFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/cdi/BlackboardValue.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/cdi/BlackboardValue.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/cdi/BlackboardValue.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/cdi/BlackboardValue.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/cdi/ConfigurationValue.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/cdi/ConfigurationValue.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/cdi/ConfigurationValue.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/cdi/ConfigurationValue.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/cdi/MainClass.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/cdi/MainClass.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/cdi/MainClass.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/cdi/MainClass.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/cdi/package-info.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/cdi/package-info.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/cdi/package-info.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/cdi/package-info.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/codec/CustomCodec.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/codec/CustomCodec.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/codec/CustomCodec.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/codec/CustomCodec.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/calculation/CalculationFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/calculation/CalculationFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/calculation/CalculationFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/calculation/CalculationFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/calculation/CalculationStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/calculation/CalculationStrategy.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/calculation/CalculationStrategy.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/calculation/CalculationStrategy.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/Constraint.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/Constraint.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/Constraint.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/Constraint.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/ConstraintResult.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/ConstraintResult.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/ConstraintResult.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/ConstraintResult.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/ConstraintType.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/ConstraintType.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/ConstraintType.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/ConstraintType.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/Constraints.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/Constraints.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/Constraints.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/Constraints.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/DataConstraints.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/DataConstraints.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/DataConstraints.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/DataConstraints.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/package-info.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/package-info.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/model/package-info.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/model/package-info.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/package-info.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/package-info.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/package-info.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/package-info.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/CalculationResult.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/CalculationResult.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/CalculationResult.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/CalculationResult.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/HandlingStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/HandlingStrategy.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/HandlingStrategy.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/HandlingStrategy.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/RepairStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/RepairStrategy.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/RepairStrategy.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/RepairStrategy.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/MalusForFitnessStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/MalusForFitnessStrategy.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/MalusForFitnessStrategy.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/MalusForFitnessStrategy.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/MalusFunction.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/MalusFunction.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/MalusFunction.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/MalusFunction.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/ChainFunction.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/ChainFunction.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/ChainFunction.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/ChainFunction.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/IdentityFunction.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/IdentityFunction.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/IdentityFunction.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/IdentityFunction.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/package-info.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/package-info.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/package-info.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/internal/package-info.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/package-info.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/package-info.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/package-info.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/constraints/strategies/fitness/package-info.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/correlations/Correlation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/correlations/Correlation.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/correlations/Correlation.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/correlations/Correlation.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/correlations/Correlations.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/correlations/Correlations.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/correlations/Correlations.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/correlations/Correlations.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/correlations/Range.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/correlations/Range.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/correlations/Range.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/correlations/Range.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/correlations/RangedCorrelation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/correlations/RangedCorrelation.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/correlations/RangedCorrelation.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/correlations/RangedCorrelation.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/fitness/FitnessDecorator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/fitness/FitnessDecorator.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/fitness/FitnessDecorator.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/fitness/FitnessDecorator.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/fitness/FitnessFunction.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/fitness/FitnessFunction.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/fitness/FitnessFunction.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/fitness/FitnessFunction.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/fitness/comparator/FitnessComparator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/fitness/comparator/FitnessComparator.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/fitness/comparator/FitnessComparator.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/fitness/comparator/FitnessComparator.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/fitness/comparator/FitnessValue.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/fitness/comparator/FitnessValue.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/fitness/comparator/FitnessValue.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/fitness/comparator/FitnessValue.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/fitness/package-info.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/fitness/package-info.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/fitness/package-info.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/fitness/package-info.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/initial/InitialPopulation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/initial/InitialPopulation.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/initial/InitialPopulation.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/initial/InitialPopulation.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/package-info.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/package-info.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/ea/package-info.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/ea/package-info.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/Properties.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/Properties.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/Properties.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/Properties.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/PropertiesPair.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/PropertiesPair.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/PropertiesPair.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/PropertiesPair.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/PropertiesSpecification.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/PropertiesSpecification.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/PropertiesSpecification.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/PropertiesSpecification.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/PropertySpecification.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/PropertySpecification.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/PropertySpecification.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/PropertySpecification.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/info/PropertiesBoundaries.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/info/PropertiesBoundaries.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/info/PropertiesBoundaries.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/info/PropertiesBoundaries.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/info/PropertiesDependencies.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/info/PropertiesDependencies.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/info/PropertiesDependencies.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/info/PropertiesDependencies.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/info/PropertiesRanges.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/info/PropertiesRanges.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/info/PropertiesRanges.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/info/PropertiesRanges.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/io/PropertiesIOFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/io/PropertiesIOFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/io/PropertiesIOFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/io/PropertiesIOFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/io/PropertiesReader.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/io/PropertiesReader.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/io/PropertiesReader.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/io/PropertiesReader.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/io/PropertiesWriter.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/io/PropertiesWriter.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/io/PropertiesWriter.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/io/PropertiesWriter.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/stream/FileBasedPropertiesStreamSupplier.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/stream/FileBasedPropertiesStreamSupplier.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/stream/FileBasedPropertiesStreamSupplier.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/stream/FileBasedPropertiesStreamSupplier.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/stream/PropertiesBasedPropertiesPairStreamSupplier.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/stream/PropertiesBasedPropertiesPairStreamSupplier.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/stream/PropertiesBasedPropertiesPairStreamSupplier.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/stream/PropertiesBasedPropertiesPairStreamSupplier.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/stream/PropertiesBasedPropertiesStreamSupplier.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/stream/PropertiesBasedPropertiesStreamSupplier.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/stream/PropertiesBasedPropertiesStreamSupplier.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/stream/PropertiesBasedPropertiesStreamSupplier.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/stream/PropertiesPairStreamSupplier.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/stream/PropertiesPairStreamSupplier.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/stream/PropertiesPairStreamSupplier.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/stream/PropertiesPairStreamSupplier.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/stream/PropertiesStreamSupplier.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/stream/PropertiesStreamSupplier.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/properties/stream/PropertiesStreamSupplier.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/properties/stream/PropertiesStreamSupplier.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/search/OptimisationAlgorithm.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/search/OptimisationAlgorithm.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/search/OptimisationAlgorithm.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/search/OptimisationAlgorithm.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/Column.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/Column.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/Column.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/Column.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/ColumnType.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/ColumnType.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/ColumnType.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/ColumnType.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/StatisticsWriter.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/StatisticsWriter.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/StatisticsWriter.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/StatisticsWriter.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/Writer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/Writer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/Writer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/Writer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/WriterContext.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/WriterContext.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/WriterContext.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/WriterContext.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/WriterException.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/WriterException.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/WriterException.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/WriterException.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/WriterStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/WriterStrategy.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/WriterStrategy.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/WriterStrategy.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/package-info.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/package-info.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/statistics/package-info.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/statistics/package-info.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/ConstantSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/ConstantSwitch.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/ConstantSwitch.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/ConstantSwitch.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/ConverterFunctions.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/ConverterFunctions.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/ConverterFunctions.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/ConverterFunctions.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/EvoalException.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/EvoalException.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/EvoalException.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/EvoalException.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/EvoalIOException.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/EvoalIOException.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/EvoalIOException.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/EvoalIOException.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/InitializationException.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/InitializationException.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/InitializationException.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/InitializationException.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/LanguageHelper.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/LanguageHelper.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/LanguageHelper.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/LanguageHelper.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/Requirements.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/Requirements.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/api/utils/Requirements.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/Requirements.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/Evoal.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/Evoal.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/Evoal.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/Evoal.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/AltererFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/AltererFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/AltererFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/AltererFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/CorrelationCrossover.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/CorrelationCrossover.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/CorrelationCrossover.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/CorrelationCrossover.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/CorrelationCrossoverMemento.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/CorrelationCrossoverMemento.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/CorrelationCrossoverMemento.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/CorrelationCrossoverMemento.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/LineCorrelationCrossover.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/LineCorrelationCrossover.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/LineCorrelationCrossover.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/LineCorrelationCrossover.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/LineCorrelationCrossoverMemento.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/LineCorrelationCrossoverMemento.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/LineCorrelationCrossoverMemento.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/LineCorrelationCrossoverMemento.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/MultiPointCorrelationCrossover.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/MultiPointCorrelationCrossover.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/MultiPointCorrelationCrossover.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/MultiPointCorrelationCrossover.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/MultiPointCorrelationCrossoverMemento.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/MultiPointCorrelationCrossoverMemento.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/MultiPointCorrelationCrossoverMemento.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/MultiPointCorrelationCrossoverMemento.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/PartiallyMatchedCorrelationCrossover.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/PartiallyMatchedCorrelationCrossover.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/PartiallyMatchedCorrelationCrossover.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/PartiallyMatchedCorrelationCrossover.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/PartiallyMatchedCorrelationCrossoverMemento.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/PartiallyMatchedCorrelationCrossoverMemento.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/PartiallyMatchedCorrelationCrossoverMemento.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/PartiallyMatchedCorrelationCrossoverMemento.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/SinglePointCorrelationCrossover.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/SinglePointCorrelationCrossover.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/SinglePointCorrelationCrossover.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/SinglePointCorrelationCrossover.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/SinglePointCorrelationCrossoverMemento.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/SinglePointCorrelationCrossoverMemento.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/SinglePointCorrelationCrossoverMemento.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/SinglePointCorrelationCrossoverMemento.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/UniformCorrelationCrossover.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/UniformCorrelationCrossover.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/UniformCorrelationCrossover.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/UniformCorrelationCrossover.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/UniformCorrelationCrossoverMemento.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/UniformCorrelationCrossoverMemento.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/crossover/UniformCorrelationCrossoverMemento.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/crossover/UniformCorrelationCrossoverMemento.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/internal/AbstractCorrelationAlterer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/internal/AbstractCorrelationAlterer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/internal/AbstractCorrelationAlterer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/internal/AbstractCorrelationAlterer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/internal/CorrelationCombineAlterer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/internal/CorrelationCombineAlterer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/internal/CorrelationCombineAlterer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/internal/CorrelationCombineAlterer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/internal/CorrelationRecombinator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/internal/CorrelationRecombinator.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/internal/CorrelationRecombinator.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/internal/CorrelationRecombinator.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/internal/MeanCorrelationAlterer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/internal/MeanCorrelationAlterer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/internal/MeanCorrelationAlterer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/internal/MeanCorrelationAlterer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutator.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutator.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutator.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutatorFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutatorFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutatorFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutatorFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutatorMemento.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutatorMemento.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutatorMemento.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/CorrelationMutatorMemento.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/GaussianCorrelationMutator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/GaussianCorrelationMutator.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/GaussianCorrelationMutator.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/GaussianCorrelationMutator.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/GaussianCorrelationMutatorMemento.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/GaussianCorrelationMutatorMemento.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/GaussianCorrelationMutatorMemento.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/GaussianCorrelationMutatorMemento.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipCorrelationMutator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipCorrelationMutator.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipCorrelationMutator.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipCorrelationMutator.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipCorrelationMutatorMemento.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipCorrelationMutatorMemento.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipCorrelationMutatorMemento.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipCorrelationMutatorMemento.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipMutator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipMutator.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipMutator.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/SingleBitFlipMutator.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/SwapCorrelationMutator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/SwapCorrelationMutator.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/SwapCorrelationMutator.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/SwapCorrelationMutator.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/SwapCorrelationMutatorMemento.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/SwapCorrelationMutatorMemento.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/alterer/mutator/SwapCorrelationMutatorMemento.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/alterer/mutator/SwapCorrelationMutatorMemento.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/DynamicCodec.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/DynamicCodec.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/DynamicCodec.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/DynamicCodec.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/DynamicCodecProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/DynamicCodecProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/DynamicCodecProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/DynamicCodecProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBitChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBitChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBitChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBitChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBoundedDoubleChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBoundedDoubleChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBoundedDoubleChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBoundedDoubleChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBoundedIntegerChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBoundedIntegerChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBoundedIntegerChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicBoundedIntegerChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicChromosomeFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicChromosomeFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicChromosomeFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicChromosomeFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicDoubleChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicDoubleChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicDoubleChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicDoubleChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicGrayChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicGrayChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicGrayChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicGrayChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicIntegerChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicIntegerChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicIntegerChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicIntegerChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicScaledChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicScaledChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicScaledChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/codec/chromosome/DynamicScaledChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/ParetoComparator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/comparator/ParetoComparator.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/ParetoComparator.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/comparator/ParetoComparator.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/ParetoFitnessValue.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/comparator/ParetoFitnessValue.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/ParetoFitnessValue.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/comparator/ParetoFitnessValue.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumComparator.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumComparator.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumComparator.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumComparator.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumFitnessValue.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumFitnessValue.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumFitnessValue.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumFitnessValue.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/ConstraintProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/ConstraintProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/ConstraintProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/ConstraintProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/BoundaryIdentifier.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/BoundaryIdentifier.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/BoundaryIdentifier.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/BoundaryIdentifier.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/ConditionConverter.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/ConditionConverter.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/ConditionConverter.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/ConditionConverter.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/UnaryBoundaryIdentifier.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/UnaryBoundaryIdentifier.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/UnaryBoundaryIdentifier.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/ast/UnaryBoundaryIdentifier.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/calculations/NormalCalculation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/calculations/NormalCalculation.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/calculations/NormalCalculation.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/calculations/NormalCalculation.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/calculations/StandardDeviationCalculation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/calculations/StandardDeviationCalculation.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/calculations/StandardDeviationCalculation.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/calculations/StandardDeviationCalculation.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/JeneticsConstraintProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/JeneticsConstraintProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/JeneticsConstraintProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/JeneticsConstraintProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/JeneticsConstraintStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/JeneticsConstraintStrategy.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/JeneticsConstraintStrategy.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/JeneticsConstraintStrategy.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/RandomGenotypeStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/RandomGenotypeStrategy.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/RandomGenotypeStrategy.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/constraint/RandomGenotypeStrategy.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/fitness/MalusFunctionProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/fitness/MalusFunctionProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/fitness/MalusFunctionProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/fitness/MalusFunctionProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/fitness/internal/MalusForFitnessFunction.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/fitness/internal/MalusForFitnessFunction.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/fitness/internal/MalusForFitnessFunction.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/strategies/fitness/internal/MalusForFitnessFunction.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/utils/ArithmeticNumberOperations.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/utils/ArithmeticNumberOperations.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/utils/ArithmeticNumberOperations.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/utils/ArithmeticNumberOperations.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/utils/ConfigurationUtils.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/utils/ConfigurationUtils.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/constraint/utils/ConfigurationUtils.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/constraint/utils/ConfigurationUtils.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/correlation/CorrelationsProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/correlation/CorrelationsProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/correlation/CorrelationsProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/correlation/CorrelationsProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/correlation/el/AstHelper.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/correlation/el/AstHelper.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/correlation/el/AstHelper.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/correlation/el/AstHelper.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/correlation/el/RangeSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/correlation/el/RangeSwitch.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/correlation/el/RangeSwitch.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/correlation/el/RangeSwitch.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/deviation/DeviationProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/deviation/DeviationProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/deviation/DeviationProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/deviation/DeviationProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/deviation/model/Deviation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/deviation/model/Deviation.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/deviation/model/Deviation.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/deviation/model/Deviation.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/deviation/model/Deviations.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/deviation/model/Deviations.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/deviation/model/Deviations.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/deviation/model/Deviations.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/CallSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/CallSwitch.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/CallSwitch.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/CallSwitch.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/DataReferenceSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/DataReferenceSwitch.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/DataReferenceSwitch.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/DataReferenceSwitch.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/ElHelper.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/ElHelper.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/ElHelper.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/ElHelper.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/NumberSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/NumberSwitch.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/NumberSwitch.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/NumberSwitch.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/StringSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/StringSwitch.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/StringSwitch.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/StringSwitch.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/ValueReferenceSwitch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/ValueReferenceSwitch.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/constraints/el/ValueReferenceSwitch.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/constraints/el/ValueReferenceSwitch.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/fitness/DistanceFitness.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/fitness/DistanceFitness.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/fitness/DistanceFitness.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/fitness/DistanceFitness.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/fitness/FitnessFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/fitness/FitnessFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/fitness/FitnessFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/fitness/FitnessFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/fitness/JeneticsFitnessFunction.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/fitness/JeneticsFitnessFunction.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/fitness/JeneticsFitnessFunction.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/fitness/JeneticsFitnessFunction.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/fitness/MalusFitness.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/fitness/MalusFitness.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/fitness/MalusFitness.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/fitness/MalusFitness.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/initial/InitialPopulationFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/initial/InitialPopulationFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/initial/InitialPopulationFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/initial/InitialPopulationFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/initial/RandomInitialPopulation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/initial/RandomInitialPopulation.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/initial/RandomInitialPopulation.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/initial/RandomInitialPopulation.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/initial/RandomProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/initial/RandomProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/initial/RandomProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/initial/RandomProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/producer/OptimizingFunctionProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/producer/OptimizingFunctionProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/producer/OptimizingFunctionProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/producer/OptimizingFunctionProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/producer/SelectorFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/producer/SelectorFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/producer/SelectorFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/producer/SelectorFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/search/EvolutionaryAlgorithmSearch.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/search/EvolutionaryAlgorithmSearch.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/search/EvolutionaryAlgorithmSearch.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/ea/search/EvolutionaryAlgorithmSearch.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/AbstractBoundedChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/AbstractBoundedChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/AbstractBoundedChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/AbstractBoundedChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BitChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BitChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BitChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BitChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BitHelper.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BitHelper.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BitHelper.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BitHelper.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedBitChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedBitChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedBitChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedBitChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedDoubleChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedDoubleChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedDoubleChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedDoubleChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedDoubleGene.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedDoubleGene.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedDoubleGene.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedDoubleGene.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedIntegerChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedIntegerChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedIntegerChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedIntegerChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedIntegerGene.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedIntegerGene.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedIntegerGene.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedIntegerGene.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedOperations.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedOperations.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/BoundedOperations.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/BoundedOperations.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/ConstraintList.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/ConstraintList.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/ConstraintList.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/ConstraintList.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/DecimalFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/DecimalFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/DecimalFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/DecimalFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/GrayBoundedBitChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/GrayBoundedBitChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/GrayBoundedBitChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/GrayBoundedBitChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/GrayHelper.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/GrayHelper.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/GrayHelper.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/GrayHelper.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/NaiveBoundedBitChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/NaiveBoundedBitChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/NaiveBoundedBitChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/NaiveBoundedBitChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/VariableChromosome.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/VariableChromosome.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/jenetics/VariableChromosome.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/jenetics/VariableChromosome.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/BlackboardValueProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/BlackboardValueProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/BlackboardValueProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/BlackboardValueProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/ConfigurationValueProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/ConfigurationValueProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/ConfigurationValueProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/ConfigurationValueProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/DSLFinder.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/DSLFinder.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/DSLFinder.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/DSLFinder.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/DataConstraintProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/DataConstraintProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/DataConstraintProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/DataConstraintProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/OptimisationModelLoader.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/OptimisationModelLoader.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/OptimisationModelLoader.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/OptimisationModelLoader.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/PropertiesBoundariesProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/PropertiesBoundariesProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/PropertiesBoundariesProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/PropertiesBoundariesProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/PropertiesRangesProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/PropertiesRangesProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/PropertiesRangesProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/PropertiesRangesProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/SpecificationProducer.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/SpecificationProducer.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/SpecificationProducer.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/producer/SpecificationProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/properties/JsonPropertiesReader.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/properties/JsonPropertiesReader.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/properties/JsonPropertiesReader.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/properties/JsonPropertiesReader.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/properties/JsonPropertiesWriter.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/properties/JsonPropertiesWriter.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/properties/JsonPropertiesWriter.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/properties/JsonPropertiesWriter.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/search/HeuristicSearchEvaluation.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchEvaluation.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/search/HeuristicSearchEvaluation.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchEvaluation.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/search/HeuristicSearchMain.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchMain.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/search/HeuristicSearchMain.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchMain.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/search/HeuristicSearchUtils.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchUtils.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/search/HeuristicSearchUtils.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/search/HeuristicSearchUtils.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/StatisticsFactory.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/StatisticsFactory.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/StatisticsFactory.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/StatisticsFactory.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/fitness/FitnessStatistics.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/fitness/FitnessStatistics.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/fitness/FitnessStatistics.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/fitness/FitnessStatistics.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/fitness/OptimizingStatistics.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/fitness/OptimizingStatistics.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/fitness/OptimizingStatistics.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/fitness/OptimizingStatistics.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/internal/MultipleStatisticsWriter.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/internal/MultipleStatisticsWriter.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/internal/MultipleStatisticsWriter.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/internal/MultipleStatisticsWriter.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/nop/NopStatistics.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/nop/NopStatistics.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/nop/NopStatistics.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/nop/NopStatistics.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/writer/csv/CsvStrategy.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/writer/csv/CsvStrategy.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/writer/csv/CsvStrategy.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/writer/csv/CsvStrategy.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/writer/csv/CsvWriter.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/writer/csv/CsvWriter.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/writer/csv/CsvWriter.java
rename to src/core/de.evoal.core.main/src/main/java/de/evoal/core/main/statistics/writer/csv/CsvWriter.java
diff --git a/src/core/de.evoal.core/src/main/java/module-info.java b/src/core/de.evoal.core.main/src/main/java/module-info.java
similarity index 99%
rename from src/core/de.evoal.core/src/main/java/module-info.java
rename to src/core/de.evoal.core.main/src/main/java/module-info.java
index ccef2dd4..aad17264 100644
--- a/src/core/de.evoal.core/src/main/java/module-info.java
+++ b/src/core/de.evoal.core.main/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-module de.evoal.core {
+module de.evoal.core.main {
     requires java.base;
     requires java.annotation;
 
@@ -98,5 +98,4 @@ module de.evoal.core {
     opens de.evoal.core.api.ea.constraints.strategies to weld.core.impl;
     opens de.evoal.core.main.properties to weld.core.impl;
     opens de.evoal.core.main.ea.search to weld.core.impl;
-
 }
diff --git a/src/core/de.evoal.core/src/main/resources/META-INF/MANIFEST.MF b/src/core/de.evoal.core.main/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from src/core/de.evoal.core/src/main/resources/META-INF/MANIFEST.MF
rename to src/core/de.evoal.core.main/src/main/resources/META-INF/MANIFEST.MF
diff --git a/src/core/de.evoal.core/src/main/resources/META-INF/beans.xml b/src/core/de.evoal.core.main/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from src/core/de.evoal.core/src/main/resources/META-INF/beans.xml
rename to src/core/de.evoal.core.main/src/main/resources/META-INF/beans.xml
diff --git a/src/core/de.evoal.core/src/main/resources/META-INF/definitions/ddl/si-units.ddl b/src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/ddl/si-units.ddl
similarity index 100%
rename from src/core/de.evoal.core/src/main/resources/META-INF/definitions/ddl/si-units.ddl
rename to src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/ddl/si-units.ddl
diff --git a/src/core/de.evoal.core/src/main/resources/META-INF/definitions/ea/core.dl b/src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/ea/core.dl
similarity index 100%
rename from src/core/de.evoal.core/src/main/resources/META-INF/definitions/ea/core.dl
rename to src/core/de.evoal.core.main/src/main/resources/META-INF/definitions/ea/core.dl
diff --git a/src/core/de.evoal.core/src/main/resources/logback.xml b/src/core/de.evoal.core.main/src/main/resources/logback.xml
similarity index 100%
rename from src/core/de.evoal.core/src/main/resources/logback.xml
rename to src/core/de.evoal.core.main/src/main/resources/logback.xml
diff --git a/src/core/de.evoal.core/src/test/java/de/evoal/core/api/board/BlackboardEntryTest.java b/src/core/de.evoal.core.main/src/test/java/de/evoal/core/api/board/BlackboardEntryTest.java
similarity index 100%
rename from src/core/de.evoal.core/src/test/java/de/evoal/core/api/board/BlackboardEntryTest.java
rename to src/core/de.evoal.core.main/src/test/java/de/evoal/core/api/board/BlackboardEntryTest.java
diff --git a/src/core/de.evoal.core.plugin/pom.xml b/src/core/de.evoal.core.plugin/pom.xml
index d142111b..d1f4ebb3 100644
--- a/src/core/de.evoal.core.plugin/pom.xml
+++ b/src/core/de.evoal.core.plugin/pom.xml
@@ -177,7 +177,7 @@
 		<!-- Dependency to EvoAl core -->
 		<dependency>
 			<groupId>de.evoal</groupId>
-			<artifactId>core</artifactId>
+			<artifactId>core.main</artifactId>
 			<version>${evoal.version}</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/src/core/de.evoal.core/scripts/paths.env b/src/core/de.evoal.core/scripts/paths.env
deleted file mode 100644
index dc8f4547..00000000
--- a/src/core/de.evoal.core/scripts/paths.env
+++ /dev/null
@@ -1,2 +0,0 @@
-EVOALPATH=$( cd -- "$(dirname $0)/.." >/dev/null 2>&1 ; pwd -P )
-PLUGIN_PATHS=`ls -d "${EVOALPATH}/plugins"/* | tr '\n' ':'`
\ No newline at end of file
diff --git a/src/core/de.evoal.core/scripts/run-search.sh b/src/core/de.evoal.core/scripts/run-search.sh
deleted file mode 100755
index 48fa0a2d..00000000
--- a/src/core/de.evoal.core/scripts/run-search.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-source $( cd -- "$(dirname $0)/" >/dev/null 2>&1 ; pwd -P)/paths.env
-
-if [ "$#" -ne 3 ]; then
-    echo "Usage: $0 <execution-folder> <eal-file> <output-folder>"
-    exit 1
-fi
-
-cd $1
-
-set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     --add-exports io.jenetics.base/io.jenetics.internal.math=de.evoal.core \
-     --add-exports io.jenetics.base/io.jenetics.internal.collection=de.evoal.core \
-     --add-exports io.jenetics.base/io.jenetics.internal.util=de.evoal.core \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
-     "-Bcore:main=heuristic-search" \
-     "-Bcore:optimisation-configuration-file=$2" \
-     "-Bcore:evaluation-output-folder=$3"
diff --git a/src/core/de.evoal.generator.main/scripts/debug-generator.sh b/src/core/de.evoal.generator.main/scripts/debug-generator.sh
index f37431e7..89874ea1 100755
--- a/src/core/de.evoal.generator.main/scripts/debug-generator.sh
+++ b/src/core/de.evoal.generator.main/scripts/debug-generator.sh
@@ -10,11 +10,7 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=1044\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=1044\
+     $CLASSPATH \
      -Bcore:main=data-generator \
      "-Bgenerator:configuration-file=$2"
diff --git a/src/core/de.evoal.generator.main/scripts/run-generator.sh b/src/core/de.evoal.generator.main/scripts/run-generator.sh
index d60c3b38..6d2dc8a1 100755
--- a/src/core/de.evoal.generator.main/scripts/run-generator.sh
+++ b/src/core/de.evoal.generator.main/scripts/run-generator.sh
@@ -10,10 +10,6 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java $CLASSPATH \
      -Bcore:main=data-generator \
      "-Bgenerator:configuration-file=$2"
diff --git a/src/core/de.evoal.generator.main/src/main/java/module-info.java b/src/core/de.evoal.generator.main/src/main/java/module-info.java
index 813509a4..edd3412c 100644
--- a/src/core/de.evoal.generator.main/src/main/java/module-info.java
+++ b/src/core/de.evoal.generator.main/src/main/java/module-info.java
@@ -23,7 +23,7 @@ module de.evoal.generator.main {
     requires de.evoal.languages.model.el.dsl;
     requires de.evoal.languages.model.generator.dsl;
 
-    requires de.evoal.core;
+    requires de.evoal.core.main;
     requires commons.math3;
 
     opens de.evoal.generator.main;
diff --git a/src/core/de.evoal.releng.parent/pom.xml b/src/core/de.evoal.releng.parent/pom.xml
index ddd671d7..5b25f12a 100644
--- a/src/core/de.evoal.releng.parent/pom.xml
+++ b/src/core/de.evoal.releng.parent/pom.xml
@@ -26,7 +26,7 @@
     </properties>
 
     <modules>
-        <module>../de.evoal.core</module>
+        <module>../de.evoal.core.main</module>
         <module>../de.evoal.core.plugin</module>
 
         <module>../de.evoal.core.arff</module>
diff --git a/src/core/de.evoal.surrogate.api/scripts/debug-search-with-surrogate.sh b/src/core/de.evoal.surrogate.api/scripts/debug-search-with-surrogate.sh
index bb3088ef..9f06ea66 100755
--- a/src/core/de.evoal.surrogate.api/scripts/debug-search-with-surrogate.sh
+++ b/src/core/de.evoal.surrogate.api/scripts/debug-search-with-surrogate.sh
@@ -10,15 +10,8 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=1044\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     --add-exports io.jenetics.base/io.jenetics.internal.math=de.evoal.core \
-     --add-exports io.jenetics.base/io.jenetics.internal.collection=de.evoal.core \
-     --add-exports io.jenetics.base/io.jenetics.internal.util=de.evoal.core \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=1044\
+     $CLASSPATH \
      -Bcore:main=heuristic-search \
      "-Bcore:optimisation-configuration-file=$2" \
      "-Bsurrogate:configuration-file=$3" \
diff --git a/src/core/de.evoal.surrogate.api/scripts/debug-training.sh b/src/core/de.evoal.surrogate.api/scripts/debug-training.sh
index 55df393d..94be5910 100755
--- a/src/core/de.evoal.surrogate.api/scripts/debug-training.sh
+++ b/src/core/de.evoal.surrogate.api/scripts/debug-training.sh
@@ -10,11 +10,7 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=1044\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=1044\
+     $CLASSPATH \
      -Bcore:main=surrogate-training \
      "-Bsurrogate:configuration-file=$2"
diff --git a/src/core/de.evoal.surrogate.api/scripts/run-search-with-surrogate.sh b/src/core/de.evoal.surrogate.api/scripts/run-search-with-surrogate.sh
index 91204ba0..908ad8c6 100755
--- a/src/core/de.evoal.surrogate.api/scripts/run-search-with-surrogate.sh
+++ b/src/core/de.evoal.surrogate.api/scripts/run-search-with-surrogate.sh
@@ -10,14 +10,7 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     --add-exports io.jenetics.base/io.jenetics.internal.math=de.evoal.core \
-     --add-exports io.jenetics.base/io.jenetics.internal.collection=de.evoal.core \
-     --add-exports io.jenetics.base/io.jenetics.internal.util=de.evoal.core \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java $CLASSPATH \
      -Bcore:main=heuristic-search \
      "-Bcore:optimisation-configuration-file=$2" \
      "-Bsurrogate:configuration-file=$3" \
diff --git a/src/core/de.evoal.surrogate.api/scripts/run-training.sh b/src/core/de.evoal.surrogate.api/scripts/run-training.sh
index 6e88a613..00bc0877 100755
--- a/src/core/de.evoal.surrogate.api/scripts/run-training.sh
+++ b/src/core/de.evoal.surrogate.api/scripts/run-training.sh
@@ -10,10 +10,6 @@ fi
 cd $1
 
 set -x
-java -Dorg.jboss.logging.provider=slf4j\
-     --module-path "${EVOALPATH}/modules/:$PLUGIN_PATHS" \
-     --add-modules ALL-MODULE-PATH \
-     --add-opens java.base/java.lang=guice \
-     -m de.evoal.core/de.evoal.core.main.Evoal \
+java $CLASSPATH \
      -Bcore:main=surrogate-training \
      "-Bsurrogate:configuration-file=$2"
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/module-info.java b/src/core/de.evoal.surrogate.api/src/main/java/module-info.java
index fcb98f44..97e2c58b 100644
--- a/src/core/de.evoal.surrogate.api/src/main/java/module-info.java
+++ b/src/core/de.evoal.surrogate.api/src/main/java/module-info.java
@@ -17,7 +17,7 @@ module de.evoal.surrogate.api {
     requires io.jenetics.base;
 
 
-    requires de.evoal.core;
+    requires de.evoal.core.main;
     requires de.evoal.languages.model.ddl;
     requires de.evoal.languages.model.dl;
     requires de.evoal.languages.model.el;
diff --git a/src/core/de.evoal.surrogate.neural/src/main/java/module-info.java b/src/core/de.evoal.surrogate.neural/src/main/java/module-info.java
index cdc97724..52062892 100644
--- a/src/core/de.evoal.surrogate.neural/src/main/java/module-info.java
+++ b/src/core/de.evoal.surrogate.neural/src/main/java/module-info.java
@@ -4,7 +4,7 @@ module de.evoal.surrogate.neural {
     requires lombok;
     requires org.slf4j;
 
-    requires de.evoal.core;
+    requires de.evoal.core.main;
     requires de.evoal.surrogate.api;
     requires deeplearning4j.nn;
     requires nd4j.api;
diff --git a/src/core/de.evoal.surrogate.simple/src/main/java/module-info.java b/src/core/de.evoal.surrogate.simple/src/main/java/module-info.java
index 8f69072b..f0b82609 100644
--- a/src/core/de.evoal.surrogate.simple/src/main/java/module-info.java
+++ b/src/core/de.evoal.surrogate.simple/src/main/java/module-info.java
@@ -4,7 +4,7 @@ module de.evoal.surrogate.simple {
     requires lombok;
     requires org.slf4j;
 
-    requires de.evoal.core;
+    requires de.evoal.core.main;
     requires de.evoal.surrogate.api;
     requires jakarta.inject.api;
 }
diff --git a/src/core/de.evoal.surrogate.svr/src/main/java/module-info.java b/src/core/de.evoal.surrogate.svr/src/main/java/module-info.java
index 42570029..2fbb6082 100644
--- a/src/core/de.evoal.surrogate.svr/src/main/java/module-info.java
+++ b/src/core/de.evoal.surrogate.svr/src/main/java/module-info.java
@@ -12,7 +12,7 @@ module de.evoal.surrogate.svr {
 
     requires de.evoal.languages.model.ddl;
 
-    requires de.evoal.core;
+    requires de.evoal.core.main;
     requires de.evoal.surrogate.api;
 
     opens de.evoal.surrogate.svr;
diff --git a/src/core/de.evoal.surrogate.ws/pom.xml b/src/core/de.evoal.surrogate.ws/pom.xml
new file mode 100644
index 00000000..f99f33de
--- /dev/null
+++ b/src/core/de.evoal.surrogate.ws/pom.xml
@@ -0,0 +1,23 @@
+<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>
+
+	<parent>
+		<groupId>de.evoal</groupId>
+		<artifactId>core.plugin</artifactId>
+		<version>0.9.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>surrogate.ws</artifactId>
+	<name>EvoAl - Surrogate - WebService</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>surrogate.api</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/src/core/de.evoal.surrogate.ws/src/main/java/de/evoal/surrogate/ws/WebServiceFitness.java b/src/core/de.evoal.surrogate.ws/src/main/java/de/evoal/surrogate/ws/WebServiceFitness.java
new file mode 100644
index 00000000..4aabaf11
--- /dev/null
+++ b/src/core/de.evoal.surrogate.ws/src/main/java/de/evoal/surrogate/ws/WebServiceFitness.java
@@ -0,0 +1,29 @@
+package de.evoal.surrogate.ws;
+
+import de.evoal.core.api.ea.fitness.FitnessFunction;
+import de.evoal.core.api.properties.Properties;
+import de.evoal.core.api.utils.LanguageHelper;
+import de.evoal.languages.model.instance.Instance;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Named;
+
+/**
+ *
+ */
+@Dependent
+@Named("webservice")
+public class WebServiceFitness implements FitnessFunction {
+    @Override
+    public double[] evaluate(final Properties properties) {
+
+        return new double[0];
+    }
+
+    @Override
+    public FitnessFunction init(final Instance config) {
+        LanguageHelper.lookup()
+
+        return this;
+    }
+}
diff --git a/src/core/de.evoal.surrogate.ws/src/main/java/module-info.java b/src/core/de.evoal.surrogate.ws/src/main/java/module-info.java
new file mode 100644
index 00000000..292e5cd5
--- /dev/null
+++ b/src/core/de.evoal.surrogate.ws/src/main/java/module-info.java
@@ -0,0 +1,14 @@
+module de.evoal.surrogate.ws {
+    requires lombok;
+    requires org.slf4j;
+
+    requires jakarta.inject.api;
+    requires jakarta.enterprise.cdi.api;
+
+    requires de.evoal.languages.model.instance;
+
+    requires de.evoal.core.main;
+    requires de.evoal.surrogate.api;
+
+    opens de.evoal.surrogate.ws to  weld.core.impl;
+}
-- 
GitLab