From a966b800454dcc2cd1983f14e5a08118425e20b6 Mon Sep 17 00:00:00 2001
From: nck-mlcnv <32801560+nck-mlcnv@users.noreply.github.com>
Date: Fri, 12 May 2023 17:29:37 +0200
Subject: [PATCH 1/4] merge all 3 child modules to the parent module and
 refactor the pom.xml

---
 iguana.commons/README                         |  46 ----
 iguana.commons/pom.xml                        | 162 -------------
 iguana.corecontroller/README                  |   6 -
 iguana.corecontroller/pom.xml                 | 217 ------------------
 iguana.resultprocessor/README                 |  85 -------
 iguana.resultprocessor/pom.xml                | 188 ---------------
 pom.xml                                       | 177 ++++++++++++--
 .../org/aksw/iguana/cc/config/CONSTANTS.java  |   0
 .../aksw/iguana/cc/config/ConfigManager.java  |   0
 .../aksw/iguana/cc/config/IguanaConfig.java   |   0
 .../iguana/cc/config/IguanaConfigFactory.java |   0
 .../iguana/cc/config/elements/Connection.java |   0
 .../iguana/cc/config/elements/Dataset.java    |   0
 .../cc/config/elements/MetricConfig.java      |   0
 .../cc/config/elements/StorageConfig.java     |   0
 .../aksw/iguana/cc/config/elements/Task.java  |   0
 .../iguana/cc/controller/MainController.java  |   0
 .../iguana/cc/controller/TaskController.java  |   0
 .../cc/lang/AbstractLanguageProcessor.java    |   0
 .../iguana/cc/lang/LanguageProcessor.java     |   0
 .../org/aksw/iguana/cc/lang/QueryWrapper.java |   0
 .../cc/lang/impl/RDFLanguageProcessor.java    |   0
 .../cc/lang/impl/SPARQLLanguageProcessor.java |   0
 .../SaxSparqlJsonResultCountingParser.java    |   0
 .../lang/impl/ThrowawayLanguageProcessor.java |   0
 .../iguana/cc/model/QueryExecutionStats.java  |   0
 .../iguana/cc/model/QueryResultHashKey.java   |   0
 .../iguana/cc/query/handler/QueryHandler.java |   0
 .../aksw/iguana/cc/query/list/QueryList.java  |   0
 .../query/list/impl/FileBasedQueryList.java   |   0
 .../cc/query/list/impl/InMemQueryList.java    |   0
 .../cc/query/pattern/PatternHandler.java      |   0
 .../cc/query/selector/QuerySelector.java      |   0
 .../selector/impl/LinearQuerySelector.java    |   0
 .../selector/impl/RandomQuerySelector.java    |   0
 .../iguana/cc/query/source/QuerySource.java   |   0
 .../source/impl/FileLineQuerySource.java      |   0
 .../source/impl/FileSeparatorQuerySource.java |   0
 .../query/source/impl/FolderQuerySource.java  |   0
 .../aksw/iguana/cc/tasks/AbstractTask.java    |   0
 .../java/org/aksw/iguana/cc/tasks/Task.java   |   0
 .../org/aksw/iguana/cc/tasks/TaskFactory.java |   0
 .../org/aksw/iguana/cc/tasks/TaskManager.java |   0
 .../aksw/iguana/cc/tasks/impl/Stresstest.java |   0
 .../iguana/cc/utils/CLIProcessManager.java    |   0
 .../org/aksw/iguana/cc/utils/FileUtils.java   |   0
 .../iguana/cc/utils/ResultSizeRetriever.java  |   0
 .../cc/utils/SPARQLQueryStatistics.java       |   0
 .../iguana/cc/utils/StatisticsVisitor.java    |   0
 .../aksw/iguana/cc/worker/AbstractWorker.java |   0
 .../iguana/cc/worker/LatencyStrategy.java     |   0
 .../org/aksw/iguana/cc/worker/Worker.java     |   0
 .../aksw/iguana/cc/worker/WorkerFactory.java  |   0
 .../cc/worker/impl/CLIInputFileWorker.java    |   0
 .../cc/worker/impl/CLIInputPrefixWorker.java  |   0
 .../iguana/cc/worker/impl/CLIInputWorker.java |   0
 .../aksw/iguana/cc/worker/impl/CLIWorker.java |   0
 .../iguana/cc/worker/impl/HttpGetWorker.java  |   0
 .../iguana/cc/worker/impl/HttpPostWorker.java |   0
 .../iguana/cc/worker/impl/HttpWorker.java     |   0
 .../worker/impl/MultipleCLIInputWorker.java   |   0
 .../iguana/cc/worker/impl/UPDATEWorker.java   |   0
 .../cc/worker/impl/update/UpdateTimer.java    |   0
 .../iguana/commons/annotation/Nullable.java   |   0
 .../commons/annotation/ParameterNames.java    |   0
 .../iguana/commons/annotation/Shorthand.java  |   0
 .../aksw/iguana/commons/constants/COMMON.java |   0
 .../iguana/commons/factory/TypedFactory.java  |   0
 .../commons/io/BigByteArrayInputStream.java   |   0
 .../commons/io/BigByteArrayOutputStream.java  |   0
 .../iguana/commons/numbers/NumberUtils.java   |   0
 .../commons/reflect/ShorthandMapper.java      |   0
 .../iguana/commons/script/ScriptExecutor.java |   0
 .../aksw/iguana/commons/streams/Streams.java  |   0
 .../aksw/iguana/commons/time/TimeUtils.java   |   0
 .../iguana/rp/controller/RPController.java    |   0
 .../rp/experiment/ExperimentManager.java      |   0
 .../iguana/rp/metrics/AbstractMetric.java     |   0
 .../org/aksw/iguana/rp/metrics/Metric.java    |   0
 .../aksw/iguana/rp/metrics/MetricManager.java |   0
 .../iguana/rp/metrics/impl/AvgQPSMetric.java  |   0
 .../rp/metrics/impl/EachQueryMetric.java      |   0
 .../rp/metrics/impl/F1MeasureMetric.java      |   0
 .../iguana/rp/metrics/impl/NoQMetric.java     |   0
 .../iguana/rp/metrics/impl/NoQPHMetric.java   |   0
 .../iguana/rp/metrics/impl/QMPHMetric.java    |   0
 .../iguana/rp/metrics/impl/QPSMetric.java     |   0
 .../org/aksw/iguana/rp/storage/Storage.java   |   0
 .../iguana/rp/storage/StorageManager.java     |   0
 .../iguana/rp/storage/TripleBasedStorage.java |   0
 .../iguana/rp/storage/impl/NTFileStorage.java |   0
 .../rp/storage/impl/RDFFileStorage.java       |   0
 .../rp/storage/impl/TriplestoreStorage.java   |   0
 .../java/org/aksw/iguana/rp/vocab/Vocab.java  |   0
 .../main/resources/iguana-schema.json         |   0
 .../src => src}/main/resources/log4j2.yml     |   0
 .../org/aksw/iguana/cc/config/ConfigTest.java |   0
 .../aksw/iguana/cc/config/WorkflowTest.java   |   0
 .../cc/lang/MockCloseableHttpResponse.java    |   0
 .../cc/lang/RDFLanguageProcessorTest.java     |   0
 .../cc/lang/SPARQLLanguageProcessorTest.java  |   0
 .../cc/model/QueryResultHashKeyTest.java      |   0
 .../cc/query/handler/QueryHandlerTest.java    |   0
 .../pattern/PatternBasedQueryHandlerTest.java |   0
 .../cc/query/pattern/PatternHandlerTest.java  |   0
 .../impl/LinearQuerySelectorTest.java         |   0
 .../source/impl/FileLineQuerySourceTest.java  |   0
 .../impl/FileSeparatorQuerySourceTest.java    |   0
 .../source/impl/FolderQuerySourceTest.java    |   0
 .../aksw/iguana/cc/tasks/MockupStorage.java   |   0
 .../org/aksw/iguana/cc/tasks/MockupTask.java  |   0
 .../iguana/cc/tasks/impl/StresstestTest.java  |   0
 .../cc/utils/CLIProcessManagerTest.java       |   0
 .../aksw/iguana/cc/utils/FileUtilsTest.java   |   0
 .../cc/utils/SPARQLQueryStatisticsTest.java   |   0
 .../org/aksw/iguana/cc/utils/ServerMock.java  |   0
 .../aksw/iguana/cc/worker/HTTPWorkerTest.java |   0
 .../aksw/iguana/cc/worker/MockupWorker.java   |   0
 .../iguana/cc/worker/UPDATEWorkerTest.java    |   0
 .../iguana/cc/worker/WorkerServerMock.java    |   0
 .../cc/worker/impl/CLIWorkersTests.java       |   0
 .../cc/worker/impl/HttpPostWorkerTest.java    |   0
 .../factory/AnnotatedFactorizedObject.java    |   0
 .../commons/factory/FactorizedObject.java     |   0
 .../commons/factory/TypedFactoryTest.java     |   0
 .../commons/number/NumberUtilsTest.java       |   0
 .../commons/script/ScriptExecutorTest.java    |   0
 .../script/ScriptExecutorWaitTest.java        |   0
 .../aksw/iguana/commons/utils/ServerMock.java |   0
 .../iguana/rp/metrics/impl/MetricTest.java    |   0
 .../rp/storage/impl/NTFileStorageTest.java    |   0
 .../rp/storage/impl/RDFFileStorageTest.java   |   0
 .../storage/impl/TriplestoreStorageTest.java  |   0
 .../aksw/iguana/rp/utils/EqualityStorage.java |   0
 .../org/aksw/iguana/rp/utils/ServerMock.java  |   0
 .../test/resources/cli/echoinput.sh           |   0
 .../complex-script-example-issue108.sh        |   0
 .../config/mockupworkflow-default.yml         |   0
 .../config/mockupworkflow-no-default.yml      |   0
 .../test/resources/config/mockupworkflow.yml  |   0
 .../src => src}/test/resources/config/post.sh |   0
 .../src => src}/test/resources/config/pre.sh  |   0
 .../resources/config/workflow-expected.nt     |   0
 .../test/resources/controller_test.properties |   0
 .../src => src}/test/resources/fileUtils.txt  |   0
 .../test/resources/iguana-valid.json          |   0
 .../test/resources/iguana-valid.yml           |   0
 .../src => src}/test/resources/iguana.json    |   0
 .../src => src}/test/resources/iguana.yml     |   0
 .../src => src}/test/resources/mockupq.txt    |   0
 .../test/resources/nt/avgqpstest.nt           |   0
 .../src => src}/test/resources/nt/eqtest.nt   |   0
 .../src => src}/test/resources/nt/f1test.nt   |   0
 .../test/resources/nt/noqphtest.nt            |   0
 .../src => src}/test/resources/nt/noqtest.nt  |   0
 .../test/resources/nt/nt_results_wMeta.nt     |   0
 .../test/resources/nt/nt_results_woMeta.nt    |   0
 .../test/resources/nt/penaltyavgqpstest.nt    |   0
 .../src => src}/test/resources/nt/qmphtest.nt |   0
 .../test/resources/nt/qpspenaltytest.nt       |   0
 .../test/resources/nt/qpspenaltytest2.nt      |   0
 .../src => src}/test/resources/nt/qpstest.nt  |   0
 .../test/resources/nt/results_test1.nt        |   0
 .../test/resources/query/pattern-query.txt    |   0
 .../test/resources/query/source/queries.txt   |   0
 .../query/source/query-folder/query1.txt      |   0
 .../query/source/query-folder/query2.txt      |   0
 .../query/source/query-folder/query3.txt      |   0
 .../source/separated-queries-default.txt      |   0
 .../query/source/separated-queries-space.txt  |   0
 .../src => src}/test/resources/querystats.nt  |   0
 .../test/resources/sparql-json-response.json  |   0
 .../test/resources/test-DatasetName.sh        |   0
 .../test/resources/updates/empty.nt           |   0
 .../test/resources/updates/test1.nt           |   0
 .../src => src}/test/resources/wait5.sh       |   0
 .../test/resources/workers/single-query.txt   |   0
 .../test/resources/workers/updates.txt        |   0
 .../test/resources/workers/updates/test1.nt   |   0
 .../test/resources/workers/updates/test2.nt   |   0
 .../test/resources/workers/updates/test3.nt   |   0
 .../test/resources/workers/updates/test4.nt   |   0
 182 files changed, 158 insertions(+), 723 deletions(-)
 delete mode 100644 iguana.commons/README
 delete mode 100644 iguana.commons/pom.xml
 delete mode 100644 iguana.corecontroller/README
 delete mode 100644 iguana.corecontroller/pom.xml
 delete mode 100644 iguana.resultprocessor/README
 delete mode 100644 iguana.resultprocessor/pom.xml
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/config/CONSTANTS.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/config/ConfigManager.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/config/IguanaConfig.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/config/IguanaConfigFactory.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/config/elements/Connection.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/config/elements/Dataset.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/config/elements/MetricConfig.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/config/elements/Task.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/controller/MainController.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/controller/TaskController.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/lang/AbstractLanguageProcessor.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/lang/QueryWrapper.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/lang/impl/RDFLanguageProcessor.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/lang/impl/SPARQLLanguageProcessor.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/lang/impl/ThrowawayLanguageProcessor.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/model/QueryExecutionStats.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/model/QueryResultHashKey.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/list/QueryList.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/list/impl/FileBasedQueryList.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/list/impl/InMemQueryList.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/pattern/PatternHandler.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/source/QuerySource.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/tasks/AbstractTask.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/tasks/Task.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/tasks/TaskFactory.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/tasks/TaskManager.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/utils/CLIProcessManager.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/utils/FileUtils.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/utils/ResultSizeRetriever.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/utils/SPARQLQueryStatistics.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/utils/StatisticsVisitor.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/AbstractWorker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/LatencyStrategy.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/Worker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/WorkerFactory.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/impl/CLIInputFileWorker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/impl/CLIInputPrefixWorker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/impl/CLIInputWorker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/impl/CLIWorker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/impl/HttpGetWorker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/impl/HttpPostWorker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/impl/HttpWorker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/impl/MultipleCLIInputWorker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/impl/UPDATEWorker.java (100%)
 rename {iguana.corecontroller/src => src}/main/java/org/aksw/iguana/cc/worker/impl/update/UpdateTimer.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/annotation/Nullable.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/annotation/ParameterNames.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/annotation/Shorthand.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/constants/COMMON.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/factory/TypedFactory.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/numbers/NumberUtils.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/reflect/ShorthandMapper.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/script/ScriptExecutor.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/streams/Streams.java (100%)
 rename {iguana.commons/src => src}/main/java/org/aksw/iguana/commons/time/TimeUtils.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/controller/RPController.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/experiment/ExperimentManager.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/metrics/AbstractMetric.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/metrics/Metric.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/metrics/MetricManager.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/metrics/impl/F1MeasureMetric.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/metrics/impl/NoQMetric.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/metrics/impl/NoQPHMetric.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/metrics/impl/QMPHMetric.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/storage/Storage.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/storage/StorageManager.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/storage/TripleBasedStorage.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/storage/impl/NTFileStorage.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/storage/impl/RDFFileStorage.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorage.java (100%)
 rename {iguana.resultprocessor/src => src}/main/java/org/aksw/iguana/rp/vocab/Vocab.java (100%)
 rename {iguana.corecontroller/src => src}/main/resources/iguana-schema.json (100%)
 rename {iguana.corecontroller/src => src}/main/resources/log4j2.yml (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/config/ConfigTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/config/WorkflowTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/lang/MockCloseableHttpResponse.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/lang/RDFLanguageProcessorTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/lang/SPARQLLanguageProcessorTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/model/QueryResultHashKeyTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/query/pattern/PatternBasedQueryHandlerTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/query/pattern/PatternHandlerTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/tasks/MockupStorage.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/tasks/MockupTask.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/tasks/impl/StresstestTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/utils/CLIProcessManagerTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/utils/SPARQLQueryStatisticsTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/utils/ServerMock.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/worker/HTTPWorkerTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/worker/MockupWorker.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/worker/UPDATEWorkerTest.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/worker/WorkerServerMock.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/worker/impl/CLIWorkersTests.java (100%)
 rename {iguana.corecontroller/src => src}/test/java/org/aksw/iguana/cc/worker/impl/HttpPostWorkerTest.java (100%)
 rename {iguana.commons/src => src}/test/java/org/aksw/iguana/commons/factory/AnnotatedFactorizedObject.java (100%)
 rename {iguana.commons/src => src}/test/java/org/aksw/iguana/commons/factory/FactorizedObject.java (100%)
 rename {iguana.commons/src => src}/test/java/org/aksw/iguana/commons/factory/TypedFactoryTest.java (100%)
 rename {iguana.commons/src => src}/test/java/org/aksw/iguana/commons/number/NumberUtilsTest.java (100%)
 rename {iguana.commons/src => src}/test/java/org/aksw/iguana/commons/script/ScriptExecutorTest.java (100%)
 rename {iguana.commons/src => src}/test/java/org/aksw/iguana/commons/script/ScriptExecutorWaitTest.java (100%)
 rename {iguana.commons/src => src}/test/java/org/aksw/iguana/commons/utils/ServerMock.java (100%)
 rename {iguana.resultprocessor/src => src}/test/java/org/aksw/iguana/rp/metrics/impl/MetricTest.java (100%)
 rename {iguana.resultprocessor/src => src}/test/java/org/aksw/iguana/rp/storage/impl/NTFileStorageTest.java (100%)
 rename {iguana.resultprocessor/src => src}/test/java/org/aksw/iguana/rp/storage/impl/RDFFileStorageTest.java (100%)
 rename {iguana.resultprocessor/src => src}/test/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorageTest.java (100%)
 rename {iguana.resultprocessor/src => src}/test/java/org/aksw/iguana/rp/utils/EqualityStorage.java (100%)
 rename {iguana.resultprocessor/src => src}/test/java/org/aksw/iguana/rp/utils/ServerMock.java (100%)
 rename {iguana.corecontroller/src => src}/test/resources/cli/echoinput.sh (100%)
 mode change 100755 => 100644
 rename {iguana.commons/src => src}/test/resources/complex-script-example-issue108.sh (100%)
 mode change 100755 => 100644
 rename {iguana.corecontroller/src => src}/test/resources/config/mockupworkflow-default.yml (100%)
 rename {iguana.corecontroller/src => src}/test/resources/config/mockupworkflow-no-default.yml (100%)
 rename {iguana.corecontroller/src => src}/test/resources/config/mockupworkflow.yml (100%)
 rename {iguana.corecontroller/src => src}/test/resources/config/post.sh (100%)
 mode change 100755 => 100644
 rename {iguana.corecontroller/src => src}/test/resources/config/pre.sh (100%)
 mode change 100755 => 100644
 rename {iguana.corecontroller/src => src}/test/resources/config/workflow-expected.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/controller_test.properties (100%)
 rename {iguana.corecontroller/src => src}/test/resources/fileUtils.txt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/iguana-valid.json (100%)
 rename {iguana.corecontroller/src => src}/test/resources/iguana-valid.yml (100%)
 rename {iguana.corecontroller/src => src}/test/resources/iguana.json (100%)
 rename {iguana.corecontroller/src => src}/test/resources/iguana.yml (100%)
 rename {iguana.corecontroller/src => src}/test/resources/mockupq.txt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/avgqpstest.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/eqtest.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/f1test.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/noqphtest.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/noqtest.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/nt_results_wMeta.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/nt_results_woMeta.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/penaltyavgqpstest.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/qmphtest.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/qpspenaltytest.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/qpspenaltytest2.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/qpstest.nt (100%)
 rename {iguana.resultprocessor/src => src}/test/resources/nt/results_test1.nt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/query/pattern-query.txt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/query/source/queries.txt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/query/source/query-folder/query1.txt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/query/source/query-folder/query2.txt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/query/source/query-folder/query3.txt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/query/source/separated-queries-default.txt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/query/source/separated-queries-space.txt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/querystats.nt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/sparql-json-response.json (100%)
 rename {iguana.corecontroller/src => src}/test/resources/test-DatasetName.sh (100%)
 rename {iguana.corecontroller/src => src}/test/resources/updates/empty.nt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/updates/test1.nt (100%)
 rename {iguana.commons/src => src}/test/resources/wait5.sh (100%)
 mode change 100755 => 100644
 rename {iguana.corecontroller/src => src}/test/resources/workers/single-query.txt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/workers/updates.txt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/workers/updates/test1.nt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/workers/updates/test2.nt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/workers/updates/test3.nt (100%)
 rename {iguana.corecontroller/src => src}/test/resources/workers/updates/test4.nt (100%)

diff --git a/iguana.commons/README b/iguana.commons/README
deleted file mode 100644
index 5ca5f7d2a..000000000
--- a/iguana.commons/README
+++ /dev/null
@@ -1,46 +0,0 @@
-CONTENTS OF THIS FILE
----------------------
-
-* Introduction
-* Requirements
-* Installation
-* Configuration
-* Links
-
-
-INTRODUCTION
-------------
-
-The Commons module of Iguana will be used 
-to serve as methods and utils which all or several modules of Iguana needs
-
-Bugs can be submitted at https://github.com/AKSW/IGUANA/issues
-Please refer to the Module as following "[Commons] your message"
-
-
-REQUIREMENTS
-------------
-
-The Commons is not a standalone module. 
-
-
-INSTALLATION
-------------
-
-The Commons is not a standalone module. 
-
-
-CONFIGURATION
--------------
-
-The Commons is not a standalone module. 
-
-
-LINKS
------
-
-* Project Site:	http://iguana-benchmark.eu
-
-* Github Site:	http://github.com/AKSW/IGUANA
-
-* Bug Tracker:	http://github.com/AKSW/IGUANA/issues
diff --git a/iguana.commons/pom.xml b/iguana.commons/pom.xml
deleted file mode 100644
index 07ae01253..000000000
--- a/iguana.commons/pom.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.aksw</groupId>
-		<artifactId>iguana-parent</artifactId>
-		<version>${revision}</version> <!-- this is changed from [1.0,99.0) to ${revision} -->
-	</parent>
-	<artifactId>iguana.commons</artifactId>
-	<name>Iguana Commons</name>
-	<description>Iguana Common Classes and Methods</description>
-	<licenses>
-		<license>
-			<name>AGPLv3 or later</name>
-			<url>https://www.gnu.org/licenses/agpl-3.0.html</url>
-		</license>
-	</licenses>
-	<developers>
-		<developer>
-			<name>Lixi Conrads</name>
-			<email>lixiconrads@gmail.com</email>
-			<roles>
-				<role>Former Developer</role>
-			</roles>
-			<organization>Dice Research Group</organization>
-			<organizationUrl>https://dice-research.org</organizationUrl>
-		</developer>
-	</developers>
-	<organization>
-		<name>Dice Research Group</name>
-		<url>https://dice-research.org</url>
-	</organization>
-	<issueManagement>
-		<system>GitHub Issue Management</system>
-		<url>https://github.com/dice-group/iguana/issues</url>
-	</issueManagement>
-	<url>https://dice-research.org/IGUANA</url>
-
-	<properties>
-		<java.version>11</java.version>
-		<log4j.version>2.17.1</log4j.version>
-		<jena.version>3.16.0</jena.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-configuration</groupId>
-			<artifactId>commons-configuration</artifactId>
-			<version>1.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-exec</artifactId>
-			<version>1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>${log4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-api</artifactId>
-			<version>${log4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>${log4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-1.2-api</artifactId>
-			<version>${log4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.simpleframework</groupId>
-			<artifactId>simple</artifactId>
-			<version>5.1.6</version>
-		</dependency>
-		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-			<version>0.9.9</version>
-		</dependency>
-	</dependencies>
-	<!-- DISTRIBUTION MANAGEMENT -->
-	<distributionManagement>
-		<repository>
-			<id>github</id>
-			<name>GitHub dice-group Apache Maven Packages</name>
-			<url>https://maven.pkg.github.com/dice-group/IGUANA</url>
-		</repository>
-	</distributionManagement>
-
-
-	<build>
-		<plugins>
-
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.6</version>
-				<executions>
-					<execution>
-						<id>prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>report</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>post-unit-test</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-						<configuration>
-							<!-- Sets the path to the file which contains the execution data. -->
-
-							<dataFile>target/jacoco.exec</dataFile>
-							<!-- Sets the output directory for the code coverage report. -->
-							<outputDirectory>target/jacoco-ut</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
-				<configuration>
-					<source>11</source>
-					<target>11</target>
-					<encoding>UTF-8</encoding>
-					<compilerArgs>
-						<arg>-parameters</arg>
-					</compilerArgs>
-					<excludes>
-						<exclude>**/log4j2.yml</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/iguana.corecontroller/README b/iguana.corecontroller/README
deleted file mode 100644
index d71f8e970..000000000
--- a/iguana.corecontroller/README
+++ /dev/null
@@ -1,6 +0,0 @@
-INTRODUCTION
-------------
-
-The Core module of Iguana will be used to execute data generation and the tasks.
-It will run as standalone.
-
diff --git a/iguana.corecontroller/pom.xml b/iguana.corecontroller/pom.xml
deleted file mode 100644
index d96f94abf..000000000
--- a/iguana.corecontroller/pom.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.aksw</groupId>
-		<artifactId>iguana-parent</artifactId>
-		<version>${revision}</version> <!-- this is changed from [1.0,99.0) to ${revision} -->
-	</parent>
-  <artifactId>iguana.corecontroller</artifactId>
-
-  <name>Iguanas Core Controller</name>
-  <description>The Controller of Iguanas Core Module. Handling the messaging and is coordinating the ResultProcessor as well as the dataGenerator. Will be communicating with the Web Controller Module.</description>
-	<licenses>
-		<license>
-			<name>AGPLv3 or later</name>
-			<url>https://www.gnu.org/licenses/agpl-3.0.html</url>
-		</license>
-	</licenses>
-	<developers>
-		<developer>
-			<name>Lixi Conrads</name>
-			<email>lixiconrads@gmail.com</email>
-			<roles>
-				<role>Former Developer</role>
-			</roles>
-			<organization>Dice Research Group</organization>
-			<organizationUrl>https://dice-research.org</organizationUrl>
-		</developer>
-	</developers>
-	<organization>
-		<name>Dice Research Group</name>
-		<url>https://dice-research.org</url>
-	</organization>
-	<issueManagement>
-		<system>GitHub Issue Management</system>
-		<url>https://github.com/dice-group/iguana/issues</url>
-	</issueManagement>
-	<url>https://dice-research.org/IGUANA</url>
-
-	<properties>
-		<java.version>11</java.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<log4j.version>2.13.3</log4j.version>
-		<jena.version>3.16.0</jena.version>
-		<maven.compile.source>11</maven.compile.source>
-		<maven.compile.target>11</maven.compile.target>
-	</properties>
-
-<dependencies>
-	<dependency>
-		<groupId>org.apache.httpcomponents</groupId>
-		<artifactId>httpclient</artifactId>
-		<version>4.5.13</version>
-	</dependency>
-	<dependency>
-		<groupId>commons-codec</groupId>
-		<artifactId>commons-codec</artifactId>
-		<version>1.15</version>
-	</dependency>
-	<dependency>
-		<groupId>com.fasterxml.jackson.dataformat</groupId>
-		<artifactId>jackson-dataformat-yaml</artifactId>
-		<version>2.11.2</version>
-	</dependency>
-	<dependency>
-		<groupId>com.networknt</groupId>
-		<artifactId>json-schema-validator</artifactId>
-		<version>1.0.43</version>
-	</dependency>
-	<dependency>
-		<groupId>org.apache.jena</groupId>
-		<artifactId>jena-arq</artifactId>
-		<version>${jena.version}</version>
-	</dependency>
-	<dependency>
-		<groupId>com.googlecode.json-simple</groupId>
-		<artifactId>json-simple</artifactId>
-		<version>1.1.1</version>
-	</dependency>
-	<!-- JUnit -->
-	<dependency>
-		<groupId>junit</groupId>
-		<artifactId>junit</artifactId>
-		<version>4.13.1</version>
-		<scope>test</scope>
-	</dependency>
-	<dependency>
-		<groupId>org.simpleframework</groupId>
-		<artifactId>simple</artifactId>
-		<version>5.1.6</version>
-	</dependency>
-	<dependency>
-		<groupId>org.aksw</groupId>
-		<artifactId>iguana.resultprocessor</artifactId>
-		<version>${revision}</version>
-		<exclusions>
-			<exclusion>
-				<groupId>org.aksw</groupId>
-				<artifactId>iguana.commons</artifactId>
-			</exclusion>
-
-		</exclusions>
-	</dependency>
-		<dependency>
-			<groupId>org.aksw</groupId>
-			<artifactId>iguana.commons</artifactId>
-			<version>${revision}</version>
-		</dependency>
-
-
-	</dependencies>
-<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.6</version>
-				<executions>
-					<execution>
-						<id>prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>report</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>post-unit-test</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-						<configuration>
-							<!-- Sets the path to the file which contains the execution data. -->
-
-							<dataFile>target/jacoco.exec</dataFile>
-							<!-- Sets the output directory for the code coverage report. -->
-							<outputDirectory>target/jacoco-ut</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.5.0</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/lib</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
-				<configuration>
-					<source>11</source>
-					<target>11</target>
-					<encoding>UTF-8</encoding>
-					<compilerArgs>
-						<arg>-parameters</arg>
-					</compilerArgs>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.3</version>
-				<configuration>
-					<finalName>iguana-${revision}</finalName>
-					<outputDirectory>${project.parent.basedir}/target</outputDirectory>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<shadedArtifactAttached>true</shadedArtifactAttached>
-							<shadedClassifierName>shaded</shadedClassifierName>
-							<transformers>
-								<transformer implementation=
-													 "org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>org.aksw.iguana.cc.controller.MainController</mainClass>
-								</transformer>
-							</transformers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<distributionManagement>
-		<repository>
-			<id>github</id>
-			<name>GitHub dice-group Apache Maven Packages</name>
-			<url>https://maven.pkg.github.com/dice-group/IGUANA</url>
-		</repository>
-	</distributionManagement>
-</project>
diff --git a/iguana.resultprocessor/README b/iguana.resultprocessor/README
deleted file mode 100644
index 476f91357..000000000
--- a/iguana.resultprocessor/README
+++ /dev/null
@@ -1,85 +0,0 @@
-INTRODUCTION
-------------
-
-The Result Processing module of Iguana will be used to save and calculate Metrics into several Storage Solutions.
-
-The provided Metrics are
-
-* Queries Per Second (QPS)
-* Query Mixes Per Hour (QMPH)
-* Number of Queries Per Hour (NoQPH)
-* Each Query Execution Time (EQE)
-
-The provided Storage Solutions are
-
-* Triple Store
-* NTriple File
-* File/Directory Structure
-
-For a full description, please visit the wiki
-
-CONFIGURATION
--------------
-
-
-to define which metrics should be used simply add the following line
-to your properites
-
-    iguana.rp.metrics=metric1, metric2, ...
-
-To define metric1, metric2 and so on simply add the following line
-
-    metric1.class=org.aksw.iguana.rp.metrics.impl.QMPHMetric
-
-
-The following classes refer to the following Metrics
-
-* QPS:	 org.aksw.iguana.rp.metrics.impl.QPSMetric
-
-* QMPH:	 org.aksw.iguana.rp.metrics.impl.QMPHMetric
-
-* NoQPH: org.aksw.iguana.rp.metrics.impl.NoQPHMetric
-
-* EQE:	 org.aksw.iguana.rp.metrics.impl.EachQueryMetric
-
-
-To define the storages which should be used, add the following line
-to your properties
-
-    iguana.rp.storages=storage1, storage2,...
-
-To define the Storage please add the following
-
-    storage1.class=org.aksw.iguana.rp.storage.impl.TriplestoreStorage
-    storage1.constructorArgs=http://localhost:9999/blazegraph/sparql, http://localhost:9999/blazegraph/sparql
-
-
-The following Classes refer to the following Storages
-
-* TriplestoreStorage:	org.aksw.iguana.rp.storage.impl.TriplestoreStorage
-	(You have to at least specify the endpoint and updateEndpoint of the triple store in the constructor arguments)
-
-* FileStorage:		org.aksw.iguana.rp.storage.impl.FileStorage
-	(optional: you can define the root directory of the stored CSV files)
-
-* NTFileStorage:	org.aksw.iguana.rp.storage.impl.NTFileStorage
-	(optional: you can specify the Ntriple file name)
-
-For Further Information to the constructor Arguments, 
-visit the JavaDoc: http://iguana-benchmark.eu/javadoc/index.html
-
-
-
-All three (iguana.rp.consumer, iguana.rp.metrics, iguana.rp.storages)
-have to be stated in the properties file somehow.
-
-	
-
-LINKS
------
-
-* Project Site:	http://iguana-benchmark.eu
-
-* Github Site:	http://github.com/AKSW/IGUANA
-
-* Bug Tracker:	http://github.com/AKSW/IGUANA/issues
diff --git a/iguana.resultprocessor/pom.xml b/iguana.resultprocessor/pom.xml
deleted file mode 100644
index c66b91ae3..000000000
--- a/iguana.resultprocessor/pom.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.aksw</groupId>
-		<artifactId>iguana-parent</artifactId>
-		<version>${revision}</version> <!-- this is changed from [1.0,99.0) to ${revision} -->
-	</parent>
-	<artifactId>iguana.resultprocessor</artifactId>
-
-	<name>Iguana ResultProcessor</name>
-	<description>Processing, aggregating and store results from Iguanas core.</description>
-	<licenses>
-		<license>
-			<name>AGPLv3 or later</name>
-			<url>https://www.gnu.org/licenses/agpl-3.0.html</url>
-		</license>
-	</licenses>
-	<developers>
-		<developer>
-			<name>Lixi Conrads</name>
-			<email>lixiconrads@gmail.com</email>
-			<roles>
-				<role>Former Developer</role>
-			</roles>
-			<organization>Dice Research Group</organization>
-			<organizationUrl>https://dice-research.org</organizationUrl>
-		</developer>
-	</developers>
-	<organization>
-		<name>Dice Research Group</name>
-		<url>https://dice-research.org</url>
-	</organization>
-	<issueManagement>
-		<system>GitHub Issue Management</system>
-		<url>https://github.com/dice-group/iguana/issues</url>
-	</issueManagement>
-	<url>https://dice-research.org/IGUANA</url>
-
-	<properties>
-		<java.version>11</java.version>
-		<jena.version>4.2.0</jena.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compile.target>11</maven.compile.target>
-		<maven.compile.source>11</maven.compile.source>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.jena</groupId>
-			<artifactId>jena-iri</artifactId>
-			<version>${jena.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.jena</groupId>
-			<artifactId>jena-arq</artifactId>
-			<version>${jena.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.jena</groupId>
-			<artifactId>jena-core</artifactId>
-			<version>${jena.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.aksw</groupId>
-			<artifactId>iguana.commons</artifactId>
-			<version>${revision}</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.6</version>
-				<executions>
-					<execution>
-						<id>prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>report</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>post-unit-test</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-						<configuration>
-							<!-- Sets the path to the file which contains the execution data. -->
-
-							<dataFile>target/jacoco.exec</dataFile>
-							<!-- Sets the output directory for the code coverage report. -->
-							<outputDirectory>target/jacoco-ut</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-compiler-plugin</artifactId>
-						<version>3.8.1</version>
-						<configuration>
-							<source>11</source>
-							<target>11</target>
-							<encoding>UTF-8</encoding>
-							<compilerArgs>
-								<arg>-parameters</arg>
-							</compilerArgs>
-						</configuration>
-					</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/lib</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<version>1.5.0</version>
-					<configuration>
-						<executable>java</executable>
-						<mainClass>org.aksw.iguana.rp.controller.MainController</mainClass>
-					</configuration>
-				</plugin>
-				
-
-			</plugins>
-		</pluginManagement>
-	</build>
-
-	<!-- REPOSITORIES -->
-	<repositories>
-		<repository>
-			<id>Apache Repo Central</id>
-			<name>Apache Repository</name>
-			<url>https://repo.maven.apache.org/maven2</url>
-		</repository>
-		<repository>
-			<id>maven.aksw.internal</id>
-			<name>University Leipzig, AKSW Maven2 Repository</name>
-			<url>https://maven.aksw.org/archiva/repository/internal</url>
-		</repository>
-		<repository>
-			<id>maven.aksw.snapshots</id>
-			<name>University Leipzig, AKSW Maven2 Repository</name>
-			<url>https://maven.aksw.org/archiva/repository/snapshots</url>
-		</repository>
-	</repositories>
-	<distributionManagement>
-		<repository>
-			<id>github</id>
-			<name>GitHub dice-group Apache Maven Packages</name>
-			<url>https://maven.pkg.github.com/dice-group/IGUANA</url>
-		</repository>
-	</distributionManagement>
-</project>
diff --git a/pom.xml b/pom.xml
index c3eaf07f7..acf2029d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,10 @@
-<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>
-  <groupId>org.aksw</groupId>
-  <artifactId>iguana-parent</artifactId>
+<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>
+    <groupId>org.aksw</groupId>
+    <artifactId>iguana</artifactId>
     <version>${revision}</version>
-  <name>Iguana Parent </name>
+    <name>Iguana</name>
     <licenses>
         <license>
             <name>AGPLv3 or later</name>
@@ -30,19 +31,24 @@
         <url>https://github.com/dice-group/iguana/issues</url>
     </issueManagement>
     <url>https://dice-research.org/IGUANA</url>
-  <packaging>pom</packaging>
-  <modules>
-  	<module>iguana.commons</module>
-  	<module>iguana.resultprocessor</module>
-    <module>iguana.corecontroller</module>
-  </modules>
+
+
     <properties>
         <revision>${major.minor.version}.${build.version}</revision>
         <major.minor.version>${major.version}.${minor.version}</major.minor.version>
         <major.version>4</major.version>
         <minor.version>0</minor.version>
         <build.version>0</build.version>
+
+        <java.version>11</java.version>
+        <jena.version>4.2.0</jena.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compile.target>11</maven.compile.target>
+        <maven.compile.source>11</maven.compile.source>
+
+        <log4j.version>2.17.1</log4j.version>
     </properties>
+
     <distributionManagement>
         <repository>
             <id>github</id>
@@ -50,8 +56,147 @@
             <url>https://maven.pkg.github.com/dice-group/iguana</url>
         </repository>
     </distributionManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>jena-iri</artifactId>
+            <version>${jena.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>jena-arq</artifactId>
+            <version>${jena.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jena</groupId>
+            <artifactId>jena-core</artifactId>
+            <version>${jena.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-exec</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-1.2-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.simpleframework</groupId>
+            <artifactId>simple</artifactId>
+            <version>5.1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.9.9</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.networknt</groupId>
+            <artifactId>json-schema-validator</artifactId>
+            <version>1.0.78</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.32</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                    <encoding>UTF-8</encoding>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
+                    <excludes>
+                        <exclude>**/log4j2.yml</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.4.1</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <finalName>iguana-${revision}</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.aksw.iguana.cc.controller.MainController</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -62,19 +207,19 @@
                     <destDir></destDir>
                 </configuration>
             </plugin>
+
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>copy-resources</id>
-                        <!-- here the phase you need -->
                         <phase>package</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.basedir}/target</outputDirectory>
+                            <outputDirectory>${project.basedir}/target/</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>${project.basedir}/src/main/resources/</directory>
@@ -83,12 +228,6 @@
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
-                                <resource>
-                                    <directory>${project.basedir}/iguana.corecontroller/target/</directory>
-                                    <includes>
-                                        <include>iguana-${revision}-shaded.jar</include>
-                                    </includes>
-                                </resource>
                             </resources>
                         </configuration>
                     </execution>
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/CONSTANTS.java b/src/main/java/org/aksw/iguana/cc/config/CONSTANTS.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/CONSTANTS.java
rename to src/main/java/org/aksw/iguana/cc/config/CONSTANTS.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/ConfigManager.java b/src/main/java/org/aksw/iguana/cc/config/ConfigManager.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/ConfigManager.java
rename to src/main/java/org/aksw/iguana/cc/config/ConfigManager.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/IguanaConfig.java b/src/main/java/org/aksw/iguana/cc/config/IguanaConfig.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/IguanaConfig.java
rename to src/main/java/org/aksw/iguana/cc/config/IguanaConfig.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/IguanaConfigFactory.java b/src/main/java/org/aksw/iguana/cc/config/IguanaConfigFactory.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/IguanaConfigFactory.java
rename to src/main/java/org/aksw/iguana/cc/config/IguanaConfigFactory.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Connection.java b/src/main/java/org/aksw/iguana/cc/config/elements/Connection.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Connection.java
rename to src/main/java/org/aksw/iguana/cc/config/elements/Connection.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Dataset.java b/src/main/java/org/aksw/iguana/cc/config/elements/Dataset.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Dataset.java
rename to src/main/java/org/aksw/iguana/cc/config/elements/Dataset.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/MetricConfig.java b/src/main/java/org/aksw/iguana/cc/config/elements/MetricConfig.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/MetricConfig.java
rename to src/main/java/org/aksw/iguana/cc/config/elements/MetricConfig.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java b/src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java
rename to src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Task.java b/src/main/java/org/aksw/iguana/cc/config/elements/Task.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Task.java
rename to src/main/java/org/aksw/iguana/cc/config/elements/Task.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/controller/MainController.java b/src/main/java/org/aksw/iguana/cc/controller/MainController.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/controller/MainController.java
rename to src/main/java/org/aksw/iguana/cc/controller/MainController.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/controller/TaskController.java b/src/main/java/org/aksw/iguana/cc/controller/TaskController.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/controller/TaskController.java
rename to src/main/java/org/aksw/iguana/cc/controller/TaskController.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/AbstractLanguageProcessor.java b/src/main/java/org/aksw/iguana/cc/lang/AbstractLanguageProcessor.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/AbstractLanguageProcessor.java
rename to src/main/java/org/aksw/iguana/cc/lang/AbstractLanguageProcessor.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java b/src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java
rename to src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/QueryWrapper.java b/src/main/java/org/aksw/iguana/cc/lang/QueryWrapper.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/QueryWrapper.java
rename to src/main/java/org/aksw/iguana/cc/lang/QueryWrapper.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/RDFLanguageProcessor.java b/src/main/java/org/aksw/iguana/cc/lang/impl/RDFLanguageProcessor.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/RDFLanguageProcessor.java
rename to src/main/java/org/aksw/iguana/cc/lang/impl/RDFLanguageProcessor.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/SPARQLLanguageProcessor.java b/src/main/java/org/aksw/iguana/cc/lang/impl/SPARQLLanguageProcessor.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/SPARQLLanguageProcessor.java
rename to src/main/java/org/aksw/iguana/cc/lang/impl/SPARQLLanguageProcessor.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java b/src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java
rename to src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/ThrowawayLanguageProcessor.java b/src/main/java/org/aksw/iguana/cc/lang/impl/ThrowawayLanguageProcessor.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/ThrowawayLanguageProcessor.java
rename to src/main/java/org/aksw/iguana/cc/lang/impl/ThrowawayLanguageProcessor.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/model/QueryExecutionStats.java b/src/main/java/org/aksw/iguana/cc/model/QueryExecutionStats.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/model/QueryExecutionStats.java
rename to src/main/java/org/aksw/iguana/cc/model/QueryExecutionStats.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/model/QueryResultHashKey.java b/src/main/java/org/aksw/iguana/cc/model/QueryResultHashKey.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/model/QueryResultHashKey.java
rename to src/main/java/org/aksw/iguana/cc/model/QueryResultHashKey.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java b/src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java
rename to src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/QueryList.java b/src/main/java/org/aksw/iguana/cc/query/list/QueryList.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/QueryList.java
rename to src/main/java/org/aksw/iguana/cc/query/list/QueryList.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/impl/FileBasedQueryList.java b/src/main/java/org/aksw/iguana/cc/query/list/impl/FileBasedQueryList.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/impl/FileBasedQueryList.java
rename to src/main/java/org/aksw/iguana/cc/query/list/impl/FileBasedQueryList.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/impl/InMemQueryList.java b/src/main/java/org/aksw/iguana/cc/query/list/impl/InMemQueryList.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/impl/InMemQueryList.java
rename to src/main/java/org/aksw/iguana/cc/query/list/impl/InMemQueryList.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/pattern/PatternHandler.java b/src/main/java/org/aksw/iguana/cc/query/pattern/PatternHandler.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/pattern/PatternHandler.java
rename to src/main/java/org/aksw/iguana/cc/query/pattern/PatternHandler.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java b/src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java
rename to src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java b/src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java
rename to src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java b/src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java
rename to src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java b/src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java
rename to src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java b/src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java
rename to src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java b/src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java
rename to src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java b/src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java
rename to src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/AbstractTask.java b/src/main/java/org/aksw/iguana/cc/tasks/AbstractTask.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/AbstractTask.java
rename to src/main/java/org/aksw/iguana/cc/tasks/AbstractTask.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/Task.java b/src/main/java/org/aksw/iguana/cc/tasks/Task.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/Task.java
rename to src/main/java/org/aksw/iguana/cc/tasks/Task.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/TaskFactory.java b/src/main/java/org/aksw/iguana/cc/tasks/TaskFactory.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/TaskFactory.java
rename to src/main/java/org/aksw/iguana/cc/tasks/TaskFactory.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/TaskManager.java b/src/main/java/org/aksw/iguana/cc/tasks/TaskManager.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/TaskManager.java
rename to src/main/java/org/aksw/iguana/cc/tasks/TaskManager.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java b/src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java
rename to src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/CLIProcessManager.java b/src/main/java/org/aksw/iguana/cc/utils/CLIProcessManager.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/CLIProcessManager.java
rename to src/main/java/org/aksw/iguana/cc/utils/CLIProcessManager.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/FileUtils.java b/src/main/java/org/aksw/iguana/cc/utils/FileUtils.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/FileUtils.java
rename to src/main/java/org/aksw/iguana/cc/utils/FileUtils.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/ResultSizeRetriever.java b/src/main/java/org/aksw/iguana/cc/utils/ResultSizeRetriever.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/ResultSizeRetriever.java
rename to src/main/java/org/aksw/iguana/cc/utils/ResultSizeRetriever.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/SPARQLQueryStatistics.java b/src/main/java/org/aksw/iguana/cc/utils/SPARQLQueryStatistics.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/SPARQLQueryStatistics.java
rename to src/main/java/org/aksw/iguana/cc/utils/SPARQLQueryStatistics.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/StatisticsVisitor.java b/src/main/java/org/aksw/iguana/cc/utils/StatisticsVisitor.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/StatisticsVisitor.java
rename to src/main/java/org/aksw/iguana/cc/utils/StatisticsVisitor.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/AbstractWorker.java b/src/main/java/org/aksw/iguana/cc/worker/AbstractWorker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/AbstractWorker.java
rename to src/main/java/org/aksw/iguana/cc/worker/AbstractWorker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/LatencyStrategy.java b/src/main/java/org/aksw/iguana/cc/worker/LatencyStrategy.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/LatencyStrategy.java
rename to src/main/java/org/aksw/iguana/cc/worker/LatencyStrategy.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/Worker.java b/src/main/java/org/aksw/iguana/cc/worker/Worker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/Worker.java
rename to src/main/java/org/aksw/iguana/cc/worker/Worker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/WorkerFactory.java b/src/main/java/org/aksw/iguana/cc/worker/WorkerFactory.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/WorkerFactory.java
rename to src/main/java/org/aksw/iguana/cc/worker/WorkerFactory.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputFileWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputFileWorker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputFileWorker.java
rename to src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputFileWorker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputPrefixWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputPrefixWorker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputPrefixWorker.java
rename to src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputPrefixWorker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputWorker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputWorker.java
rename to src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputWorker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/CLIWorker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIWorker.java
rename to src/main/java/org/aksw/iguana/cc/worker/impl/CLIWorker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpGetWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/HttpGetWorker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpGetWorker.java
rename to src/main/java/org/aksw/iguana/cc/worker/impl/HttpGetWorker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpPostWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/HttpPostWorker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpPostWorker.java
rename to src/main/java/org/aksw/iguana/cc/worker/impl/HttpPostWorker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/HttpWorker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpWorker.java
rename to src/main/java/org/aksw/iguana/cc/worker/impl/HttpWorker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/MultipleCLIInputWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/MultipleCLIInputWorker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/MultipleCLIInputWorker.java
rename to src/main/java/org/aksw/iguana/cc/worker/impl/MultipleCLIInputWorker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/UPDATEWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/UPDATEWorker.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/UPDATEWorker.java
rename to src/main/java/org/aksw/iguana/cc/worker/impl/UPDATEWorker.java
diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/update/UpdateTimer.java b/src/main/java/org/aksw/iguana/cc/worker/impl/update/UpdateTimer.java
similarity index 100%
rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/update/UpdateTimer.java
rename to src/main/java/org/aksw/iguana/cc/worker/impl/update/UpdateTimer.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/Nullable.java b/src/main/java/org/aksw/iguana/commons/annotation/Nullable.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/Nullable.java
rename to src/main/java/org/aksw/iguana/commons/annotation/Nullable.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/ParameterNames.java b/src/main/java/org/aksw/iguana/commons/annotation/ParameterNames.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/ParameterNames.java
rename to src/main/java/org/aksw/iguana/commons/annotation/ParameterNames.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/Shorthand.java b/src/main/java/org/aksw/iguana/commons/annotation/Shorthand.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/Shorthand.java
rename to src/main/java/org/aksw/iguana/commons/annotation/Shorthand.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/constants/COMMON.java b/src/main/java/org/aksw/iguana/commons/constants/COMMON.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/constants/COMMON.java
rename to src/main/java/org/aksw/iguana/commons/constants/COMMON.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/factory/TypedFactory.java b/src/main/java/org/aksw/iguana/commons/factory/TypedFactory.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/factory/TypedFactory.java
rename to src/main/java/org/aksw/iguana/commons/factory/TypedFactory.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java b/src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java
rename to src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java b/src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java
rename to src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/numbers/NumberUtils.java b/src/main/java/org/aksw/iguana/commons/numbers/NumberUtils.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/numbers/NumberUtils.java
rename to src/main/java/org/aksw/iguana/commons/numbers/NumberUtils.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/reflect/ShorthandMapper.java b/src/main/java/org/aksw/iguana/commons/reflect/ShorthandMapper.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/reflect/ShorthandMapper.java
rename to src/main/java/org/aksw/iguana/commons/reflect/ShorthandMapper.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/script/ScriptExecutor.java b/src/main/java/org/aksw/iguana/commons/script/ScriptExecutor.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/script/ScriptExecutor.java
rename to src/main/java/org/aksw/iguana/commons/script/ScriptExecutor.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/streams/Streams.java b/src/main/java/org/aksw/iguana/commons/streams/Streams.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/streams/Streams.java
rename to src/main/java/org/aksw/iguana/commons/streams/Streams.java
diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/time/TimeUtils.java b/src/main/java/org/aksw/iguana/commons/time/TimeUtils.java
similarity index 100%
rename from iguana.commons/src/main/java/org/aksw/iguana/commons/time/TimeUtils.java
rename to src/main/java/org/aksw/iguana/commons/time/TimeUtils.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/controller/RPController.java b/src/main/java/org/aksw/iguana/rp/controller/RPController.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/controller/RPController.java
rename to src/main/java/org/aksw/iguana/rp/controller/RPController.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/experiment/ExperimentManager.java b/src/main/java/org/aksw/iguana/rp/experiment/ExperimentManager.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/experiment/ExperimentManager.java
rename to src/main/java/org/aksw/iguana/rp/experiment/ExperimentManager.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/AbstractMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/AbstractMetric.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/AbstractMetric.java
rename to src/main/java/org/aksw/iguana/rp/metrics/AbstractMetric.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/Metric.java b/src/main/java/org/aksw/iguana/rp/metrics/Metric.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/Metric.java
rename to src/main/java/org/aksw/iguana/rp/metrics/Metric.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/MetricManager.java b/src/main/java/org/aksw/iguana/rp/metrics/MetricManager.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/MetricManager.java
rename to src/main/java/org/aksw/iguana/rp/metrics/MetricManager.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java
rename to src/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java
rename to src/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/F1MeasureMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/F1MeasureMetric.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/F1MeasureMetric.java
rename to src/main/java/org/aksw/iguana/rp/metrics/impl/F1MeasureMetric.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQMetric.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQMetric.java
rename to src/main/java/org/aksw/iguana/rp/metrics/impl/NoQMetric.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQPHMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQPHMetric.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQPHMetric.java
rename to src/main/java/org/aksw/iguana/rp/metrics/impl/NoQPHMetric.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/QMPHMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/QMPHMetric.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/QMPHMetric.java
rename to src/main/java/org/aksw/iguana/rp/metrics/impl/QMPHMetric.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java
rename to src/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/Storage.java b/src/main/java/org/aksw/iguana/rp/storage/Storage.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/Storage.java
rename to src/main/java/org/aksw/iguana/rp/storage/Storage.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/StorageManager.java b/src/main/java/org/aksw/iguana/rp/storage/StorageManager.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/StorageManager.java
rename to src/main/java/org/aksw/iguana/rp/storage/StorageManager.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/TripleBasedStorage.java b/src/main/java/org/aksw/iguana/rp/storage/TripleBasedStorage.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/TripleBasedStorage.java
rename to src/main/java/org/aksw/iguana/rp/storage/TripleBasedStorage.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/NTFileStorage.java b/src/main/java/org/aksw/iguana/rp/storage/impl/NTFileStorage.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/NTFileStorage.java
rename to src/main/java/org/aksw/iguana/rp/storage/impl/NTFileStorage.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/RDFFileStorage.java b/src/main/java/org/aksw/iguana/rp/storage/impl/RDFFileStorage.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/RDFFileStorage.java
rename to src/main/java/org/aksw/iguana/rp/storage/impl/RDFFileStorage.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorage.java b/src/main/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorage.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorage.java
rename to src/main/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorage.java
diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/vocab/Vocab.java b/src/main/java/org/aksw/iguana/rp/vocab/Vocab.java
similarity index 100%
rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/vocab/Vocab.java
rename to src/main/java/org/aksw/iguana/rp/vocab/Vocab.java
diff --git a/iguana.corecontroller/src/main/resources/iguana-schema.json b/src/main/resources/iguana-schema.json
similarity index 100%
rename from iguana.corecontroller/src/main/resources/iguana-schema.json
rename to src/main/resources/iguana-schema.json
diff --git a/iguana.corecontroller/src/main/resources/log4j2.yml b/src/main/resources/log4j2.yml
similarity index 100%
rename from iguana.corecontroller/src/main/resources/log4j2.yml
rename to src/main/resources/log4j2.yml
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/config/ConfigTest.java b/src/test/java/org/aksw/iguana/cc/config/ConfigTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/config/ConfigTest.java
rename to src/test/java/org/aksw/iguana/cc/config/ConfigTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/config/WorkflowTest.java b/src/test/java/org/aksw/iguana/cc/config/WorkflowTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/config/WorkflowTest.java
rename to src/test/java/org/aksw/iguana/cc/config/WorkflowTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/MockCloseableHttpResponse.java b/src/test/java/org/aksw/iguana/cc/lang/MockCloseableHttpResponse.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/MockCloseableHttpResponse.java
rename to src/test/java/org/aksw/iguana/cc/lang/MockCloseableHttpResponse.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/RDFLanguageProcessorTest.java b/src/test/java/org/aksw/iguana/cc/lang/RDFLanguageProcessorTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/RDFLanguageProcessorTest.java
rename to src/test/java/org/aksw/iguana/cc/lang/RDFLanguageProcessorTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/SPARQLLanguageProcessorTest.java b/src/test/java/org/aksw/iguana/cc/lang/SPARQLLanguageProcessorTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/SPARQLLanguageProcessorTest.java
rename to src/test/java/org/aksw/iguana/cc/lang/SPARQLLanguageProcessorTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/model/QueryResultHashKeyTest.java b/src/test/java/org/aksw/iguana/cc/model/QueryResultHashKeyTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/model/QueryResultHashKeyTest.java
rename to src/test/java/org/aksw/iguana/cc/model/QueryResultHashKeyTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java b/src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java
rename to src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/pattern/PatternBasedQueryHandlerTest.java b/src/test/java/org/aksw/iguana/cc/query/pattern/PatternBasedQueryHandlerTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/pattern/PatternBasedQueryHandlerTest.java
rename to src/test/java/org/aksw/iguana/cc/query/pattern/PatternBasedQueryHandlerTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/pattern/PatternHandlerTest.java b/src/test/java/org/aksw/iguana/cc/query/pattern/PatternHandlerTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/pattern/PatternHandlerTest.java
rename to src/test/java/org/aksw/iguana/cc/query/pattern/PatternHandlerTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java b/src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java
rename to src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java b/src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java
rename to src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java b/src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java
rename to src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java b/src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java
rename to src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/MockupStorage.java b/src/test/java/org/aksw/iguana/cc/tasks/MockupStorage.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/MockupStorage.java
rename to src/test/java/org/aksw/iguana/cc/tasks/MockupStorage.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/MockupTask.java b/src/test/java/org/aksw/iguana/cc/tasks/MockupTask.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/MockupTask.java
rename to src/test/java/org/aksw/iguana/cc/tasks/MockupTask.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/impl/StresstestTest.java b/src/test/java/org/aksw/iguana/cc/tasks/impl/StresstestTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/impl/StresstestTest.java
rename to src/test/java/org/aksw/iguana/cc/tasks/impl/StresstestTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/CLIProcessManagerTest.java b/src/test/java/org/aksw/iguana/cc/utils/CLIProcessManagerTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/CLIProcessManagerTest.java
rename to src/test/java/org/aksw/iguana/cc/utils/CLIProcessManagerTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java b/src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java
rename to src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/SPARQLQueryStatisticsTest.java b/src/test/java/org/aksw/iguana/cc/utils/SPARQLQueryStatisticsTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/SPARQLQueryStatisticsTest.java
rename to src/test/java/org/aksw/iguana/cc/utils/SPARQLQueryStatisticsTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/ServerMock.java b/src/test/java/org/aksw/iguana/cc/utils/ServerMock.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/ServerMock.java
rename to src/test/java/org/aksw/iguana/cc/utils/ServerMock.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/HTTPWorkerTest.java b/src/test/java/org/aksw/iguana/cc/worker/HTTPWorkerTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/HTTPWorkerTest.java
rename to src/test/java/org/aksw/iguana/cc/worker/HTTPWorkerTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/MockupWorker.java b/src/test/java/org/aksw/iguana/cc/worker/MockupWorker.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/MockupWorker.java
rename to src/test/java/org/aksw/iguana/cc/worker/MockupWorker.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/UPDATEWorkerTest.java b/src/test/java/org/aksw/iguana/cc/worker/UPDATEWorkerTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/UPDATEWorkerTest.java
rename to src/test/java/org/aksw/iguana/cc/worker/UPDATEWorkerTest.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/WorkerServerMock.java b/src/test/java/org/aksw/iguana/cc/worker/WorkerServerMock.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/WorkerServerMock.java
rename to src/test/java/org/aksw/iguana/cc/worker/WorkerServerMock.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/impl/CLIWorkersTests.java b/src/test/java/org/aksw/iguana/cc/worker/impl/CLIWorkersTests.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/impl/CLIWorkersTests.java
rename to src/test/java/org/aksw/iguana/cc/worker/impl/CLIWorkersTests.java
diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/impl/HttpPostWorkerTest.java b/src/test/java/org/aksw/iguana/cc/worker/impl/HttpPostWorkerTest.java
similarity index 100%
rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/impl/HttpPostWorkerTest.java
rename to src/test/java/org/aksw/iguana/cc/worker/impl/HttpPostWorkerTest.java
diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/factory/AnnotatedFactorizedObject.java b/src/test/java/org/aksw/iguana/commons/factory/AnnotatedFactorizedObject.java
similarity index 100%
rename from iguana.commons/src/test/java/org/aksw/iguana/commons/factory/AnnotatedFactorizedObject.java
rename to src/test/java/org/aksw/iguana/commons/factory/AnnotatedFactorizedObject.java
diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/factory/FactorizedObject.java b/src/test/java/org/aksw/iguana/commons/factory/FactorizedObject.java
similarity index 100%
rename from iguana.commons/src/test/java/org/aksw/iguana/commons/factory/FactorizedObject.java
rename to src/test/java/org/aksw/iguana/commons/factory/FactorizedObject.java
diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/factory/TypedFactoryTest.java b/src/test/java/org/aksw/iguana/commons/factory/TypedFactoryTest.java
similarity index 100%
rename from iguana.commons/src/test/java/org/aksw/iguana/commons/factory/TypedFactoryTest.java
rename to src/test/java/org/aksw/iguana/commons/factory/TypedFactoryTest.java
diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/number/NumberUtilsTest.java b/src/test/java/org/aksw/iguana/commons/number/NumberUtilsTest.java
similarity index 100%
rename from iguana.commons/src/test/java/org/aksw/iguana/commons/number/NumberUtilsTest.java
rename to src/test/java/org/aksw/iguana/commons/number/NumberUtilsTest.java
diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorTest.java b/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorTest.java
similarity index 100%
rename from iguana.commons/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorTest.java
rename to src/test/java/org/aksw/iguana/commons/script/ScriptExecutorTest.java
diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorWaitTest.java b/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorWaitTest.java
similarity index 100%
rename from iguana.commons/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorWaitTest.java
rename to src/test/java/org/aksw/iguana/commons/script/ScriptExecutorWaitTest.java
diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/utils/ServerMock.java b/src/test/java/org/aksw/iguana/commons/utils/ServerMock.java
similarity index 100%
rename from iguana.commons/src/test/java/org/aksw/iguana/commons/utils/ServerMock.java
rename to src/test/java/org/aksw/iguana/commons/utils/ServerMock.java
diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/metrics/impl/MetricTest.java b/src/test/java/org/aksw/iguana/rp/metrics/impl/MetricTest.java
similarity index 100%
rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/metrics/impl/MetricTest.java
rename to src/test/java/org/aksw/iguana/rp/metrics/impl/MetricTest.java
diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/NTFileStorageTest.java b/src/test/java/org/aksw/iguana/rp/storage/impl/NTFileStorageTest.java
similarity index 100%
rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/NTFileStorageTest.java
rename to src/test/java/org/aksw/iguana/rp/storage/impl/NTFileStorageTest.java
diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/RDFFileStorageTest.java b/src/test/java/org/aksw/iguana/rp/storage/impl/RDFFileStorageTest.java
similarity index 100%
rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/RDFFileStorageTest.java
rename to src/test/java/org/aksw/iguana/rp/storage/impl/RDFFileStorageTest.java
diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorageTest.java b/src/test/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorageTest.java
similarity index 100%
rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorageTest.java
rename to src/test/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorageTest.java
diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/utils/EqualityStorage.java b/src/test/java/org/aksw/iguana/rp/utils/EqualityStorage.java
similarity index 100%
rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/utils/EqualityStorage.java
rename to src/test/java/org/aksw/iguana/rp/utils/EqualityStorage.java
diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/utils/ServerMock.java b/src/test/java/org/aksw/iguana/rp/utils/ServerMock.java
similarity index 100%
rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/utils/ServerMock.java
rename to src/test/java/org/aksw/iguana/rp/utils/ServerMock.java
diff --git a/iguana.corecontroller/src/test/resources/cli/echoinput.sh b/src/test/resources/cli/echoinput.sh
old mode 100755
new mode 100644
similarity index 100%
rename from iguana.corecontroller/src/test/resources/cli/echoinput.sh
rename to src/test/resources/cli/echoinput.sh
diff --git a/iguana.commons/src/test/resources/complex-script-example-issue108.sh b/src/test/resources/complex-script-example-issue108.sh
old mode 100755
new mode 100644
similarity index 100%
rename from iguana.commons/src/test/resources/complex-script-example-issue108.sh
rename to src/test/resources/complex-script-example-issue108.sh
diff --git a/iguana.corecontroller/src/test/resources/config/mockupworkflow-default.yml b/src/test/resources/config/mockupworkflow-default.yml
similarity index 100%
rename from iguana.corecontroller/src/test/resources/config/mockupworkflow-default.yml
rename to src/test/resources/config/mockupworkflow-default.yml
diff --git a/iguana.corecontroller/src/test/resources/config/mockupworkflow-no-default.yml b/src/test/resources/config/mockupworkflow-no-default.yml
similarity index 100%
rename from iguana.corecontroller/src/test/resources/config/mockupworkflow-no-default.yml
rename to src/test/resources/config/mockupworkflow-no-default.yml
diff --git a/iguana.corecontroller/src/test/resources/config/mockupworkflow.yml b/src/test/resources/config/mockupworkflow.yml
similarity index 100%
rename from iguana.corecontroller/src/test/resources/config/mockupworkflow.yml
rename to src/test/resources/config/mockupworkflow.yml
diff --git a/iguana.corecontroller/src/test/resources/config/post.sh b/src/test/resources/config/post.sh
old mode 100755
new mode 100644
similarity index 100%
rename from iguana.corecontroller/src/test/resources/config/post.sh
rename to src/test/resources/config/post.sh
diff --git a/iguana.corecontroller/src/test/resources/config/pre.sh b/src/test/resources/config/pre.sh
old mode 100755
new mode 100644
similarity index 100%
rename from iguana.corecontroller/src/test/resources/config/pre.sh
rename to src/test/resources/config/pre.sh
diff --git a/iguana.corecontroller/src/test/resources/config/workflow-expected.nt b/src/test/resources/config/workflow-expected.nt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/config/workflow-expected.nt
rename to src/test/resources/config/workflow-expected.nt
diff --git a/iguana.resultprocessor/src/test/resources/controller_test.properties b/src/test/resources/controller_test.properties
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/controller_test.properties
rename to src/test/resources/controller_test.properties
diff --git a/iguana.corecontroller/src/test/resources/fileUtils.txt b/src/test/resources/fileUtils.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/fileUtils.txt
rename to src/test/resources/fileUtils.txt
diff --git a/iguana.corecontroller/src/test/resources/iguana-valid.json b/src/test/resources/iguana-valid.json
similarity index 100%
rename from iguana.corecontroller/src/test/resources/iguana-valid.json
rename to src/test/resources/iguana-valid.json
diff --git a/iguana.corecontroller/src/test/resources/iguana-valid.yml b/src/test/resources/iguana-valid.yml
similarity index 100%
rename from iguana.corecontroller/src/test/resources/iguana-valid.yml
rename to src/test/resources/iguana-valid.yml
diff --git a/iguana.corecontroller/src/test/resources/iguana.json b/src/test/resources/iguana.json
similarity index 100%
rename from iguana.corecontroller/src/test/resources/iguana.json
rename to src/test/resources/iguana.json
diff --git a/iguana.corecontroller/src/test/resources/iguana.yml b/src/test/resources/iguana.yml
similarity index 100%
rename from iguana.corecontroller/src/test/resources/iguana.yml
rename to src/test/resources/iguana.yml
diff --git a/iguana.corecontroller/src/test/resources/mockupq.txt b/src/test/resources/mockupq.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/mockupq.txt
rename to src/test/resources/mockupq.txt
diff --git a/iguana.resultprocessor/src/test/resources/nt/avgqpstest.nt b/src/test/resources/nt/avgqpstest.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/avgqpstest.nt
rename to src/test/resources/nt/avgqpstest.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/eqtest.nt b/src/test/resources/nt/eqtest.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/eqtest.nt
rename to src/test/resources/nt/eqtest.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/f1test.nt b/src/test/resources/nt/f1test.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/f1test.nt
rename to src/test/resources/nt/f1test.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/noqphtest.nt b/src/test/resources/nt/noqphtest.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/noqphtest.nt
rename to src/test/resources/nt/noqphtest.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/noqtest.nt b/src/test/resources/nt/noqtest.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/noqtest.nt
rename to src/test/resources/nt/noqtest.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/nt_results_wMeta.nt b/src/test/resources/nt/nt_results_wMeta.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/nt_results_wMeta.nt
rename to src/test/resources/nt/nt_results_wMeta.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/nt_results_woMeta.nt b/src/test/resources/nt/nt_results_woMeta.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/nt_results_woMeta.nt
rename to src/test/resources/nt/nt_results_woMeta.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/penaltyavgqpstest.nt b/src/test/resources/nt/penaltyavgqpstest.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/penaltyavgqpstest.nt
rename to src/test/resources/nt/penaltyavgqpstest.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/qmphtest.nt b/src/test/resources/nt/qmphtest.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/qmphtest.nt
rename to src/test/resources/nt/qmphtest.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/qpspenaltytest.nt b/src/test/resources/nt/qpspenaltytest.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/qpspenaltytest.nt
rename to src/test/resources/nt/qpspenaltytest.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/qpspenaltytest2.nt b/src/test/resources/nt/qpspenaltytest2.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/qpspenaltytest2.nt
rename to src/test/resources/nt/qpspenaltytest2.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/qpstest.nt b/src/test/resources/nt/qpstest.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/qpstest.nt
rename to src/test/resources/nt/qpstest.nt
diff --git a/iguana.resultprocessor/src/test/resources/nt/results_test1.nt b/src/test/resources/nt/results_test1.nt
similarity index 100%
rename from iguana.resultprocessor/src/test/resources/nt/results_test1.nt
rename to src/test/resources/nt/results_test1.nt
diff --git a/iguana.corecontroller/src/test/resources/query/pattern-query.txt b/src/test/resources/query/pattern-query.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/query/pattern-query.txt
rename to src/test/resources/query/pattern-query.txt
diff --git a/iguana.corecontroller/src/test/resources/query/source/queries.txt b/src/test/resources/query/source/queries.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/query/source/queries.txt
rename to src/test/resources/query/source/queries.txt
diff --git a/iguana.corecontroller/src/test/resources/query/source/query-folder/query1.txt b/src/test/resources/query/source/query-folder/query1.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/query/source/query-folder/query1.txt
rename to src/test/resources/query/source/query-folder/query1.txt
diff --git a/iguana.corecontroller/src/test/resources/query/source/query-folder/query2.txt b/src/test/resources/query/source/query-folder/query2.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/query/source/query-folder/query2.txt
rename to src/test/resources/query/source/query-folder/query2.txt
diff --git a/iguana.corecontroller/src/test/resources/query/source/query-folder/query3.txt b/src/test/resources/query/source/query-folder/query3.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/query/source/query-folder/query3.txt
rename to src/test/resources/query/source/query-folder/query3.txt
diff --git a/iguana.corecontroller/src/test/resources/query/source/separated-queries-default.txt b/src/test/resources/query/source/separated-queries-default.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/query/source/separated-queries-default.txt
rename to src/test/resources/query/source/separated-queries-default.txt
diff --git a/iguana.corecontroller/src/test/resources/query/source/separated-queries-space.txt b/src/test/resources/query/source/separated-queries-space.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/query/source/separated-queries-space.txt
rename to src/test/resources/query/source/separated-queries-space.txt
diff --git a/iguana.corecontroller/src/test/resources/querystats.nt b/src/test/resources/querystats.nt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/querystats.nt
rename to src/test/resources/querystats.nt
diff --git a/iguana.corecontroller/src/test/resources/sparql-json-response.json b/src/test/resources/sparql-json-response.json
similarity index 100%
rename from iguana.corecontroller/src/test/resources/sparql-json-response.json
rename to src/test/resources/sparql-json-response.json
diff --git a/iguana.corecontroller/src/test/resources/test-DatasetName.sh b/src/test/resources/test-DatasetName.sh
similarity index 100%
rename from iguana.corecontroller/src/test/resources/test-DatasetName.sh
rename to src/test/resources/test-DatasetName.sh
diff --git a/iguana.corecontroller/src/test/resources/updates/empty.nt b/src/test/resources/updates/empty.nt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/updates/empty.nt
rename to src/test/resources/updates/empty.nt
diff --git a/iguana.corecontroller/src/test/resources/updates/test1.nt b/src/test/resources/updates/test1.nt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/updates/test1.nt
rename to src/test/resources/updates/test1.nt
diff --git a/iguana.commons/src/test/resources/wait5.sh b/src/test/resources/wait5.sh
old mode 100755
new mode 100644
similarity index 100%
rename from iguana.commons/src/test/resources/wait5.sh
rename to src/test/resources/wait5.sh
diff --git a/iguana.corecontroller/src/test/resources/workers/single-query.txt b/src/test/resources/workers/single-query.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/workers/single-query.txt
rename to src/test/resources/workers/single-query.txt
diff --git a/iguana.corecontroller/src/test/resources/workers/updates.txt b/src/test/resources/workers/updates.txt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/workers/updates.txt
rename to src/test/resources/workers/updates.txt
diff --git a/iguana.corecontroller/src/test/resources/workers/updates/test1.nt b/src/test/resources/workers/updates/test1.nt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/workers/updates/test1.nt
rename to src/test/resources/workers/updates/test1.nt
diff --git a/iguana.corecontroller/src/test/resources/workers/updates/test2.nt b/src/test/resources/workers/updates/test2.nt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/workers/updates/test2.nt
rename to src/test/resources/workers/updates/test2.nt
diff --git a/iguana.corecontroller/src/test/resources/workers/updates/test3.nt b/src/test/resources/workers/updates/test3.nt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/workers/updates/test3.nt
rename to src/test/resources/workers/updates/test3.nt
diff --git a/iguana.corecontroller/src/test/resources/workers/updates/test4.nt b/src/test/resources/workers/updates/test4.nt
similarity index 100%
rename from iguana.corecontroller/src/test/resources/workers/updates/test4.nt
rename to src/test/resources/workers/updates/test4.nt

From d8da7448bb2c4dd42eb014e58630f049fb8d248a Mon Sep 17 00:00:00 2001
From: Nick Molcanov <32801560+nck-mlcnv@users.noreply.github.com>
Date: Wed, 28 Jun 2023 14:33:41 +0200
Subject: [PATCH 2/4] use java 17

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index acf2029d2..90bd14bf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,11 +40,11 @@
         <minor.version>0</minor.version>
         <build.version>0</build.version>
 
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <jena.version>4.2.0</jena.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compile.target>11</maven.compile.target>
-        <maven.compile.source>11</maven.compile.source>
+        <maven.compile.target>17</maven.compile.target>
+        <maven.compile.source>17</maven.compile.source>
 
         <log4j.version>2.17.1</log4j.version>
     </properties>
@@ -160,8 +160,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>17</source>
+                    <target>17</target>
                     <encoding>UTF-8</encoding>
                     <compilerArgs>
                         <arg>-parameters</arg>

From d7f4a6bdf523b73971d56753f3e6e659ccc1c731 Mon Sep 17 00:00:00 2001
From: Nick Molcanov <32801560+nck-mlcnv@users.noreply.github.com>
Date: Wed, 28 Jun 2023 15:47:12 +0200
Subject: [PATCH 3/4] change file permissions

---
 src/test/resources/cli/echoinput.sh           | 42 ++++++-------
 .../complex-script-example-issue108.sh        | 60 +++++++++----------
 src/test/resources/config/post.sh             |  2 +-
 src/test/resources/config/pre.sh              |  2 +-
 src/test/resources/wait5.sh                   |  4 +-
 5 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/test/resources/cli/echoinput.sh b/src/test/resources/cli/echoinput.sh
index 1b9360e95..c6281ea82 100644
--- a/src/test/resources/cli/echoinput.sh
+++ b/src/test/resources/cli/echoinput.sh
@@ -1,21 +1,21 @@
-#!/bin/bash
-
-echo "Some random words"
-echo "Some random words"
-echo "Some random words"
-echo "words init finished words"
-
-read -r input
-
-while [ "$input" != "quit" ]
-do
-  echo "$input" >> "$1"
-  printf "header\na\na\na\n"
-  if [ "$input" == "fail" ] || [ "$input" == "prefix fail suffix" ]
-    then echo "words query fail words"
-  else
-    printf "rows\n"
-  fi
-
-  read -r input
-done
+#!/bin/bash
+
+echo "Some random words"
+echo "Some random words"
+echo "Some random words"
+echo "words init finished words"
+
+read -r input
+
+while [ "$input" != "quit" ]
+do
+  echo "$input" >> "$1"
+  printf "header\na\na\na\n"
+  if [ "$input" == "fail" ] || [ "$input" == "prefix fail suffix" ]
+    then echo "words query fail words"
+  else
+    printf "rows\n"
+  fi
+
+  read -r input
+done
diff --git a/src/test/resources/complex-script-example-issue108.sh b/src/test/resources/complex-script-example-issue108.sh
index 1240e4387..eb20d9a29 100644
--- a/src/test/resources/complex-script-example-issue108.sh
+++ b/src/test/resources/complex-script-example-issue108.sh
@@ -1,31 +1,31 @@
-#!/bin/bash
-
-if [[ -f ./shouldNotExist.pid ]]
-then
-    echo $(date --iso-8601) - ServerMock seems to be already running
-    echo If it is not running remove shouldNotExist.pid
-    exit 1
-fi
-
-echo $(date --iso-8601) - Starting ServerMock
-
-#{{ target_dir }}/triplestores/virtuoso/{{ virtuoso_version }}/virtuoso-opensource/bin/virtuoso-t -c {{ target_dir }}/triplestores/virtuoso/virtuoso-run-{{ item[1].name }}-{{ item[2].number }}.ini
-#simulating waiting for another script, normally we should start netcat or similar here, but as it's not available for anyone this should do the trick.
-./src/test/resources/wait5.sh
-
-
-echo $(date --iso-8601) - Waiting for ServerMock to become available
-
-while :
-do
-    curl -s 127.0.0.1:8023
-    if [ $? -eq 0 ]
-    then
-        break
-    fi
-    sleep 2
-done
-
-echo $(date --iso-8601) - ServerMock started and accepting connections
-
+#!/bin/bash
+
+if [[ -f ./shouldNotExist.pid ]]
+then
+    echo $(date --iso-8601) - ServerMock seems to be already running
+    echo If it is not running remove shouldNotExist.pid
+    exit 1
+fi
+
+echo $(date --iso-8601) - Starting ServerMock
+
+#{{ target_dir }}/triplestores/virtuoso/{{ virtuoso_version }}/virtuoso-opensource/bin/virtuoso-t -c {{ target_dir }}/triplestores/virtuoso/virtuoso-run-{{ item[1].name }}-{{ item[2].number }}.ini
+#simulating waiting for another script, normally we should start netcat or similar here, but as it's not available for anyone this should do the trick.
+./src/test/resources/wait5.sh
+
+
+echo $(date --iso-8601) - Waiting for ServerMock to become available
+
+while :
+do
+    curl -s 127.0.0.1:8023
+    if [ $? -eq 0 ]
+    then
+        break
+    fi
+    sleep 2
+done
+
+echo $(date --iso-8601) - ServerMock started and accepting connections
+
 exit 0
\ No newline at end of file
diff --git a/src/test/resources/config/post.sh b/src/test/resources/config/post.sh
index bdb9bbbed..68c9e5197 100644
--- a/src/test/resources/config/post.sh
+++ b/src/test/resources/config/post.sh
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/bash
 echo "$1 $2 $3" >> post-shouldNotExist.txt
\ No newline at end of file
diff --git a/src/test/resources/config/pre.sh b/src/test/resources/config/pre.sh
index 42676d055..9fbc533a1 100644
--- a/src/test/resources/config/pre.sh
+++ b/src/test/resources/config/pre.sh
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/bash
 echo "$1 $2 $3" >> pre-shouldNotExist.txt
\ No newline at end of file
diff --git a/src/test/resources/wait5.sh b/src/test/resources/wait5.sh
index 922b1ffa7..e2b8cf8c3 100644
--- a/src/test/resources/wait5.sh
+++ b/src/test/resources/wait5.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
-
+#!/bin/bash
+
 sleep 5
\ No newline at end of file

From 2ae9091ccc3c7e1ab0cd16fd331fb723547addaa Mon Sep 17 00:00:00 2001
From: Nick Molcanov <32801560+nck-mlcnv@users.noreply.github.com>
Date: Wed, 28 Jun 2023 16:09:59 +0200
Subject: [PATCH 4/4] change file permissions (again)

---
 src/test/resources/cli/echoinput.sh                   | 0
 src/test/resources/complex-script-example-issue108.sh | 0
 src/test/resources/config/post.sh                     | 0
 src/test/resources/config/pre.sh                      | 0
 src/test/resources/test-DatasetName.sh                | 0
 src/test/resources/wait5.sh                           | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 src/test/resources/cli/echoinput.sh
 mode change 100644 => 100755 src/test/resources/complex-script-example-issue108.sh
 mode change 100644 => 100755 src/test/resources/config/post.sh
 mode change 100644 => 100755 src/test/resources/config/pre.sh
 mode change 100644 => 100755 src/test/resources/test-DatasetName.sh
 mode change 100644 => 100755 src/test/resources/wait5.sh

diff --git a/src/test/resources/cli/echoinput.sh b/src/test/resources/cli/echoinput.sh
old mode 100644
new mode 100755
diff --git a/src/test/resources/complex-script-example-issue108.sh b/src/test/resources/complex-script-example-issue108.sh
old mode 100644
new mode 100755
diff --git a/src/test/resources/config/post.sh b/src/test/resources/config/post.sh
old mode 100644
new mode 100755
diff --git a/src/test/resources/config/pre.sh b/src/test/resources/config/pre.sh
old mode 100644
new mode 100755
diff --git a/src/test/resources/test-DatasetName.sh b/src/test/resources/test-DatasetName.sh
old mode 100644
new mode 100755
diff --git a/src/test/resources/wait5.sh b/src/test/resources/wait5.sh
old mode 100644
new mode 100755