From 2e41ca2dc15708f0a9f0c500530eaddeb8d67207 Mon Sep 17 00:00:00 2001
From: Rafael Chaves <rafael@abstratt.com>
Date: Thu, 14 Oct 2021 19:07:38 -0300
Subject: [PATCH] back from the dead

---
 .github/workflows/maven.yml                   | 31 +++++++
 .github/workflows/release.yml                 | 20 +++++
 README.md                                     |  3 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 codegen/com.abstratt.mdd.target.core/pom.xml  |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 codegen/com.abstratt.mdd.target.doc/pom.xml   |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 codegen/com.abstratt.mdd.target.jee/pom.xml   |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 codegen/com.abstratt.mdd.target.jse/pom.xml   |  2 +-
 codegen/pom.xml                               |  5 +-
 deploy.settings.xml                           | 10 ---
 docker-compose.yaml                           | 16 ++++
 kirra-dependencies/kirra-dependencies.target  | 84 +++++++++----------
 .../kirra-ide-dependencies.target             | 68 +++++++--------
 kirra-dependencies/pom.xml                    |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 kirra-mdd/com.abstratt.kirra.mdd.core/pom.xml |  4 +-
 .../feature.xml                               |  2 +-
 .../com.abstratt.kirra.mdd.feature/pom.xml    |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../com.abstratt.kirra.mdd.schema/pom.xml     |  4 +-
 kirra-mdd/pom.xml                             |  4 +-
 pom.xml                                       | 27 +++---
 .../com.abstratt.kirra.mdd.repository/pom.xml |  4 +-
 .../kirra.product                             | 15 +---
 .../com.abstratt.kirra.server.product/pom.xml |  4 +-
 releng/pom.xml                                |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 runtime/com.abstratt.blobstore/pom.xml        |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../com.abstratt.kirra.mdd.runtime/pom.xml    |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../pom.xml                                   |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 runtime/com.abstratt.mdd.runtime.core/pom.xml |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../com.abstratt.nodestore.inmemory/pom.xml   |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 runtime/com.abstratt.nodestore.jdbc/pom.xml   |  4 +-
 .../nodestore/jdbc/ConnectionProvider.java    |  4 +
 .../META-INF/MANIFEST.MF                      |  2 +-
 runtime/com.abstratt.nodestore/pom.xml        |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 runtime/com.abstratt.simpleblobstore/pom.xml  |  4 +-
 runtime/pom.xml                               |  7 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 server/com.abstratt.kirra.auth/pom.xml        |  2 +-
 .../META-INF/MANIFEST.MF                      |  8 +-
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  9 +-
 .../pom.xml                                   |  2 +-
 .../mdd/rest/impl/v2/KirraRESTServlet.java    |  1 +
 .../META-INF/MANIFEST.MF                      | 11 +--
 server/com.abstratt.kirra.mdd.rest/pom.xml    |  2 +-
 .../mdd/rest/KirraAuthenticationContext.java  |  2 +-
 .../kirra/mdd/rest/KirraCORSFilter.java       |  2 +-
 .../mdd/rest/KirraCookieAuthenticator.java    |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 server/com.abstratt.kirra.server/pom.xml      |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../com.abstratt.mdd.frontend.orion/pom.xml   |  2 +-
 .../META-INF/MANIFEST.MF                      | 11 ++-
 server/com.abstratt.mdd.frontend.web/pom.xml  |  2 +-
 server/pom.xml                                |  7 +-
 .../.gitignore                                |  0
 .../JAXRSAccessControlGeneratorTests.launch   |  0
 .../KirraMDDRuntimeRestTests (1).launch       |  0
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../build.properties                          |  0
 .../pom.xml                                   |  4 +-
 .../runtime/AbstractKirraMDDRuntimeTests.java |  0
 .../mdd/runtime/AbstractKirraRestTests.java   |  0
 .../mdd/runtime/AbstractKirraRestV1Tests.java |  0
 .../kirra/tests/mdd/runtime/Activator.java    |  0
 .../mdd/runtime/AllKirraAutomatedTests.java   |  0
 .../mdd/runtime/AllKirraMDDRuntimeTests.java  |  0
 .../mdd/runtime/KirraDataPopulatorTests.java  |  0
 .../runtime/KirraMDDRuntimeActionTests.java   |  0
 .../runtime/KirraMDDRuntimeActorTests.xtend   |  0
 .../mdd/runtime/KirraMDDRuntimeDataTests.java |  0
 .../KirraMDDRuntimeExternalServiceTests.java  |  0
 .../mdd/runtime/KirraMDDRuntimeFlexTests.java |  0
 .../KirraMDDRuntimeRelationshipTests.java     |  0
 .../runtime/KirraMDDRuntimeResourceTests.java |  0
 .../runtime/KirraMDDRuntimeRest2Tests.java    |  0
 .../mdd/runtime/KirraMDDRuntimeRestTests.java |  0
 .../runtime/KirraMDDRuntimeSchemaTests.java   |  0
 .../KirraMDDRuntimeValidationTests.java       |  0
 .../tests/mdd/runtime/KirraUIHelperTests.java |  0
 .../mdd/runtime/RepositoryServiceTests.java   |  0
 .../tests/mdd/runtime/TupleParserTests.java   |  0
 .../performance/AllKirraPerformanceTests.java |  0
 .../performance/InstancePerformanceTests.java |  0
 .../.gitignore                                |  0
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../build.properties                          |  0
 .../pom.xml                                   |  6 +-
 .../tests/runtime/AbstractRuntimeTests.java   |  0
 .../core/tests/runtime/AllRuntimeTests.xtend  |  0
 .../core/tests/runtime/ConsoleCapture.java    |  0
 .../mdd/core/tests/runtime/ConsoleTests.java  |  0
 .../core/tests/runtime/ExpressionTests.java   |  0
 .../tests/runtime/OldRuntimeControlTests.java |  0
 .../runtime/PersistenceServiceTests.java      |  0
 .../tests/runtime/PrimitiveActionTests.java   |  0
 .../runtime/RuntimeAssociationTests.java      |  0
 .../tests/runtime/RuntimeCollectionTests.java |  0
 .../tests/runtime/RuntimeControlTests.java    |  0
 .../runtime/RuntimeDateAndTimeTests.java      |  0
 .../runtime/RuntimeEnumerationTests.java      |  0
 .../tests/runtime/RuntimeExternalTests.java   |  0
 .../tests/runtime/RuntimeObjectTests.java     |  0
 .../core/tests/runtime/RuntimePortTests.java  |  0
 .../tests/runtime/RuntimeReceptionTests.java  |  0
 .../runtime/RuntimeStateMachineTests.java     |  0
 .../tests/runtime/RuntimeStringTests.java     |  0
 .../core/tests/runtime/RuntimeTupleTests.java |  0
 .../core/tests/runtime/RuntimeUserTests.xtend |  0
 .../mdd/core/tests/runtime/SSMTests.java      |  0
 .../.gitignore                                |  0
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../build.properties                          |  0
 .../pom.xml                                   |  4 +-
 .../web/tests/AbstractWebFrontEndTest.java    |  0
 .../mdd/frontend/web/tests/Activator.java     |  0
 .../web/tests/AllWebFrontEndTests.java        |  0
 .../mdd/frontend/web/tests/BuilderTests.java  |  0
 .../mdd/frontend/web/tests/DeployerTests.java |  0
 .../frontend/web/tests/GeneratorTests.java    |  0
 .../frontend/web/tests/PublisherTests.java    |  0
 .../mdd/frontend/web/tests/RestHelper.java    |  0
 .../mdd/frontend/web/tests/StatusTests.java   |  0
 .../frontend/web/tests/ValidatorTests.java    |  0
 .../com.abstratt.mdd.target.tests}/.gitignore |  0
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../build.properties                          |  0
 .../com.abstratt.mdd.target.tests/pom.xml     |  4 +-
 .../src/.gitignore                            |  0
 .../mdd/importer/tests/jdbc/AllTests.java     |  0
 .../tests/jdbc/JDBCImporterNamingTests.xtend  |  0
 .../tests/jdbc/JDBCImporterTests.xtend        |  0
 .../tests/jdbc/schemacrawler.data.xml         |  0
 .../target/tests/AbstractGeneratorTest.xtend  |  0
 .../mdd/target/tests/AllTargetTests.java      |  0
 .../abstratt/mdd/target/tests/AllTests.java   |  0
 .../mdd/target/tests/BasicTargetTests.java    |  0
 .../mdd/target/tests/CustomPlatformTests.java |  0
 .../tests/GStringLanguageMapperTests.java     |  0
 .../tests/TargetPlatformTestingTests.java     |  0
 .../mdd/target/tests/jee/AllJEETests.xtend    |  0
 .../CriteriaQueryActionGeneratorTests.xtend   |  0
 .../tests/jee/DataFlowAnalyzerTests.xtend     |  0
 .../JAXRSAccessControlGeneratorTests.xtend    |  0
 ...riteriaServiceBehaviorGeneratorTests.xtend |  0
 .../JPAEntityBehaviorGenerationTests.xtend    |  0
 .../tests/jee/JPAEntityGeneratorTests.xtend   |  0
 .../tests/jee/JPAServiceGeneratorTests.xtend  |  0
 .../jee/JPQLQueryActionGeneratorTests.xtend   |  0
 .../mdd/target/tests/jse/AllJSETests.xtend    |  0
 .../PlainEntityBehaviorGenerationTests.xtend  |  0
 .../jse/PlainEntityGenerationTests.xtend      |  0
 .../mdd/target/tests/mean/AllMeanTests.xtend  |  0
 .../target/tests/mean/JSGeneratorTests.xtend  |  0
 .../tests/mean/ModelGeneratorTests.xtend      |  0
 .../mdd/target/tests/mean/PipelineTests.xtend |  0
 .../tests/mean/QueryPipelineTests.xtend       |  0
 .../com.abstratt.nodestore.tests}/.gitignore  |  0
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../build.properties                          |  0
 .../com.abstratt.nodestore.tests/pom.xml      | 11 ++-
 .../tests/AbstractNodeStoreTests.java         |  0
 .../nodestore/tests/AllNodeStoreTests.java    |  0
 .../tests/InMemoryNodeStoreTests.java         |  0
 .../nodestore/tests/JdbcNodeStoreTests.java   |  0
 .../nodestore/tests/SQLGeneratorTests.java    |  0
 tests/pom.xml                                 | 21 +++++
 180 files changed, 281 insertions(+), 248 deletions(-)
 create mode 100644 .github/workflows/maven.yml
 create mode 100644 .github/workflows/release.yml
 delete mode 100644 deploy.settings.xml
 create mode 100644 docker-compose.yaml
 rename {codegen/com.abstratt.mdd.target.tests => tests/com.abstratt.kirra.tests.mdd.runtime}/.gitignore (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/JAXRSAccessControlGeneratorTests.launch (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/KirraMDDRuntimeRestTests (1).launch (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/META-INF/MANIFEST.MF (98%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/build.properties (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/pom.xml (95%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraMDDRuntimeTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraRestTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraRestV1Tests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/Activator.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AllKirraAutomatedTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AllKirraMDDRuntimeTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraDataPopulatorTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeActionTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeActorTests.xtend (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeDataTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeExternalServiceTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeFlexTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRelationshipTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeResourceTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRest2Tests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRestTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeSchemaTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeValidationTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraUIHelperTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/RepositoryServiceTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/TupleParserTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/performance/AllKirraPerformanceTests.java (100%)
 rename {runtime => tests}/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/performance/InstancePerformanceTests.java (100%)
 rename {runtime/com.abstratt.kirra.tests.mdd.runtime => tests/com.abstratt.mdd.core.tests.runtime}/.gitignore (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/META-INF/MANIFEST.MF (93%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/build.properties (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/pom.xml (92%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AbstractRuntimeTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AllRuntimeTests.xtend (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ConsoleCapture.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ConsoleTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ExpressionTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/OldRuntimeControlTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/PersistenceServiceTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/PrimitiveActionTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeAssociationTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeCollectionTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeControlTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeDateAndTimeTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeEnumerationTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeExternalTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeObjectTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimePortTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeReceptionTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeStateMachineTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeStringTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeTupleTests.java (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeUserTests.xtend (100%)
 rename {runtime => tests}/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/SSMTests.java (100%)
 rename {runtime/com.abstratt.mdd.core.tests.runtime => tests/com.abstratt.mdd.frontend.web.tests}/.gitignore (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/META-INF/MANIFEST.MF (96%)
 rename {runtime/com.abstratt.nodestore.tests => tests/com.abstratt.mdd.frontend.web.tests}/build.properties (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/pom.xml (94%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/AbstractWebFrontEndTest.java (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/Activator.java (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/AllWebFrontEndTests.java (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/BuilderTests.java (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/DeployerTests.java (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/GeneratorTests.java (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/PublisherTests.java (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/RestHelper.java (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/StatusTests.java (100%)
 rename {server => tests}/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/ValidatorTests.java (100%)
 rename {runtime/com.abstratt.nodestore.tests => tests/com.abstratt.mdd.target.tests}/.gitignore (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/META-INF/MANIFEST.MF (96%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/build.properties (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/pom.xml (94%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/.gitignore (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/AllTests.java (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/JDBCImporterNamingTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/JDBCImporterTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/schemacrawler.data.xml (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AbstractGeneratorTest.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AllTargetTests.java (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AllTests.java (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/BasicTargetTests.java (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/CustomPlatformTests.java (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/GStringLanguageMapperTests.java (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/TargetPlatformTestingTests.java (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/AllJEETests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/CriteriaQueryActionGeneratorTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/DataFlowAnalyzerTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JAXRSAccessControlGeneratorTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPACriteriaServiceBehaviorGeneratorTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAEntityBehaviorGenerationTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAEntityGeneratorTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAServiceGeneratorTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPQLQueryActionGeneratorTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/AllJSETests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/PlainEntityBehaviorGenerationTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/PlainEntityGenerationTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/AllMeanTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/JSGeneratorTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/ModelGeneratorTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/PipelineTests.xtend (100%)
 rename {codegen => tests}/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/QueryPipelineTests.xtend (100%)
 rename {server/com.abstratt.mdd.frontend.web.tests => tests/com.abstratt.nodestore.tests}/.gitignore (100%)
 rename {runtime => tests}/com.abstratt.nodestore.tests/META-INF/MANIFEST.MF (94%)
 rename {server/com.abstratt.mdd.frontend.web.tests => tests/com.abstratt.nodestore.tests}/build.properties (100%)
 rename {runtime => tests}/com.abstratt.nodestore.tests/pom.xml (69%)
 rename {runtime => tests}/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/AbstractNodeStoreTests.java (100%)
 rename {runtime => tests}/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/AllNodeStoreTests.java (100%)
 rename {runtime => tests}/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/InMemoryNodeStoreTests.java (100%)
 rename {runtime => tests}/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/JdbcNodeStoreTests.java (100%)
 rename {runtime => tests}/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/SQLGeneratorTests.java (100%)
 create mode 100644 tests/pom.xml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 00000000..7f956e89
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,31 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Start pre-reqs
+      run: docker-compose up -d        
+    - name: Build with Maven
+      run: |
+        
+        echo "<settings><servers><server><id>github</id><username>abstratt</username><password>${GITHUB_TOKEN}</password></server></servers></settings>" > tmp-deploy-settings.xml        
+        mvn -X -B package --settings tmp-deploy-settings.xml
+      env:
+        GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}        
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..47c61bdf
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,20 @@
+name: Publish package to GitHub Packages
+on:
+  release:
+    types: [created]
+jobs:
+  publish:
+    runs-on: ubuntu-latest 
+    permissions: 
+      contents: read
+      packages: write 
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      - name: Publish package
+        run: mvn --batch-mode deploy -DskipTests
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/README.md b/README.md
index 8ae6cb28..d2c6edff 100644
--- a/README.md
+++ b/README.md
@@ -96,8 +96,7 @@ TBD
 
 ###  Continuous builds
 
-Continuous builds run on [TravisCI](https://travis-ci.org/abstratt/cloudfier?branch=master). Artifact repository is
-available at [Bintray](https://dl.bintray.com/abstratt-oss/abstratt-oss/).
+Continuous builds run as GitHub actions.
 
 ### Developing Cloudfier in the IDE
 
diff --git a/codegen/com.abstratt.kirra.mdd.target.base/META-INF/MANIFEST.MF b/codegen/com.abstratt.kirra.mdd.target.base/META-INF/MANIFEST.MF
index d2a78c01..34bd6d8e 100644
--- a/codegen/com.abstratt.kirra.mdd.target.base/META-INF/MANIFEST.MF
+++ b/codegen/com.abstratt.kirra.mdd.target.base/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Abstratt Technologies
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-SymbolicName: com.abstratt.kirra.mdd.target.base;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.abstratt.mdd.target.core,
diff --git a/codegen/com.abstratt.kirra.mdd.target.base/pom.xml b/codegen/com.abstratt.kirra.mdd.target.base/pom.xml
index 0cb0fba8..6c4d29f9 100755
--- a/codegen/com.abstratt.kirra.mdd.target.base/pom.xml
+++ b/codegen/com.abstratt.kirra.mdd.target.base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>codegen</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	
diff --git a/codegen/com.abstratt.mdd.target.core/META-INF/MANIFEST.MF b/codegen/com.abstratt.mdd.target.core/META-INF/MANIFEST.MF
index 6de635a0..fcc35aef 100755
--- a/codegen/com.abstratt.mdd.target.core/META-INF/MANIFEST.MF
+++ b/codegen/com.abstratt.mdd.target.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MDD Target Core
 Bundle-SymbolicName: com.abstratt.mdd.target.core;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: Abstratt Technologies
 Require-Bundle: 
  com.abstratt.mdd.core;visibility:=reexport,
diff --git a/codegen/com.abstratt.mdd.target.core/pom.xml b/codegen/com.abstratt.mdd.target.core/pom.xml
index 9a82486c..e4b9c1ae 100755
--- a/codegen/com.abstratt.mdd.target.core/pom.xml
+++ b/codegen/com.abstratt.mdd.target.core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>codegen</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/codegen/com.abstratt.mdd.target.doc/META-INF/MANIFEST.MF b/codegen/com.abstratt.mdd.target.doc/META-INF/MANIFEST.MF
index 2b9948bd..c2fec3e0 100644
--- a/codegen/com.abstratt.mdd.target.doc/META-INF/MANIFEST.MF
+++ b/codegen/com.abstratt.mdd.target.doc/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Abstratt Technologies
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-SymbolicName: com.abstratt.mdd.target.doc;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.abstratt.mdd.target.core,
diff --git a/codegen/com.abstratt.mdd.target.doc/pom.xml b/codegen/com.abstratt.mdd.target.doc/pom.xml
index 43c0fd62..e271096f 100755
--- a/codegen/com.abstratt.mdd.target.doc/pom.xml
+++ b/codegen/com.abstratt.mdd.target.doc/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>codegen</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	
diff --git a/codegen/com.abstratt.mdd.target.jee/META-INF/MANIFEST.MF b/codegen/com.abstratt.mdd.target.jee/META-INF/MANIFEST.MF
index 847fd8d9..0d68893a 100644
--- a/codegen/com.abstratt.mdd.target.jee/META-INF/MANIFEST.MF
+++ b/codegen/com.abstratt.mdd.target.jee/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Abstratt Technologies
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-SymbolicName: com.abstratt.mdd.target.jee;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.abstratt.mdd.target.core,
diff --git a/codegen/com.abstratt.mdd.target.jee/pom.xml b/codegen/com.abstratt.mdd.target.jee/pom.xml
index efe818b6..7ab1c64b 100755
--- a/codegen/com.abstratt.mdd.target.jee/pom.xml
+++ b/codegen/com.abstratt.mdd.target.jee/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>codegen</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	
diff --git a/codegen/com.abstratt.mdd.target.jse/META-INF/MANIFEST.MF b/codegen/com.abstratt.mdd.target.jse/META-INF/MANIFEST.MF
index f540dc95..77024a22 100644
--- a/codegen/com.abstratt.mdd.target.jse/META-INF/MANIFEST.MF
+++ b/codegen/com.abstratt.mdd.target.jse/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Abstratt Technologies
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-SymbolicName: com.abstratt.mdd.target.jse;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.abstratt.mdd.target.core,
diff --git a/codegen/com.abstratt.mdd.target.jse/pom.xml b/codegen/com.abstratt.mdd.target.jse/pom.xml
index d0025b37..d8b3520b 100755
--- a/codegen/com.abstratt.mdd.target.jse/pom.xml
+++ b/codegen/com.abstratt.mdd.target.jse/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>codegen</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	
diff --git a/codegen/pom.xml b/codegen/pom.xml
index a00129cd..421ce7d9 100755
--- a/codegen/pom.xml
+++ b/codegen/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.abstratt.mdd.kirra</groupId>
 	<artifactId>codegen</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<artifactId>plugins</artifactId>
     	<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 	</parent>
 	
 	<modules>
@@ -17,7 +17,6 @@
         <module>com.abstratt.mdd.target.doc</module>
         <module>com.abstratt.mdd.target.jee</module>          
         <module>com.abstratt.mdd.target.jse</module>                
-		<module>com.abstratt.mdd.target.tests</module>
 	</modules>
 </project>
 
diff --git a/deploy.settings.xml b/deploy.settings.xml
deleted file mode 100644
index 41563a19..00000000
--- a/deploy.settings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-    <servers>
-	<server>
-	  <id>bintray-abstratt-oss-abstratt-oss</id>
-	  <username>${env.BINTRAY_USERNAME}</username>
-	  <password>${env.BINTRAY_KEY}</password>
-	</server>
-    </servers>
-</settings>
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 00000000..c8682089
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,16 @@
+version: '3.7'
+services:
+    postgres:
+        image: postgres:10.5
+        restart: always
+        environment:
+          - POSTGRES_USER=cloudfier
+          - POSTGRES_PASSWORD=cloudfier
+        logging:
+          options:
+            max-size: 10m
+            max-file: "3"
+        ports:
+          - '15432:5432'
+        volumes: 
+          - ./postgres-data:/var/lib/postgresql/data
diff --git a/kirra-dependencies/kirra-dependencies.target b/kirra-dependencies/kirra-dependencies.target
index 736e703b..efba4eb5 100755
--- a/kirra-dependencies/kirra-dependencies.target
+++ b/kirra-dependencies/kirra-dependencies.target
@@ -10,15 +10,9 @@
             <unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0" />
             <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0" />
             <!-- Specific release to avoid Eclipse bug 430375 -->
-            <repository location="http://download.eclipse.org/releases/mars/201602261000/" />
+			<repository location="http://download.eclipse.org/releases/2021-09/202108271000" />
         </location>
-        <location includeAllPlatforms="false" includeMode="planner"
-            includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0" />
-            <unit id="org.eclipse.xtend.lib" version="0.0.0" />
-            <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.11.0/" />
-        </location>
-        
+
         <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.apache.commons.lang" version="0.0.0" />
             <unit id="org.apache.commons.lang3" version="0.0.0" />
@@ -28,33 +22,21 @@
             <unit id="org.apache.commons.collections" version="0.0.0" />
             <unit id="org.apache.commons.httpclient" version="0.0.0" />
 			<unit id="org.slf4j.api" version="0.0.0" />
-			<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/" />
-        </location>
-        <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.restlet" version="0.0.0" />
-            <unit id="org.restlet.ext.servlet" version="0.0.0" />
-            <unit id="org.restlet.ext.xml" version="0.0.0" />
-            <unit id="org.restlet.ext.fileupload" version="0.0.0" />
-            <unit id="org.restlet.ext.crypto" version="0.0.0" />
-            <unit id="org.restlet.ext.jaxrs" version="0.0.0" />
-            <unit id="org.restlet.ext.jackson" version="0.0.0" />
-            <!-- piggybacking on Restlet's repo while we can for these. -->
-            <unit id="javax.ws.rs.jsr311-api" version="0.0.0" />
             <unit id="com.google.gson" version="0.0.0" />
+            <unit id="com.google.guava" version="0.0.0" />
             <unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0" />
             <unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0" />
             <unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0" />
-<!--
-            <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-smile"  version="0.0.0"/>
-            <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml"  version="0.0.0"/>
-            <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml"  version="0.0.0"/>
-            <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv"  version="0.0.0"/>
-            <unit id="org.yaml.snakeyaml" version="0.0.0"/>
-			<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0"/>
-			<unit id="stax2-api" version="0.0.0"/>
--->			
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/dependencies/com.abstratt.restlet.repository/1.0.0/com.abstratt.restlet.repository-1.0.0.zip!/" />
+            <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository" />
         </location>
+
+        <location includeAllPlatforms="false" includeMode="planner"
+            includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0" />
+            <unit id="org.eclipse.xtend.lib" version="0.0.0" />
+            <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/" />
+        </location>
+        
         <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.jetty.client" version="0.0.0" />
             <unit id="org.eclipse.jetty.continuation" version="0.0.0" />
@@ -68,33 +50,43 @@
             <unit id="org.eclipse.jetty.security" version="0.0.0" />
             <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/8.1.14.v20131031" />
         </location>
-        <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.codehaus.groovy23.feature.feature.group" version="0.0.0" />
-            <repository location="http://dist.springsource.com/release/TOOLS/update/3.6.1.RELEASE/e4.4/" />
-        </location>
-        <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.abstratt.eclipsegraphviz.feature.feature.group" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/eclipsegraphviz/com.abstratt.eclipsegraphviz.repository/2.9.0/com.abstratt.eclipsegraphviz.repository-2.9.0.zip!/" />
-        </location>
+
+		<location includeAllPlatforms="false" includeMode="planner"
+			includeSource="true" type="InstallableUnit">
+			<unit id="com.abstratt.eclipsegraphviz.feature.feature.group" version="0.0.0" />		
+			<repository location="mvn:com.abstratt.eclipsegraphviz:com.abstratt.eclipsegraphviz.repository:2.13.0:zip" />
+		</location>
+		
+        <location includeAllPlatforms="false" includeMode="planner"
+			includeSource="true" type="InstallableUnit">
+			<unit id="com.abstratt.wrapped.postgresql" version="0.0.0" />
+			<unit id="com.abstratt.wrapped.schemacrawler"
+				version="0.0.0" />
+			<unit id="com.abstratt.wrapped.restlet"
+				version="0.0.0" />                
+			<repository 
+				location="mvn:com.abstratt.wrapped:com.abstratt.wrapped.repository:5.0.0:zip" />
+		</location>
+		
         <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.abstratt.mdd.frontend.core.feature.feature.group" version="0.0.0" />
             <unit id="com.abstratt.mdd.frontend.ui.feature.feature.group" version="0.0.0" />
             <unit id="com.abstratt.mdd.frontend.ui.diagram.feature.feature.group" version="0.0.0" />
             <unit id="com.abstratt.mdd.importer.jdbc.feature.feature.group" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/mdd/com.abstratt.mdd.oss.repository/2.10.0/com.abstratt.mdd.oss.repository-2.10.0.zip!/" />
+			<repository 
+							location="mvn:com.abstratt.mdd:com.abstratt.mdd.oss.repository:2.13.0:zip" />
         </location>
         <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.abstratt.mdd.tests.feature.source.feature.group" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/mdd/com.abstratt.mdd.source.repository/2.10.0/com.abstratt.mdd.source.repository-2.10.0.zip!/" />
+			<repository 
+							location="mvn:com.abstratt.mdd:com.abstratt.mdd.source.repository:2.13.0:zip" />
         </location>
         <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="com.abstratt.kirra.feature.source.feature.group" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/kirra/com.abstratt.kirra.repository/2.10.0/com.abstratt.kirra.repository-2.10.0.zip!/" />
-        </location>
-        <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.abstratt.wrapped.postgresql" version="0.0.0" />
-            <unit id="com.abstratt.wrapped.schemacrawler" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/wrapped/com.abstratt.wrapped.repository/3.3/com.abstratt.wrapped.repository-3.3.zip!/" />
+			<repository 
+							location="mvn:com.abstratt.kirra:com.abstratt.kirra.repository:2.11.0:zip" />
         </location>
+
+		
     </locations>
 </target>
diff --git a/kirra-dependencies/kirra-ide-dependencies.target b/kirra-dependencies/kirra-ide-dependencies.target
index fd9d6c78..a0533133 100755
--- a/kirra-dependencies/kirra-ide-dependencies.target
+++ b/kirra-dependencies/kirra-ide-dependencies.target
@@ -8,13 +8,10 @@
 <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
 <unit id="org.junit" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/mars/201602261000/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtend.lib" version="0.0.0"/>
-<unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.11.0/"/>
+<!-- Specific release to avoid Eclipse bug 430375 -->
+<repository location="http://download.eclipse.org/releases/2021-09/202108271000" />
 </location>
+
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="javax.ws.rs" version="0.0.0"/>
 <unit id="org.apache.commons.beanutils" version="0.0.0"/>
@@ -24,34 +21,23 @@
 <unit id="org.apache.commons.io" version="0.0.0"/>
 <unit id="org.apache.commons.lang" version="0.0.0"/>
 <unit id="org.apache.commons.lang3" version="0.0.0"/>
-<unit id="org.slf4j.api" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/"/>
+			<unit id="org.slf4j.api" version="0.0.0" />
+            <unit id="com.google.gson" version="0.0.0" />
+			<unit id="com.google.guava" version="0.0.0" />
+			
+            <unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0" />
+            <unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0" />
+            <unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0" />
+            <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository" />
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
-<!--
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-smile" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0"/>
-<unit id="org.yaml.snakeyaml" version="0.0.0"/>
-<unit id="stax2-api" version="0.0.0"/>
--->
-<unit id="com.google.gson" version="0.0.0"/>
-<unit id="javax.ws.rs.jsr311-api" version="0.0.0"/>
-<unit id="org.restlet" version="0.0.0"/>
-<unit id="org.restlet.ext.crypto" version="0.0.0"/>
-<unit id="org.restlet.ext.fileupload" version="0.0.0"/>
-<unit id="org.restlet.ext.jackson" version="0.0.0"/>
-<unit id="org.restlet.ext.jaxrs" version="0.0.0"/>
-<unit id="org.restlet.ext.servlet" version="0.0.0"/>
-<unit id="org.restlet.ext.xml" version="0.0.0"/>
-<repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/dependencies/com.abstratt.restlet.repository/1.0.0/com.abstratt.restlet.repository-1.0.0.zip!/" />
 
+
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtend.lib" version="0.0.0"/>
+<unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0/" />
 </location>
+
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.jetty.client" version="0.0.0"/>
 <unit id="org.eclipse.jetty.continuation" version="0.0.0"/>
@@ -65,14 +51,16 @@
 <unit id="org.eclipse.jetty.util" version="0.0.0"/>
 <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x/8.1.14.v20131031"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.codehaus.groovy23.feature.feature.group" version="0.0.0"/>
-<repository location="http://dist.springsource.com/release/TOOLS/update/3.6.1.RELEASE/e4.4/"/>
-</location>
-        <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.abstratt.wrapped.postgresql" version="0.0.0" />
-            <unit id="com.abstratt.wrapped.schemacrawler" version="0.0.0" />
-            <repository location="jar:https://dl.bintray.com/abstratt-oss/abstratt-oss/com/abstratt/wrapped/com.abstratt.wrapped.repository/3.3/com.abstratt.wrapped.repository-3.3.zip!/" />
-        </location>
+		
+        <location includeAllPlatforms="false" includeMode="planner"
+			includeSource="true" type="InstallableUnit">
+			<unit id="com.abstratt.wrapped.postgresql" version="0.0.0" />
+			<unit id="com.abstratt.wrapped.schemacrawler"
+				version="0.0.0" />
+			<unit id="com.abstratt.wrapped.restlet"
+				version="0.0.0" />
+			<repository 
+				location="mvn:com.abstratt.wrapped:com.abstratt.wrapped.repository:5.0.0:zip" />
+		</location>
 </locations>
 </target>
diff --git a/kirra-dependencies/pom.xml b/kirra-dependencies/pom.xml
index a53d97b3..39624cb3 100755
--- a/kirra-dependencies/pom.xml
+++ b/kirra-dependencies/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
         	<groupId>com.abstratt.mdd.kirra</groupId>
 	        <artifactId>plugins</artifactId>
-	        <version>2.12.6-SNAPSHOT</version>
+	        <version>2.13.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
diff --git a/kirra-mdd/com.abstratt.kirra.mdd.core/META-INF/MANIFEST.MF b/kirra-mdd/com.abstratt.kirra.mdd.core/META-INF/MANIFEST.MF
index 521d25e4..0557092e 100755
--- a/kirra-mdd/com.abstratt.kirra.mdd.core/META-INF/MANIFEST.MF
+++ b/kirra-mdd/com.abstratt.kirra.mdd.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Kirra MDD Core
 Bundle-SymbolicName: com.abstratt.kirra.mdd.core;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: Abstratt Technologies
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.abstratt.mdd.core
diff --git a/kirra-mdd/com.abstratt.kirra.mdd.core/pom.xml b/kirra-mdd/com.abstratt.kirra.mdd.core/pom.xml
index 2775f881..084857c0 100755
--- a/kirra-mdd/com.abstratt.kirra.mdd.core/pom.xml
+++ b/kirra-mdd/com.abstratt.kirra.mdd.core/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.abstratt.mdd.kirra</groupId>
   <artifactId>com.abstratt.kirra.mdd.core</artifactId>
-  <version>2.12.6-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 	<parent>
         <artifactId>kirra-mdd</artifactId>
         <groupId>com.abstratt.mdd.kirra</groupId>
-        <version>2.12.6-SNAPSHOT</version>
+        <version>2.13.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/kirra-mdd/com.abstratt.kirra.mdd.feature/feature.xml b/kirra-mdd/com.abstratt.kirra.mdd.feature/feature.xml
index 49213337..c2029c77 100755
--- a/kirra-mdd/com.abstratt.kirra.mdd.feature/feature.xml
+++ b/kirra-mdd/com.abstratt.kirra.mdd.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.abstratt.kirra.mdd.feature"
       label="%featureName"
-      version="2.12.6.qualifier"
+      version="2.13.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/kirra-mdd/com.abstratt.kirra.mdd.feature/pom.xml b/kirra-mdd/com.abstratt.kirra.mdd.feature/pom.xml
index 854f2658..a2f55a6f 100755
--- a/kirra-mdd/com.abstratt.kirra.mdd.feature/pom.xml
+++ b/kirra-mdd/com.abstratt.kirra.mdd.feature/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.abstratt.mdd.kirra</groupId>
   <artifactId>com.abstratt.kirra.mdd.feature</artifactId>
-  <version>2.12.6-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 	<parent>
 		<artifactId>kirra-mdd</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 <build>
diff --git a/kirra-mdd/com.abstratt.kirra.mdd.schema/META-INF/MANIFEST.MF b/kirra-mdd/com.abstratt.kirra.mdd.schema/META-INF/MANIFEST.MF
index 0e740400..4a934585 100755
--- a/kirra-mdd/com.abstratt.kirra.mdd.schema/META-INF/MANIFEST.MF
+++ b/kirra-mdd/com.abstratt.kirra.mdd.schema/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Kirra MDD Core
 Bundle-SymbolicName: com.abstratt.kirra.mdd.schema;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: Abstratt Technologies
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: 
diff --git a/kirra-mdd/com.abstratt.kirra.mdd.schema/pom.xml b/kirra-mdd/com.abstratt.kirra.mdd.schema/pom.xml
index f478a7cf..d01a48af 100755
--- a/kirra-mdd/com.abstratt.kirra.mdd.schema/pom.xml
+++ b/kirra-mdd/com.abstratt.kirra.mdd.schema/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.abstratt.mdd.kirra</groupId>
   <artifactId>com.abstratt.kirra.mdd.schema</artifactId>
-  <version>2.12.6-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 	<parent>
         <artifactId>kirra-mdd</artifactId>
         <groupId>com.abstratt.mdd.kirra</groupId>
-        <version>2.12.6-SNAPSHOT</version>
+        <version>2.13.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/kirra-mdd/pom.xml b/kirra-mdd/pom.xml
index bbcddd32..350828f8 100755
--- a/kirra-mdd/pom.xml
+++ b/kirra-mdd/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.abstratt.mdd.kirra</groupId>
 	<artifactId>kirra-mdd</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<artifactId>plugins</artifactId>
     	<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 	</parent>
 	<modules>
 		<module>com.abstratt.kirra.mdd.schema</module>
diff --git a/pom.xml b/pom.xml
index 1889fe58..b6de26da 100755
--- a/pom.xml
+++ b/pom.xml
@@ -3,24 +3,23 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.abstratt.mdd.kirra</groupId>
 	<artifactId>plugins</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-        <parent>
-                <artifactId>master</artifactId>
-                <groupId>com.abstratt</groupId>
-                <version>4.2.0</version>
-        </parent>
+    <parent>
+		<artifactId>master</artifactId>
+		<groupId>com.abstratt.releng</groupId>
+		<version>4.4.0</version>
+    </parent>
 	
 	<properties>
-    	<xtext.version>2.15.0</xtext.version>
-		<bintray.package>cloudfier</bintray.package>
+    	<xtext.version>2.25.0</xtext.version>
 	</properties>
 
 	<repositories>
 		<repository>
-			<id>Abstratt-OSS</id>
+			<id>github</id>
 			<name>Abstratt OSS Repo</name>
-			<url>https://dl.bintray.com/abstratt-oss/abstratt-oss/</url>
+			<url>https://maven.pkg.github.com/abstratt/maven-releases/</url>
 			<layout>default</layout>
 			<snapshots>
 				<enabled>true</enabled>
@@ -49,11 +48,6 @@
 						</artifact>
 					</target>
                     <environments>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
@@ -140,8 +134,9 @@
 				<module>kirra-mdd</module>    	
 				<module>runtime</module>
 				<module>codegen</module>
-				<module>server</module>
+				<module>server</module>				
 				<module>releng</module>
+				<module>tests</module>
 			</modules>
 		</profile>
 	</profiles>
diff --git a/releng/com.abstratt.kirra.mdd.repository/pom.xml b/releng/com.abstratt.kirra.mdd.repository/pom.xml
index 53cfc3d4..809a1ac8 100755
--- a/releng/com.abstratt.kirra.mdd.repository/pom.xml
+++ b/releng/com.abstratt.kirra.mdd.repository/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.abstratt.mdd</groupId>
 	<artifactId>com.abstratt.kirra.mdd.repository</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<parent>
 		<artifactId>plugins</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 </project>
diff --git a/releng/com.abstratt.kirra.server.product/kirra.product b/releng/com.abstratt.kirra.server.product/kirra.product
index d61daa45..57f0fda0 100755
--- a/releng/com.abstratt.kirra.server.product/kirra.product
+++ b/releng/com.abstratt.kirra.server.product/kirra.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Kirra Server" uid="com.abstratt.kirra.server.product" id="com.abstratt.kirra.server.product" application="com.abstratt.kirra.server.app" version="2.12.6.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="Kirra Server" uid="com.abstratt.kirra.server.product" id="com.abstratt.kirra.server.product" application="com.abstratt.kirra.server.app" version="2.13.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -82,14 +82,13 @@
       <plugin id="com.abstratt.resman"/>
       <plugin id="com.abstratt.wrapped.postgresql"/>
       <plugin id="com.abstratt.wrapped.schemacrawler"/>
+      <plugin id="com.abstratt.wrapped.restlet"/>
       <plugin id="com.fasterxml.jackson.core.jackson-annotations"/>
       <plugin id="com.fasterxml.jackson.core.jackson-core"/>
       <plugin id="com.fasterxml.jackson.core.jackson-databind"/>
       <plugin id="com.google.gson"/>
       <plugin id="com.google.guava"/>
       <plugin id="com.ibm.icu"/>
-      <plugin id="javax.servlet"/>
-      <plugin id="javax.ws.rs.jsr311-api"/>
       <plugin id="org.apache.ant"/>
       <plugin id="org.apache.commons.beanutils"/>
       <plugin id="org.apache.commons.codec"/>
@@ -103,12 +102,10 @@
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
       <plugin id="org.apache.felix.gogo.shell"/>
-      <plugin id="org.codehaus.groovy"/>
       <plugin id="org.eclipse.core.contenttype"/>
       <plugin id="org.eclipse.core.filesystem"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
       <plugin id="org.eclipse.emf.common"/>
       <plugin id="org.eclipse.emf.ecore"/>
       <plugin id="org.eclipse.emf.ecore.xmi"/>
@@ -141,14 +138,6 @@
       <plugin id="org.eclipse.xtend.lib.macro"/>
       <plugin id="org.hamcrest.core"/>
       <plugin id="org.junit"/>
-      <plugin id="org.restlet"/>
-      <plugin id="org.restlet.ext.crypto"/>
-      <plugin id="org.restlet.ext.fileupload"/>
-      <plugin id="org.restlet.ext.jackson"/>
-      <plugin id="org.restlet.ext.jackson"/>
-      <plugin id="org.restlet.ext.jaxrs"/>
-      <plugin id="org.restlet.ext.servlet"/>
-      <plugin id="org.restlet.ext.xml"/>
    </plugins>
 
    <configurations>
diff --git a/releng/com.abstratt.kirra.server.product/pom.xml b/releng/com.abstratt.kirra.server.product/pom.xml
index 6ad55551..1ea4518f 100755
--- a/releng/com.abstratt.kirra.server.product/pom.xml
+++ b/releng/com.abstratt.kirra.server.product/pom.xml
@@ -4,12 +4,12 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>com.abstratt.kirra.server.product</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<parent>
 		<artifactId>plugins</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
   <build>
diff --git a/releng/pom.xml b/releng/pom.xml
index ecd03313..babf2991 100755
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.abstratt.mdd.kirra</groupId>
 	<artifactId>releng</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<artifactId>plugins</artifactId>
     	<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 	</parent>
 
 		<modules>
diff --git a/runtime/com.abstratt.blobstore/META-INF/MANIFEST.MF b/runtime/com.abstratt.blobstore/META-INF/MANIFEST.MF
index a179d164..e6967437 100755
--- a/runtime/com.abstratt.blobstore/META-INF/MANIFEST.MF
+++ b/runtime/com.abstratt.blobstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Blob Store
 Bundle-SymbolicName: com.abstratt.blobstore;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.abstratt.blobstore
diff --git a/runtime/com.abstratt.blobstore/pom.xml b/runtime/com.abstratt.blobstore/pom.xml
index b7e4c24d..6330ebe6 100755
--- a/runtime/com.abstratt.blobstore/pom.xml
+++ b/runtime/com.abstratt.blobstore/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.abstratt.blobstore</groupId>
   <artifactId>com.abstratt.blobstore</artifactId>
-  <version>2.12.6-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 	<parent>
 		<artifactId>runtime</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/runtime/com.abstratt.kirra.mdd.runtime/META-INF/MANIFEST.MF b/runtime/com.abstratt.kirra.mdd.runtime/META-INF/MANIFEST.MF
index 9ada3f4e..51db54b3 100755
--- a/runtime/com.abstratt.kirra.mdd.runtime/META-INF/MANIFEST.MF
+++ b/runtime/com.abstratt.kirra.mdd.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MDD-based Kirra
 Bundle-SymbolicName: com.abstratt.kirra.mdd.runtime;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.abstratt.mdd.runtime.core,
diff --git a/runtime/com.abstratt.kirra.mdd.runtime/pom.xml b/runtime/com.abstratt.kirra.mdd.runtime/pom.xml
index 02a97c35..3be83135 100755
--- a/runtime/com.abstratt.kirra.mdd.runtime/pom.xml
+++ b/runtime/com.abstratt.kirra.mdd.runtime/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.abstratt.mdd.kirra</groupId>
   <artifactId>com.abstratt.kirra.mdd.runtime</artifactId>
-  <version>2.12.6-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 	<parent>
 		<artifactId>runtime</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/runtime/com.abstratt.kirra.populator.compiler/META-INF/MANIFEST.MF b/runtime/com.abstratt.kirra.populator.compiler/META-INF/MANIFEST.MF
index 360e9558..4e706a86 100755
--- a/runtime/com.abstratt.kirra.populator.compiler/META-INF/MANIFEST.MF
+++ b/runtime/com.abstratt.kirra.populator.compiler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Data Populator Compiler
 Bundle-SymbolicName: com.abstratt.kirra.populator.compiler;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.abstratt.kirra.populator,
diff --git a/runtime/com.abstratt.kirra.populator.compiler/pom.xml b/runtime/com.abstratt.kirra.populator.compiler/pom.xml
index e164b47b..955a87c5 100755
--- a/runtime/com.abstratt.kirra.populator.compiler/pom.xml
+++ b/runtime/com.abstratt.kirra.populator.compiler/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.abstratt.mdd.kirra</groupId>
 	<artifactId>com.abstratt.kirra.populator.compiler</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<parent>
 		<artifactId>runtime</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/runtime/com.abstratt.mdd.runtime.core/META-INF/MANIFEST.MF b/runtime/com.abstratt.mdd.runtime.core/META-INF/MANIFEST.MF
index 34fbc9c4..bfe33a20 100755
--- a/runtime/com.abstratt.mdd.runtime.core/META-INF/MANIFEST.MF
+++ b/runtime/com.abstratt.mdd.runtime.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MDD Runtime Core
 Bundle-SymbolicName: com.abstratt.mdd.runtime.core;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: Abstratt Technologies
 Require-Bundle: com.abstratt.mdd.core;visibility:=reexport,
  org.eclipse.equinox.registry
diff --git a/runtime/com.abstratt.mdd.runtime.core/pom.xml b/runtime/com.abstratt.mdd.runtime.core/pom.xml
index 6da86c79..4fbed594 100755
--- a/runtime/com.abstratt.mdd.runtime.core/pom.xml
+++ b/runtime/com.abstratt.mdd.runtime.core/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.abstratt.mdd.kirra</groupId>
   <artifactId>com.abstratt.mdd.runtime.core</artifactId>
-  <version>2.12.6-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 	<parent>
 		<artifactId>runtime</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/runtime/com.abstratt.nodestore.inmemory/META-INF/MANIFEST.MF b/runtime/com.abstratt.nodestore.inmemory/META-INF/MANIFEST.MF
index 02234fa1..3a482c07 100755
--- a/runtime/com.abstratt.nodestore.inmemory/META-INF/MANIFEST.MF
+++ b/runtime/com.abstratt.nodestore.inmemory/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Memory-based NodeStore implementation
 Bundle-SymbolicName: com.abstratt.nodestore.inmemory;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.abstratt.nodestore.inmemory.InMemoryNodeStoreActivator
diff --git a/runtime/com.abstratt.nodestore.inmemory/pom.xml b/runtime/com.abstratt.nodestore.inmemory/pom.xml
index e4d18bd7..7d8229c9 100755
--- a/runtime/com.abstratt.nodestore.inmemory/pom.xml
+++ b/runtime/com.abstratt.nodestore.inmemory/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.abstratt.nodestore</groupId>
   <artifactId>com.abstratt.nodestore.inmemory</artifactId>
-  <version>2.12.6-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 	<parent>
 		<artifactId>runtime</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/runtime/com.abstratt.nodestore.jdbc/META-INF/MANIFEST.MF b/runtime/com.abstratt.nodestore.jdbc/META-INF/MANIFEST.MF
index 06fcccfd..73d4e183 100755
--- a/runtime/com.abstratt.nodestore.jdbc/META-INF/MANIFEST.MF
+++ b/runtime/com.abstratt.nodestore.jdbc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JDBC-based NodeStore implementation
 Bundle-SymbolicName: com.abstratt.nodestore.jdbc;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.commons.logging,
diff --git a/runtime/com.abstratt.nodestore.jdbc/pom.xml b/runtime/com.abstratt.nodestore.jdbc/pom.xml
index a6eb91f8..d3eeffa1 100755
--- a/runtime/com.abstratt.nodestore.jdbc/pom.xml
+++ b/runtime/com.abstratt.nodestore.jdbc/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.abstratt.nodestore</groupId>
   <artifactId>com.abstratt.nodestore.jdbc</artifactId>
-  <version>2.12.6-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 	<parent>
 		<artifactId>runtime</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/runtime/com.abstratt.nodestore.jdbc/src/com/abstratt/nodestore/jdbc/ConnectionProvider.java b/runtime/com.abstratt.nodestore.jdbc/src/com/abstratt/nodestore/jdbc/ConnectionProvider.java
index 087d4f6a..b2159690 100755
--- a/runtime/com.abstratt.nodestore.jdbc/src/com/abstratt/nodestore/jdbc/ConnectionProvider.java
+++ b/runtime/com.abstratt.nodestore.jdbc/src/com/abstratt/nodestore/jdbc/ConnectionProvider.java
@@ -35,6 +35,10 @@ public ConnectionProvider() {
         pgDataSource.setUser(username);
         String password = ConfigUtils.get("KIRRA_DATABASE_PASSWORD", "cloudfier");
 		pgDataSource.setPassword(password);
+		String host = ConfigUtils.get("KIRRA_DATABASE_HOST", "localhost");
+		pgDataSource.setServerName(host);
+		int port = Integer.parseInt(ConfigUtils.get("KIRRA_DATABASE_PORT", "5432"));
+		pgDataSource.setPortNumber(port);
         this.dataSource = pgDataSource;
     }
 
diff --git a/runtime/com.abstratt.nodestore/META-INF/MANIFEST.MF b/runtime/com.abstratt.nodestore/META-INF/MANIFEST.MF
index 60d82d6e..218a0b0a 100755
--- a/runtime/com.abstratt.nodestore/META-INF/MANIFEST.MF
+++ b/runtime/com.abstratt.nodestore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ObjectStore
 Bundle-SymbolicName: com.abstratt.nodestore;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.abstratt.nodestore
diff --git a/runtime/com.abstratt.nodestore/pom.xml b/runtime/com.abstratt.nodestore/pom.xml
index d437e0fa..881951ed 100755
--- a/runtime/com.abstratt.nodestore/pom.xml
+++ b/runtime/com.abstratt.nodestore/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.abstratt.nodestore</groupId>
   <artifactId>com.abstratt.nodestore</artifactId>
-  <version>2.12.6-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 	<parent>
 		<artifactId>runtime</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/runtime/com.abstratt.simpleblobstore/META-INF/MANIFEST.MF b/runtime/com.abstratt.simpleblobstore/META-INF/MANIFEST.MF
index 109c1191..a8998ef8 100755
--- a/runtime/com.abstratt.simpleblobstore/META-INF/MANIFEST.MF
+++ b/runtime/com.abstratt.simpleblobstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Simple Blob Store
 Bundle-SymbolicName: com.abstratt.simpleblobstore;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.abstratt.simpleblobstore.SimpleBlobStoreActivator
diff --git a/runtime/com.abstratt.simpleblobstore/pom.xml b/runtime/com.abstratt.simpleblobstore/pom.xml
index 01fbe180..a0f8d391 100755
--- a/runtime/com.abstratt.simpleblobstore/pom.xml
+++ b/runtime/com.abstratt.simpleblobstore/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.abstratt.simpleblobstore</groupId>
   <artifactId>com.abstratt.simpleblobstore</artifactId>
-  <version>2.12.6-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 	<parent>
 		<artifactId>runtime</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index aaf8bf77..fc7bef77 100755
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.abstratt.mdd.kirra</groupId>
 	<artifactId>runtime</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<artifactId>plugins</artifactId>
     	<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 	</parent>
 	<modules>
 	    <!-- first so target gets updated/rebuilt first -->
@@ -20,9 +20,6 @@
 		<module>com.abstratt.mdd.runtime.core</module>
 		<module>com.abstratt.kirra.mdd.runtime</module>
 		<module>com.abstratt.kirra.populator.compiler</module>
-		<module>com.abstratt.nodestore.tests</module>
-		<module>com.abstratt.mdd.core.tests.runtime</module>
-		<module>com.abstratt.kirra.tests.mdd.runtime</module>
 	</modules>
 </project>
 
diff --git a/server/com.abstratt.kirra.auth/META-INF/MANIFEST.MF b/server/com.abstratt.kirra.auth/META-INF/MANIFEST.MF
index 99304316..628df182 100755
--- a/server/com.abstratt.kirra.auth/META-INF/MANIFEST.MF
+++ b/server/com.abstratt.kirra.auth/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Kirra Authentication Service
 Bundle-SymbolicName: com.abstratt.kirra.auth;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/server/com.abstratt.kirra.auth/pom.xml b/server/com.abstratt.kirra.auth/pom.xml
index d41358c3..6c7a2658 100755
--- a/server/com.abstratt.kirra.auth/pom.xml
+++ b/server/com.abstratt.kirra.auth/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>server</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/server/com.abstratt.kirra.mdd.rest.impl.v1/META-INF/MANIFEST.MF b/server/com.abstratt.kirra.mdd.rest.impl.v1/META-INF/MANIFEST.MF
index 8a23f756..60c4047e 100755
--- a/server/com.abstratt.kirra.mdd.rest.impl.v1/META-INF/MANIFEST.MF
+++ b/server/com.abstratt.kirra.mdd.rest.impl.v1/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Kirra MDD REST API
 Bundle-SymbolicName: com.abstratt.kirra.mdd.rest.impl.v1;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
@@ -26,11 +26,7 @@ Import-Package: com.abstratt.kirra.auth,
  org.osgi.framework,
  org.osgi.service.http,
  org.osgi.util.tracker
-Require-Bundle: org.restlet,
- org.restlet.ext.servlet,
- org.restlet.ext.xml,
- org.restlet.ext.crypto,
- org.restlet.ext.jaxrs,
+Require-Bundle: com.abstratt.wrapped.restlet,
  com.abstratt.nodestore,
  com.abstratt.nodestore.jdbc,
  com.abstratt.nodestore.inmemory,
diff --git a/server/com.abstratt.kirra.mdd.rest.impl.v1/pom.xml b/server/com.abstratt.kirra.mdd.rest.impl.v1/pom.xml
index 037f90e1..37717ab2 100755
--- a/server/com.abstratt.kirra.mdd.rest.impl.v1/pom.xml
+++ b/server/com.abstratt.kirra.mdd.rest.impl.v1/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>server</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/server/com.abstratt.kirra.mdd.rest.impl.v2/META-INF/MANIFEST.MF b/server/com.abstratt.kirra.mdd.rest.impl.v2/META-INF/MANIFEST.MF
index a4618393..96fbc06c 100755
--- a/server/com.abstratt.kirra.mdd.rest.impl.v2/META-INF/MANIFEST.MF
+++ b/server/com.abstratt.kirra.mdd.rest.impl.v2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Kirra MDD REST API
 Bundle-SymbolicName: com.abstratt.kirra.mdd.rest.impl.v2;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
@@ -19,12 +19,7 @@ Import-Package: com.abstratt.kirra.auth,
  org.osgi.framework,
  org.osgi.service.http,
  org.osgi.util.tracker
-Require-Bundle: org.restlet,
- org.restlet.ext.servlet,
- org.restlet.ext.xml,
- org.restlet.ext.crypto,
- org.restlet.ext.jaxrs,
- org.restlet.ext.jackson,
+Require-Bundle: com.abstratt.wrapped.restlet,
  com.abstratt.mdd.frontend.core,
  com.abstratt.mdd.runtime.core,
  com.abstratt.mdd.frontend.web,
diff --git a/server/com.abstratt.kirra.mdd.rest.impl.v2/pom.xml b/server/com.abstratt.kirra.mdd.rest.impl.v2/pom.xml
index c5ae96b7..414131eb 100755
--- a/server/com.abstratt.kirra.mdd.rest.impl.v2/pom.xml
+++ b/server/com.abstratt.kirra.mdd.rest.impl.v2/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>server</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/server/com.abstratt.kirra.mdd.rest.impl.v2/src/com/abstratt/kirra/mdd/rest/impl/v2/KirraRESTServlet.java b/server/com.abstratt.kirra.mdd.rest.impl.v2/src/com/abstratt/kirra/mdd/rest/impl/v2/KirraRESTServlet.java
index 44236017..4e137251 100755
--- a/server/com.abstratt.kirra.mdd.rest.impl.v2/src/com/abstratt/kirra/mdd/rest/impl/v2/KirraRESTServlet.java
+++ b/server/com.abstratt.kirra.mdd.rest.impl.v2/src/com/abstratt/kirra/mdd/rest/impl/v2/KirraRESTServlet.java
@@ -13,4 +13,5 @@ protected Application createApplication(Context parentContext) {
         KirraOnMDDRestletApplication kirraRestletApplication = new KirraOnMDDRestletApplication(getComponent());
         return kirraRestletApplication;
     }
+
 }
diff --git a/server/com.abstratt.kirra.mdd.rest/META-INF/MANIFEST.MF b/server/com.abstratt.kirra.mdd.rest/META-INF/MANIFEST.MF
index e46c7799..cac87981 100755
--- a/server/com.abstratt.kirra.mdd.rest/META-INF/MANIFEST.MF
+++ b/server/com.abstratt.kirra.mdd.rest/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Kirra MDD REST API
 Bundle-SymbolicName: com.abstratt.kirra.mdd.rest;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
@@ -24,13 +24,7 @@ Import-Package: com.abstratt.kirra.auth,
  org.osgi.framework,
  org.osgi.service.http,
  org.osgi.util.tracker
-Require-Bundle: org.restlet,
- org.restlet.ext.servlet,
- org.restlet.ext.fileupload,
- org.restlet.ext.xml,
- org.restlet.ext.crypto,
- org.restlet.ext.jaxrs,
- org.restlet.ext.jackson,
+Require-Bundle: 
  com.abstratt.mdd.core,
  com.abstratt.mdd.frontend.core,
  com.abstratt.mdd.runtime.core,
@@ -38,6 +32,7 @@ Require-Bundle: org.restlet,
  com.abstratt.kirra.mdd.runtime,
  com.abstratt.kirra.mdd.core,
  com.abstratt.kirra.api,
+ com.abstratt.wrapped.restlet,
  org.apache.commons.httpclient,
  org.apache.commons.fileupload,
  org.apache.commons.io,
diff --git a/server/com.abstratt.kirra.mdd.rest/pom.xml b/server/com.abstratt.kirra.mdd.rest/pom.xml
index 1e13df5f..1010552b 100755
--- a/server/com.abstratt.kirra.mdd.rest/pom.xml
+++ b/server/com.abstratt.kirra.mdd.rest/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>server</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraAuthenticationContext.java b/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraAuthenticationContext.java
index ff88d17a..2e0c7fdf 100644
--- a/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraAuthenticationContext.java
+++ b/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraAuthenticationContext.java
@@ -5,8 +5,8 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.restlet.Request;
+import org.restlet.data.Header;
 import org.restlet.data.Method;
-import org.restlet.engine.header.Header;
 import org.restlet.util.Series;
 
 import com.abstratt.kirra.mdd.core.KirraMDDConstants;
diff --git a/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraCORSFilter.java b/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraCORSFilter.java
index cb874c23..b27430eb 100644
--- a/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraCORSFilter.java
+++ b/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraCORSFilter.java
@@ -5,7 +5,7 @@
 import org.restlet.Request;
 import org.restlet.Response;
 import org.restlet.Restlet;
-import org.restlet.engine.header.Header;
+import org.restlet.data.Header;
 import org.restlet.routing.Filter;
 import org.restlet.util.Series;
 
diff --git a/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraCookieAuthenticator.java b/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraCookieAuthenticator.java
index a290318b..8e6e9606 100755
--- a/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraCookieAuthenticator.java
+++ b/server/com.abstratt.kirra.mdd.rest/src/com/abstratt/kirra/mdd/rest/KirraCookieAuthenticator.java
@@ -12,7 +12,7 @@
 import org.restlet.data.ChallengeScheme;
 import org.restlet.data.CookieSetting;
 import org.restlet.data.Method;
-import org.restlet.engine.header.Header;
+import org.restlet.data.Header;
 import org.restlet.ext.crypto.CookieAuthenticator;
 import org.restlet.util.Series;
 
diff --git a/server/com.abstratt.kirra.server/META-INF/MANIFEST.MF b/server/com.abstratt.kirra.server/META-INF/MANIFEST.MF
index adf53ec9..973ad7b5 100755
--- a/server/com.abstratt.kirra.server/META-INF/MANIFEST.MF
+++ b/server/com.abstratt.kirra.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Kirra Server Application
 Bundle-SymbolicName: com.abstratt.kirra.server;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.abstratt.pluginutils,
diff --git a/server/com.abstratt.kirra.server/pom.xml b/server/com.abstratt.kirra.server/pom.xml
index 9eb2ab97..5f99806a 100755
--- a/server/com.abstratt.kirra.server/pom.xml
+++ b/server/com.abstratt.kirra.server/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.abstratt.mdd.kirra</groupId>
 	<artifactId>com.abstratt.kirra.server</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<parent>
 		<artifactId>server</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/server/com.abstratt.mdd.frontend.orion/META-INF/MANIFEST.MF b/server/com.abstratt.mdd.frontend.orion/META-INF/MANIFEST.MF
index 98580939..aa57cf7c 100755
--- a/server/com.abstratt.mdd.frontend.orion/META-INF/MANIFEST.MF
+++ b/server/com.abstratt.mdd.frontend.orion/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Orion Plug-ins
 Bundle-SymbolicName: com.abstratt.mdd.frontend.orion;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Eclipse-BundleShape: dir
diff --git a/server/com.abstratt.mdd.frontend.orion/pom.xml b/server/com.abstratt.mdd.frontend.orion/pom.xml
index 82f0b56f..5dba3969 100755
--- a/server/com.abstratt.mdd.frontend.orion/pom.xml
+++ b/server/com.abstratt.mdd.frontend.orion/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>server</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 </project>
diff --git a/server/com.abstratt.mdd.frontend.web/META-INF/MANIFEST.MF b/server/com.abstratt.mdd.frontend.web/META-INF/MANIFEST.MF
index c086ebd5..7f246215 100755
--- a/server/com.abstratt.mdd.frontend.web/META-INF/MANIFEST.MF
+++ b/server/com.abstratt.mdd.frontend.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Web Frontend
 Bundle-SymbolicName: com.abstratt.mdd.frontend.web;singleton:=true
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="2.4.0",
@@ -11,10 +11,8 @@ Import-Package: javax.servlet;version="2.4.0",
  org.osgi.framework,
  org.osgi.service.http,
  org.osgi.util.tracker
-Require-Bundle: org.restlet,
- org.restlet.ext.servlet,
- org.restlet.ext.xml,
- org.restlet.ext.fileupload,
+Require-Bundle: 
+ com.abstratt.wrapped.restlet,
  com.fasterxml.jackson.core.jackson-core;visibility:=reexport,
  com.fasterxml.jackson.core.jackson-annotations;visibility:=reexport,
  com.fasterxml.jackson.core.jackson-databind;visibility:=reexport,
@@ -31,7 +29,8 @@ Require-Bundle: org.restlet,
  org.apache.commons.logging,
  org.apache.commons.httpclient,
  org.apache.commons.io,
- org.apache.commons.fileupload
+ org.apache.commons.fileupload,
+ com.abstratt.wrapped.restlet
 Export-Package: com.abstratt.mdd.frontend.web
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.abstratt.mdd.frontend.web.Activator
diff --git a/server/com.abstratt.mdd.frontend.web/pom.xml b/server/com.abstratt.mdd.frontend.web/pom.xml
index eafa2f88..4c25a518 100755
--- a/server/com.abstratt.mdd.frontend.web/pom.xml
+++ b/server/com.abstratt.mdd.frontend.web/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<artifactId>server</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<properties>
diff --git a/server/pom.xml b/server/pom.xml
index 47bfd3c8..c31f91d6 100755
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -3,21 +3,22 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.abstratt.mdd.kirra</groupId>
 	<artifactId>server</artifactId>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<artifactId>plugins</artifactId>
     	<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 	</parent>
 	<modules>
 		<module>com.abstratt.kirra.auth</module>
 		<module>com.abstratt.kirra.mdd.rest</module>
 		<module>com.abstratt.kirra.mdd.rest.impl.v1</module>
 		<module>com.abstratt.kirra.mdd.rest.impl.v2</module>
+		
 		<module>com.abstratt.mdd.frontend.web</module>
 		<module>com.abstratt.mdd.frontend.orion</module>
-		<module>com.abstratt.mdd.frontend.web.tests</module>
+		
 		<module>com.abstratt.kirra.server</module>
 	</modules>
 </project>
diff --git a/codegen/com.abstratt.mdd.target.tests/.gitignore b/tests/com.abstratt.kirra.tests.mdd.runtime/.gitignore
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/.gitignore
rename to tests/com.abstratt.kirra.tests.mdd.runtime/.gitignore
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/JAXRSAccessControlGeneratorTests.launch b/tests/com.abstratt.kirra.tests.mdd.runtime/JAXRSAccessControlGeneratorTests.launch
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/JAXRSAccessControlGeneratorTests.launch
rename to tests/com.abstratt.kirra.tests.mdd.runtime/JAXRSAccessControlGeneratorTests.launch
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/KirraMDDRuntimeRestTests (1).launch b/tests/com.abstratt.kirra.tests.mdd.runtime/KirraMDDRuntimeRestTests (1).launch
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/KirraMDDRuntimeRestTests (1).launch
rename to tests/com.abstratt.kirra.tests.mdd.runtime/KirraMDDRuntimeRestTests (1).launch
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/META-INF/MANIFEST.MF b/tests/com.abstratt.kirra.tests.mdd.runtime/META-INF/MANIFEST.MF
similarity index 98%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/META-INF/MANIFEST.MF
rename to tests/com.abstratt.kirra.tests.mdd.runtime/META-INF/MANIFEST.MF
index c91605da..19b3dc66 100755
--- a/runtime/com.abstratt.kirra.tests.mdd.runtime/META-INF/MANIFEST.MF
+++ b/tests/com.abstratt.kirra.tests.mdd.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Kirra MDD Runtime tests
 Bundle-SymbolicName: com.abstratt.kirra.tests.mdd.runtime
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: com.abstratt.kirra.tests.mdd.runtime.Activator
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/build.properties b/tests/com.abstratt.kirra.tests.mdd.runtime/build.properties
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/build.properties
rename to tests/com.abstratt.kirra.tests.mdd.runtime/build.properties
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/pom.xml b/tests/com.abstratt.kirra.tests.mdd.runtime/pom.xml
similarity index 95%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/pom.xml
rename to tests/com.abstratt.kirra.tests.mdd.runtime/pom.xml
index cc4c1512..1b59ffe6 100755
--- a/runtime/com.abstratt.kirra.tests.mdd.runtime/pom.xml
+++ b/tests/com.abstratt.kirra.tests.mdd.runtime/pom.xml
@@ -6,9 +6,9 @@
 	<artifactId>com.abstratt.kirra.tests.mdd.runtime</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<parent>
-		<artifactId>runtime</artifactId>
+		<artifactId>tests</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraMDDRuntimeTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraMDDRuntimeTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraMDDRuntimeTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraMDDRuntimeTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraRestTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraRestTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraRestTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraRestTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraRestV1Tests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraRestV1Tests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraRestV1Tests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AbstractKirraRestV1Tests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/Activator.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/Activator.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/Activator.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/Activator.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AllKirraAutomatedTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AllKirraAutomatedTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AllKirraAutomatedTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AllKirraAutomatedTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AllKirraMDDRuntimeTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AllKirraMDDRuntimeTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AllKirraMDDRuntimeTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/AllKirraMDDRuntimeTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraDataPopulatorTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraDataPopulatorTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraDataPopulatorTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraDataPopulatorTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeActionTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeActionTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeActionTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeActionTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeActorTests.xtend b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeActorTests.xtend
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeActorTests.xtend
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeActorTests.xtend
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeDataTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeDataTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeDataTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeDataTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeExternalServiceTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeExternalServiceTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeExternalServiceTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeExternalServiceTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeFlexTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeFlexTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeFlexTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeFlexTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRelationshipTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRelationshipTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRelationshipTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRelationshipTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeResourceTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeResourceTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeResourceTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeResourceTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRest2Tests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRest2Tests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRest2Tests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRest2Tests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRestTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRestTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRestTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeRestTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeSchemaTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeSchemaTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeSchemaTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeSchemaTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeValidationTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeValidationTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeValidationTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraMDDRuntimeValidationTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraUIHelperTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraUIHelperTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraUIHelperTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/KirraUIHelperTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/RepositoryServiceTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/RepositoryServiceTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/RepositoryServiceTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/RepositoryServiceTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/TupleParserTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/TupleParserTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/TupleParserTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/TupleParserTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/performance/AllKirraPerformanceTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/performance/AllKirraPerformanceTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/performance/AllKirraPerformanceTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/performance/AllKirraPerformanceTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/performance/InstancePerformanceTests.java b/tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/performance/InstancePerformanceTests.java
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/performance/InstancePerformanceTests.java
rename to tests/com.abstratt.kirra.tests.mdd.runtime/src/com/abstratt/kirra/tests/performance/InstancePerformanceTests.java
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/.gitignore b/tests/com.abstratt.mdd.core.tests.runtime/.gitignore
similarity index 100%
rename from runtime/com.abstratt.kirra.tests.mdd.runtime/.gitignore
rename to tests/com.abstratt.mdd.core.tests.runtime/.gitignore
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/META-INF/MANIFEST.MF b/tests/com.abstratt.mdd.core.tests.runtime/META-INF/MANIFEST.MF
similarity index 93%
rename from runtime/com.abstratt.mdd.core.tests.runtime/META-INF/MANIFEST.MF
rename to tests/com.abstratt.mdd.core.tests.runtime/META-INF/MANIFEST.MF
index 47063dda..858c64e2 100755
--- a/runtime/com.abstratt.mdd.core.tests.runtime/META-INF/MANIFEST.MF
+++ b/tests/com.abstratt.mdd.core.tests.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Runtime Tests Plug-in
 Bundle-SymbolicName: com.abstratt.mdd.core.tests.runtime
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Require-Bundle: com.abstratt.mdd.runtime.core;visibility:=reexport,
  com.abstratt.mdd.frontend.textuml.core,
  com.abstratt.mdd.core.tests.harness;visibility:=reexport,
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/build.properties b/tests/com.abstratt.mdd.core.tests.runtime/build.properties
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/build.properties
rename to tests/com.abstratt.mdd.core.tests.runtime/build.properties
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/pom.xml b/tests/com.abstratt.mdd.core.tests.runtime/pom.xml
similarity index 92%
rename from runtime/com.abstratt.mdd.core.tests.runtime/pom.xml
rename to tests/com.abstratt.mdd.core.tests.runtime/pom.xml
index 88c0c004..009302f6 100755
--- a/runtime/com.abstratt.mdd.core.tests.runtime/pom.xml
+++ b/tests/com.abstratt.mdd.core.tests.runtime/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
     <groupId>com.abstratt.mdd.kirra</groupId>
     <artifactId>com.abstratt.mdd.core.tests.runtime</artifactId>
-    <version>2.12.6-SNAPSHOT</version>
+    <version>2.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<parent>
-		<artifactId>runtime</artifactId>
+		<artifactId>tests</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<build>
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AbstractRuntimeTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AbstractRuntimeTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AbstractRuntimeTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AbstractRuntimeTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AllRuntimeTests.xtend b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AllRuntimeTests.xtend
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AllRuntimeTests.xtend
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AllRuntimeTests.xtend
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ConsoleCapture.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ConsoleCapture.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ConsoleCapture.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ConsoleCapture.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ConsoleTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ConsoleTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ConsoleTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ConsoleTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ExpressionTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ExpressionTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ExpressionTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/ExpressionTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/OldRuntimeControlTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/OldRuntimeControlTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/OldRuntimeControlTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/OldRuntimeControlTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/PersistenceServiceTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/PersistenceServiceTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/PersistenceServiceTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/PersistenceServiceTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/PrimitiveActionTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/PrimitiveActionTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/PrimitiveActionTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/PrimitiveActionTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeAssociationTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeAssociationTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeAssociationTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeAssociationTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeCollectionTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeCollectionTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeCollectionTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeCollectionTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeControlTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeControlTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeControlTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeControlTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeDateAndTimeTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeDateAndTimeTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeDateAndTimeTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeDateAndTimeTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeEnumerationTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeEnumerationTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeEnumerationTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeEnumerationTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeExternalTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeExternalTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeExternalTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeExternalTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeObjectTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeObjectTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeObjectTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeObjectTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimePortTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimePortTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimePortTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimePortTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeReceptionTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeReceptionTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeReceptionTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeReceptionTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeStateMachineTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeStateMachineTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeStateMachineTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeStateMachineTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeStringTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeStringTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeStringTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeStringTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeTupleTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeTupleTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeTupleTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeTupleTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeUserTests.xtend b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeUserTests.xtend
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeUserTests.xtend
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/RuntimeUserTests.xtend
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/SSMTests.java b/tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/SSMTests.java
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/SSMTests.java
rename to tests/com.abstratt.mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/SSMTests.java
diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/.gitignore b/tests/com.abstratt.mdd.frontend.web.tests/.gitignore
similarity index 100%
rename from runtime/com.abstratt.mdd.core.tests.runtime/.gitignore
rename to tests/com.abstratt.mdd.frontend.web.tests/.gitignore
diff --git a/server/com.abstratt.mdd.frontend.web.tests/META-INF/MANIFEST.MF b/tests/com.abstratt.mdd.frontend.web.tests/META-INF/MANIFEST.MF
similarity index 96%
rename from server/com.abstratt.mdd.frontend.web.tests/META-INF/MANIFEST.MF
rename to tests/com.abstratt.mdd.frontend.web.tests/META-INF/MANIFEST.MF
index 58e587a2..c19d99a2 100755
--- a/server/com.abstratt.mdd.frontend.web.tests/META-INF/MANIFEST.MF
+++ b/tests/com.abstratt.mdd.frontend.web.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MDD Web-based Front-end Tests
 Bundle-SymbolicName: com.abstratt.mdd.frontend.web.tests
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: Abstratt Technologies
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/runtime/com.abstratt.nodestore.tests/build.properties b/tests/com.abstratt.mdd.frontend.web.tests/build.properties
similarity index 100%
rename from runtime/com.abstratt.nodestore.tests/build.properties
rename to tests/com.abstratt.mdd.frontend.web.tests/build.properties
diff --git a/server/com.abstratt.mdd.frontend.web.tests/pom.xml b/tests/com.abstratt.mdd.frontend.web.tests/pom.xml
similarity index 94%
rename from server/com.abstratt.mdd.frontend.web.tests/pom.xml
rename to tests/com.abstratt.mdd.frontend.web.tests/pom.xml
index 21902731..a9dd3ac7 100755
--- a/server/com.abstratt.mdd.frontend.web.tests/pom.xml
+++ b/tests/com.abstratt.mdd.frontend.web.tests/pom.xml
@@ -6,9 +6,9 @@
 	<artifactId>com.abstratt.mdd.frontend.web.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<parent>
-		<artifactId>server</artifactId>
+		<artifactId>tests</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<build>
diff --git a/server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/AbstractWebFrontEndTest.java b/tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/AbstractWebFrontEndTest.java
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/AbstractWebFrontEndTest.java
rename to tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/AbstractWebFrontEndTest.java
diff --git a/server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/Activator.java b/tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/Activator.java
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/Activator.java
rename to tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/Activator.java
diff --git a/server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/AllWebFrontEndTests.java b/tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/AllWebFrontEndTests.java
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/AllWebFrontEndTests.java
rename to tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/AllWebFrontEndTests.java
diff --git a/server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/BuilderTests.java b/tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/BuilderTests.java
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/BuilderTests.java
rename to tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/BuilderTests.java
diff --git a/server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/DeployerTests.java b/tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/DeployerTests.java
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/DeployerTests.java
rename to tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/DeployerTests.java
diff --git a/server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/GeneratorTests.java b/tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/GeneratorTests.java
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/GeneratorTests.java
rename to tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/GeneratorTests.java
diff --git a/server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/PublisherTests.java b/tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/PublisherTests.java
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/PublisherTests.java
rename to tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/PublisherTests.java
diff --git a/server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/RestHelper.java b/tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/RestHelper.java
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/RestHelper.java
rename to tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/RestHelper.java
diff --git a/server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/StatusTests.java b/tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/StatusTests.java
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/StatusTests.java
rename to tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/StatusTests.java
diff --git a/server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/ValidatorTests.java b/tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/ValidatorTests.java
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/ValidatorTests.java
rename to tests/com.abstratt.mdd.frontend.web.tests/src/com/abstratt/mdd/frontend/web/tests/ValidatorTests.java
diff --git a/runtime/com.abstratt.nodestore.tests/.gitignore b/tests/com.abstratt.mdd.target.tests/.gitignore
similarity index 100%
rename from runtime/com.abstratt.nodestore.tests/.gitignore
rename to tests/com.abstratt.mdd.target.tests/.gitignore
diff --git a/codegen/com.abstratt.mdd.target.tests/META-INF/MANIFEST.MF b/tests/com.abstratt.mdd.target.tests/META-INF/MANIFEST.MF
similarity index 96%
rename from codegen/com.abstratt.mdd.target.tests/META-INF/MANIFEST.MF
rename to tests/com.abstratt.mdd.target.tests/META-INF/MANIFEST.MF
index 2947ff09..bf224d03 100755
--- a/codegen/com.abstratt.mdd.target.tests/META-INF/MANIFEST.MF
+++ b/tests/com.abstratt.mdd.target.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MDD Target Tests Plug-in
 Bundle-SymbolicName: com.abstratt.mdd.target.tests
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: Abstratt Technologies
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.abstratt.mdd.core.tests.harness,
diff --git a/codegen/com.abstratt.mdd.target.tests/build.properties b/tests/com.abstratt.mdd.target.tests/build.properties
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/build.properties
rename to tests/com.abstratt.mdd.target.tests/build.properties
diff --git a/codegen/com.abstratt.mdd.target.tests/pom.xml b/tests/com.abstratt.mdd.target.tests/pom.xml
similarity index 94%
rename from codegen/com.abstratt.mdd.target.tests/pom.xml
rename to tests/com.abstratt.mdd.target.tests/pom.xml
index 36a4c7a0..0ff2fcc8 100755
--- a/codegen/com.abstratt.mdd.target.tests/pom.xml
+++ b/tests/com.abstratt.mdd.target.tests/pom.xml
@@ -6,9 +6,9 @@
 	<artifactId>com.abstratt.mdd.target.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<parent>
-		<artifactId>codegen</artifactId>
+		<artifactId>tests</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<build>
diff --git a/codegen/com.abstratt.mdd.target.tests/src/.gitignore b/tests/com.abstratt.mdd.target.tests/src/.gitignore
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/.gitignore
rename to tests/com.abstratt.mdd.target.tests/src/.gitignore
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/AllTests.java b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/AllTests.java
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/AllTests.java
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/AllTests.java
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/JDBCImporterNamingTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/JDBCImporterNamingTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/JDBCImporterNamingTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/JDBCImporterNamingTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/JDBCImporterTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/JDBCImporterTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/JDBCImporterTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/JDBCImporterTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/schemacrawler.data.xml b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/schemacrawler.data.xml
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/schemacrawler.data.xml
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/importer/tests/jdbc/schemacrawler.data.xml
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AbstractGeneratorTest.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AbstractGeneratorTest.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AbstractGeneratorTest.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AbstractGeneratorTest.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AllTargetTests.java b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AllTargetTests.java
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AllTargetTests.java
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AllTargetTests.java
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AllTests.java b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AllTests.java
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AllTests.java
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/AllTests.java
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/BasicTargetTests.java b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/BasicTargetTests.java
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/BasicTargetTests.java
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/BasicTargetTests.java
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/CustomPlatformTests.java b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/CustomPlatformTests.java
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/CustomPlatformTests.java
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/CustomPlatformTests.java
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/GStringLanguageMapperTests.java b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/GStringLanguageMapperTests.java
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/GStringLanguageMapperTests.java
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/GStringLanguageMapperTests.java
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/TargetPlatformTestingTests.java b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/TargetPlatformTestingTests.java
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/TargetPlatformTestingTests.java
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/TargetPlatformTestingTests.java
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/AllJEETests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/AllJEETests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/AllJEETests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/AllJEETests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/CriteriaQueryActionGeneratorTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/CriteriaQueryActionGeneratorTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/CriteriaQueryActionGeneratorTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/CriteriaQueryActionGeneratorTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/DataFlowAnalyzerTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/DataFlowAnalyzerTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/DataFlowAnalyzerTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/DataFlowAnalyzerTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JAXRSAccessControlGeneratorTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JAXRSAccessControlGeneratorTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JAXRSAccessControlGeneratorTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JAXRSAccessControlGeneratorTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPACriteriaServiceBehaviorGeneratorTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPACriteriaServiceBehaviorGeneratorTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPACriteriaServiceBehaviorGeneratorTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPACriteriaServiceBehaviorGeneratorTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAEntityBehaviorGenerationTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAEntityBehaviorGenerationTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAEntityBehaviorGenerationTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAEntityBehaviorGenerationTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAEntityGeneratorTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAEntityGeneratorTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAEntityGeneratorTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAEntityGeneratorTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAServiceGeneratorTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAServiceGeneratorTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAServiceGeneratorTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPAServiceGeneratorTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPQLQueryActionGeneratorTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPQLQueryActionGeneratorTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPQLQueryActionGeneratorTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jee/JPQLQueryActionGeneratorTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/AllJSETests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/AllJSETests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/AllJSETests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/AllJSETests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/PlainEntityBehaviorGenerationTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/PlainEntityBehaviorGenerationTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/PlainEntityBehaviorGenerationTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/PlainEntityBehaviorGenerationTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/PlainEntityGenerationTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/PlainEntityGenerationTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/PlainEntityGenerationTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/jse/PlainEntityGenerationTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/AllMeanTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/AllMeanTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/AllMeanTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/AllMeanTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/JSGeneratorTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/JSGeneratorTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/JSGeneratorTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/JSGeneratorTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/ModelGeneratorTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/ModelGeneratorTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/ModelGeneratorTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/ModelGeneratorTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/PipelineTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/PipelineTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/PipelineTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/PipelineTests.xtend
diff --git a/codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/QueryPipelineTests.xtend b/tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/QueryPipelineTests.xtend
similarity index 100%
rename from codegen/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/QueryPipelineTests.xtend
rename to tests/com.abstratt.mdd.target.tests/src/com/abstratt/mdd/target/tests/mean/QueryPipelineTests.xtend
diff --git a/server/com.abstratt.mdd.frontend.web.tests/.gitignore b/tests/com.abstratt.nodestore.tests/.gitignore
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/.gitignore
rename to tests/com.abstratt.nodestore.tests/.gitignore
diff --git a/runtime/com.abstratt.nodestore.tests/META-INF/MANIFEST.MF b/tests/com.abstratt.nodestore.tests/META-INF/MANIFEST.MF
similarity index 94%
rename from runtime/com.abstratt.nodestore.tests/META-INF/MANIFEST.MF
rename to tests/com.abstratt.nodestore.tests/META-INF/MANIFEST.MF
index cec17176..408ddfd0 100755
--- a/runtime/com.abstratt.nodestore.tests/META-INF/MANIFEST.MF
+++ b/tests/com.abstratt.nodestore.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Simple ObjectStore implementation
 Bundle-SymbolicName: com.abstratt.nodestore.tests
-Bundle-Version: 2.12.6.qualifier
+Bundle-Version: 2.13.0.qualifier
 Bundle-Vendor: ABSTRATT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: 
diff --git a/server/com.abstratt.mdd.frontend.web.tests/build.properties b/tests/com.abstratt.nodestore.tests/build.properties
similarity index 100%
rename from server/com.abstratt.mdd.frontend.web.tests/build.properties
rename to tests/com.abstratt.nodestore.tests/build.properties
diff --git a/runtime/com.abstratt.nodestore.tests/pom.xml b/tests/com.abstratt.nodestore.tests/pom.xml
similarity index 69%
rename from runtime/com.abstratt.nodestore.tests/pom.xml
rename to tests/com.abstratt.nodestore.tests/pom.xml
index 86ca1d1e..013611cf 100755
--- a/runtime/com.abstratt.nodestore.tests/pom.xml
+++ b/tests/com.abstratt.nodestore.tests/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
         <groupId>com.abstratt.nodestore</groupId>
 	<artifactId>com.abstratt.nodestore.tests</artifactId>
-        <version>2.12.6-SNAPSHOT</version>
+        <version>2.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<parent>
-		<artifactId>runtime</artifactId>
+		<artifactId>tests</artifactId>
 		<groupId>com.abstratt.mdd.kirra</groupId>
-		<version>2.12.6-SNAPSHOT</version>
+		<version>2.13.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<build>
@@ -25,6 +25,11 @@
 		            <systemProperties>
 	                  <eclipse.consoleLog>true</eclipse.consoleLog>
 	                  <org.eclipse.uml2.common.util.CacheAdapter.ThreadLocal/>
+	                  <KIRRA_DATABASE_NAME>cloudfier</KIRRA_DATABASE_NAME>
+	                  <KIRRA_DATABASE_USERNAME>cloudfier</KIRRA_DATABASE_USERNAME>
+	                  <KIRRA_DATABASE_PASSWORD>cloudfier</KIRRA_DATABASE_PASSWORD>
+	                  <KIRRA_DATABASE_HOST>0.0.0.0</KIRRA_DATABASE_HOST>
+	                  <KIRRA_DATABASE_PORT>15432</KIRRA_DATABASE_PORT>
             		</systemProperties>
 				</configuration>
 			</plugin>
diff --git a/runtime/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/AbstractNodeStoreTests.java b/tests/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/AbstractNodeStoreTests.java
similarity index 100%
rename from runtime/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/AbstractNodeStoreTests.java
rename to tests/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/AbstractNodeStoreTests.java
diff --git a/runtime/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/AllNodeStoreTests.java b/tests/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/AllNodeStoreTests.java
similarity index 100%
rename from runtime/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/AllNodeStoreTests.java
rename to tests/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/AllNodeStoreTests.java
diff --git a/runtime/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/InMemoryNodeStoreTests.java b/tests/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/InMemoryNodeStoreTests.java
similarity index 100%
rename from runtime/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/InMemoryNodeStoreTests.java
rename to tests/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/InMemoryNodeStoreTests.java
diff --git a/runtime/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/JdbcNodeStoreTests.java b/tests/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/JdbcNodeStoreTests.java
similarity index 100%
rename from runtime/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/JdbcNodeStoreTests.java
rename to tests/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/JdbcNodeStoreTests.java
diff --git a/runtime/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/SQLGeneratorTests.java b/tests/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/SQLGeneratorTests.java
similarity index 100%
rename from runtime/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/SQLGeneratorTests.java
rename to tests/com.abstratt.nodestore.tests/src/com/abstratt/nodestore/tests/SQLGeneratorTests.java
diff --git a/tests/pom.xml b/tests/pom.xml
new file mode 100644
index 00000000..243cc673
--- /dev/null
+++ b/tests/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.abstratt.mdd.kirra</groupId>
+	<artifactId>tests</artifactId>
+	<version>2.13.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<parent>
+		<artifactId>plugins</artifactId>
+    	<groupId>com.abstratt.mdd.kirra</groupId>
+		<version>2.13.0-SNAPSHOT</version>
+	</parent>
+	<modules>
+		<module>com.abstratt.nodestore.tests</module>
+		<module>com.abstratt.mdd.core.tests.runtime</module>
+		<module>com.abstratt.kirra.tests.mdd.runtime</module>
+        <module>com.abstratt.mdd.frontend.web.tests</module>
+        <module>com.abstratt.mdd.target.tests</module>
+	</modules>
+</project>
+