diff --git a/liquibase/plus/foreignKeys.xml b/liquibase/plus/foreignKeys.xml
deleted file mode 100644
index e9d3413..0000000
--- a/liquibase/plus/foreignKeys.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2021-12-03-PLUS-DATASTREAMS-ForeignKeys" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-
-        <addForeignKeyConstraint
-            constraintName="THINGS_PARTY_ID_FKEY"
-            baseTableName="THINGS" baseColumnNames="PARTY_ID"
-            referencedTableName="PARTIES" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="DATASTREAMS_LICENSE_ID_FKEY"
-            baseTableName="DATASTREAMS" baseColumnNames="LICENSE_ID"
-            referencedTableName="LICENSES" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="DATASTREAMS_PARTY_ID_FKEY"
-            baseTableName="DATASTREAMS" baseColumnNames="PARTY_ID"
-            referencedTableName="PARTIES" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="DATASTREAMS_PROJECT_ID_FKEY"
-            baseTableName="DATASTREAMS" baseColumnNames="PROJECT_ID"
-            referencedTableName="PROJECTS" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="GROUPS_LICENSE_ID_FKEY"
-            baseTableName="GROUPS" baseColumnNames="LICENSE_ID"
-            referencedTableName="LICENSES" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="GROUPS_PARTY_ID_FKEY"
-            baseTableName="GROUPS" baseColumnNames="PARTY_ID"
-            referencedTableName="PARTIES" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="RELATIONS_SUBJECT_ID_FKEY"
-            baseTableName="RELATIONS" baseColumnNames="SUBJECT_ID"
-            referencedTableName="OBSERVATIONS" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="RELATIONS_OBJECT_ID_FKEY"
-            baseTableName="RELATIONS" baseColumnNames="OBJECT_ID"
-            referencedTableName="OBSERVATIONS" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="RELATIONS_GROUP_ID_FKEY"
-            baseTableName="RELATIONS" baseColumnNames="GROUP_ID"
-            referencedTableName="GROUPS" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="GROUPS_OBSERVATIONS_OBSERVATION_ID_FKEY"
-            baseTableName="GROUPS_OBSERVATIONS" baseColumnNames="OBSERVATION_ID"
-            referencedTableName="OBSERVATIONS" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="GROUPS_OBSERVATIONS_GROUP_ID_FKEY"
-            baseTableName="GROUPS_OBSERVATIONS" baseColumnNames="GROUP_ID"
-            referencedTableName="GROUPS" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="GROUPS_RELATIONS_RELATION_ID_FKEY"
-            baseTableName="GROUPS_RELATIONS" baseColumnNames="RELATION_ID"
-            referencedTableName="RELATIONS" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="GROUPS_RELATIONS_GROUP_ID_FKEY"
-            baseTableName="GROUPS_RELATIONS" baseColumnNames="GROUP_ID"
-            referencedTableName="GROUPS" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-    </changeSet>
-
-    <changeSet author="am" id="2021-12-03-PLUS-MULTI_DATASTREAMS-ForeignKeys" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <tableExists tableName="MULTI_DATASTREAMS" />
-       </preConditions>
-
-        <addForeignKeyConstraint
-            constraintName="MULTI_DATASTREAMS_LICENSE_ID_FKEY"
-            baseTableName="MULTI_DATASTREAMS" baseColumnNames="LICENSE_ID"
-            referencedTableName="LICENSES" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="MULTI_DATASTREAMS_PARTY_ID_FKEY"
-            baseTableName="MULTI_DATASTREAMS" baseColumnNames="PARTY_ID"
-            referencedTableName="PARTIES" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-
-        <addForeignKeyConstraint
-            constraintName="MULTI_DATASTREAMS_PROJECT_ID_FKEY"
-            baseTableName="MULTI_DATASTREAMS" baseColumnNames="PROJECT_ID"
-            referencedTableName="PROJECTS" referencedColumnNames="ID"
-            deferrable="false" initiallyDeferred="false"
-            onDelete="CASCADE" onUpdate="CASCADE"/>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/insertCCLicenes.xml b/liquibase/plus/insertCCLicenes.xml
deleted file mode 100644
index d5cc02f..0000000
--- a/liquibase/plus/insertCCLicenes.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-	<!--
-     Copyright (C) 2021 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-	<changeSet author="am" id="2022-01-10-PLUS-CC-LICENSES" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-		
-		<preConditions onFail="MARK_RAN">
-			<tableExists tableName="LICENSES" />
-		</preConditions>
-		
-		<insert tableName="LICENSES">
-			<column name="ID" value="CC_PD"/>
-			<column name="NAME" value="CC_PD" />
-			<column name="DESCRIPTION"
-				value="CC0 Universal (CC0 1.0) Public Domain Dedication" />
-			<column name="DEFINITION"
-				value="https://creativecommons.org/publicdomain/zero/1.0/" />
-			<column name="LOGO"
-				value="https://mirrors.creativecommons.org/presskit/buttons/88x31/png/cc-zero.png" />
-		</insert>
-		
-		<insert tableName="LICENSES">
-			<column name="ID" value="CC_BY"/>
-			<column name="NAME" value="CC BY 3.0" />
-			<column name="DESCRIPTION"
-				value="The Creative Commons Attribution license" />
-			<column name="DEFINITION"
-				value="https://creativecommons.org/licenses/by/3.0/deed.en" />
-			<column name="LOGO"
-				value="https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by.png" />
-		</insert>
-		
-		<insert tableName="LICENSES">
-			<column name="ID" value="CC_BY_NC"/>
-			<column name="NAME" value="CC BY-NC 3.0" />
-			<column name="DESCRIPTION"
-				value="The Creative Commons Attribution-NonCommercial license" />
-			<column name="DEFINITION"
-				value="https://creativecommons.org/licenses/by-nc/3.0/deed.en" />
-			<column name="LOGO"
-				value="https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nc.png"/>
-		</insert>
-
-		<insert tableName="LICENSES">
-			<column name="ID" value="CC_BY_SA"/>
-			<column name="NAME" value="CC BY-SA 3.0" />
-			<column name="DESCRIPTION"
-				value="The Creative Commons Attribution &amp; Share-alike license" />
-			<column name="DEFINITION"
-				value="https://creativecommons.org/licenses/by-sa/3.0/deed.en" />
-			<column name="LOGO"
-				value="https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-sa.png"/>
-		</insert>
-
-		<insert tableName="LICENSES">
-			<column name="ID" value="CC_BY_NC_SA"/>
-			<column name="NAME" value="CC BY-NC-SA 3.0" />
-			<column name="DESCRIPTION"
-				value="The Creative Commons Attribution &amp; Share-alike non-commercial license" />
-			<column name="DEFINITION"
-				value="https://creativecommons.org/licenses/by-nc-sa/3.0/deed.en" />
-			<column name="LOGO"
-				value="https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nc-sa.png"/>
-		</insert>
-
-		<insert tableName="LICENSES">
-			<column name="ID" value="CC_BY_ND"/>
-			<column name="NAME" value="CC BY-ND 3.0" />
-			<column name="DESCRIPTION"
-				value="The Creative Commons Attribution &amp; NoDerivs license" />
-			<column name="DEFINITION"
-				value="https://creativecommons.org/licenses/by-nd/3.0/deed.en" />
-			<column name="LOGO"
-				value="https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nd.png"/>
-		</insert>
-
-		<insert tableName="LICENSES">
-			<column name="ID" value="CC_BY_NC_ND"/>
-			<column name="NAME" value="CC BY-NC-ND 3.0" />
-			<column name="DESCRIPTION"
-				value="The Creative Commons Attribution &amp; NonCommercial &amp; NoDerivs license" />
-			<column name="DEFINITION"
-				value="https://creativecommons.org/licenses/by-nc-nd/3.0/deed.en" />
-			<column name="LOGO"
-				value="https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nc-nd.png"/>
-		</insert>
-	</changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/liquibase/plus/tableDatastreams.xml b/liquibase/plus/tableDatastreams.xml
deleted file mode 100644
index b505c50..0000000
--- a/liquibase/plus/tableDatastreams.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2021-05-19-PLUS-DATASTREAMS" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <tableExists tableName="DATASTREAMS" />
-        </preConditions>
-
-        <addColumn tableName="DATASTREAMS">
-            <column name="LICENSE_ID" type="${idType-License}">
-                <constraints nullable="true"/>
-            </column>
-            <column name="PARTY_ID" type="${idType-Party}">
-                <constraints nullable="true"/>
-            </column>
-            <column name="PROJECT_ID" type="${idType-Project}">
-                <constraints nullable="true"/>
-            </column>
-        </addColumn>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/tableGroups.xml b/liquibase/plus/tableGroups.xml
deleted file mode 100644
index ae72dbc..0000000
--- a/liquibase/plus/tableGroups.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021-2023 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2023-05-15-PLUS-GROUPS-1" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <or>
-                    <tableExists tableName="GROUPS" />
-                </or>
-            </not>
-        </preConditions>
-
-        <createTable tableName="GROUPS">
-            <column name="NAME" type="TEXT"/>
-            <column name="DESCRIPTION" type="TEXT"/>
-            <column name="PROPERTIES" type="JSONB"/>
-            <column name="PURPOSE" type="TEXT"/>
-            <column name="CREATION_TIME" type="TIMESTAMP WITH TIME ZONE"/>
-            <column name="END_TIME" type="TIMESTAMP WITH TIME ZONE"/>
-            <column name="DATA_QUALITY" type="JSONB"/>
-            <column name="TERMS_OF_USE" type="TEXT"/>
-            <column name="PRIVACY_POLICY" type="TEXT"/>
-            <column name="LICENSE_ID" type="${idType-License}">
-                <constraints nullable="true"/>
-            </column>
-            <column name="PARTY_ID" type="${idType-Party}">
-                <constraints nullable="true"/>
-            </column>
-        </createTable>
-    </changeSet>
-
-    <changeSet author="scf" id="2021-07-23-PLUS-GROUPS-2" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <changeLogPropertyDefined property="id-Group" value="LONG" />
-            <not>
-                <columnExists columnName="ID" tableName="GROUPS" />
-            </not>
-        </preConditions>
-        <addColumn tableName="GROUPS">
-            <column name="ID" type="${idTypeLong}" autoIncrement="true" >
-                <constraints primaryKey="true" primaryKeyName="GROUPS_PKEY" />
-            </column>
-        </addColumn>
-    </changeSet>
-
-    <changeSet author="scf" id="2021-07-23-PLUS-GROUPS-3" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <or>
-                <changeLogPropertyDefined property="id-Group" value="STRING" />
-                <changeLogPropertyDefined property="id-Group" value="UUID" />
-            </or>
-            <not>
-                <columnExists columnName="ID" tableName="GROUPS" />
-            </not>
-        </preConditions>
-        <addColumn tableName="GROUPS">
-            <column name="ID" type="${idType-Group}" defaultValueComputed="${defaultValueComputed-Group}" >
-                <constraints primaryKey="true" primaryKeyName="GROUPS_PKEY"/>
-            </column>
-        </addColumn>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/tableGroupsObservations.xml b/liquibase/plus/tableGroupsObservations.xml
deleted file mode 100644
index 39dc276..0000000
--- a/liquibase/plus/tableGroupsObservations.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2021-05-12-PLUS-GROUPS_OBSERVATIONS" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <tableExists tableName="GROUPS_OBSERVATIONS" />
-            </not>
-        </preConditions>
-
-        <createTable tableName="GROUPS_OBSERVATIONS">
-            <column name="GROUP_ID" type="${idType-Group}">
-                <constraints nullable="false"/>
-            </column>
-            <column name="OBSERVATION_ID" type="${idType-Observation}">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-        
-        <addPrimaryKey columnNames="GROUP_ID, OBSERVATION_ID" constraintName="GROUPS_OBSERVATIONS_PKEY" tableName="GROUPS_OBSERVATIONS"/>
-        
-        <createIndex tableName="GROUPS_OBSERVATIONS" indexName="GROUPS_OBSERVATIONS_OBSERVATION_ID">
-            <column name="OBSERVATION_ID" />
-        </createIndex>
-        
-        <createIndex tableName="GROUPS_OBSERVATIONS" indexName="GROUPS_OBSERVATIONS_GROUP_ID">
-            <column name="GROUP_ID" />
-        </createIndex>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/tableGroupsRelations.xml b/liquibase/plus/tableGroupsRelations.xml
deleted file mode 100644
index e2d4244..0000000
--- a/liquibase/plus/tableGroupsRelations.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2021-05-17-PLUS-GROUPS_RELATIONS" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <tableExists tableName="GROUPS_RELATIONS" />
-            </not>
-        </preConditions>
-        
-        <createTable tableName="GROUPS_RELATIONS">
-            <column name="GROUP_ID" type="${idType-Group}">
-                <constraints nullable="false"/>
-            </column>
-            <column name="RELATION_ID" type="${idType-Relation}">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-        
-        <addPrimaryKey columnNames="GROUP_ID, RELATION_ID" constraintName="GROUPS_RELATIONS_PKEY" tableName="GROUPS_RELATIONS"/>
-        
-        <createIndex tableName="GROUPS_RELATIONS" indexName="GROUPS_RELATIONS_RELATION_ID">
-            <column name="RELATION_ID" />
-        </createIndex>
-        
-        <createIndex tableName="GROUPS_RELATIONS" indexName="GROUPS_RELATIONS_GROUP_ID">
-            <column name="GROUP_ID" />
-        </createIndex>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/tableLicenses.xml b/liquibase/plus/tableLicenses.xml
deleted file mode 100644
index b9e7f18..0000000
--- a/liquibase/plus/tableLicenses.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021-2023 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2023-05-15-PLUS-LICENSES-1" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <tableExists tableName="LICENSES" />
-            </not>
-        </preConditions>
-
-        <createTable tableName="LICENSES">
-            <column name="NAME" type="TEXT"/>
-            <column name="DESCRIPTION" type="TEXT"/>
-            <column name="PROPERTIES" type="JSONB"/>
-            <column name="DEFINITION" type="TEXT"/>
-            <column name="ATTRIBUTION_TEXT" type="TEXT"/>
-            <column name="LOGO" type="TEXT"/>
-        </createTable>
-    </changeSet>
-
-    <changeSet author="scf" id="2021-05-19-PLUS-LICENSES-2" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <changeLogPropertyDefined property="id-License" value="LONG" />
-            <not>
-                <columnExists columnName="ID" tableName="LICENSES" />
-            </not>
-        </preConditions>
-        <addColumn tableName="LICENSES">
-            <column name="ID" type="${idTypeLong}" autoIncrement="true" >
-                <constraints primaryKey="true" primaryKeyName="LICENSES_PKEY" />
-            </column>
-        </addColumn>
-    </changeSet>
-
-    <changeSet author="scf" id="2021-05-19-PLUS-LICENSES-3" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <or>
-                <changeLogPropertyDefined property="id-License" value="STRING" />
-                <changeLogPropertyDefined property="id-License" value="UUID" />
-            </or>
-            <not>
-                <columnExists columnName="ID" tableName="LICENSES" />
-            </not>
-        </preConditions>
-        <addColumn tableName="LICENSES">
-            <column name="ID" type="${idType-License}" defaultValueComputed="${defaultValueComputed-License}" >
-                <constraints primaryKey="true" primaryKeyName="LICENSES_PKEY"/>
-            </column>
-        </addColumn>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/tableMultiDatastreams.xml b/liquibase/plus/tableMultiDatastreams.xml
deleted file mode 100644
index 89ebd3b..0000000
--- a/liquibase/plus/tableMultiDatastreams.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2021-05-25-PLUS-MULTI_DATASTREAMS" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <tableExists tableName="MULTI_DATASTREAMS" />
-        </preConditions>
-
-        <addColumn tableName="MULTI_DATASTREAMS">
-            <column name="LICENSE_ID" type="${idType-License}">
-                <constraints nullable="true"/>
-            </column>
-            <column name="PARTY_ID" type="${idType-Party}">
-                <constraints nullable="true"/>
-            </column>
-            <column name="PROJECT_ID" type="${idType-Project}">
-                <constraints nullable="true"/>
-            </column>
-        </addColumn>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/tableParties.xml b/liquibase/plus/tableParties.xml
deleted file mode 100644
index dfbaca1..0000000
--- a/liquibase/plus/tableParties.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021-2023 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2023-05-15-PLUS-PARTIES-1" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <tableExists tableName="PARTIES" />
-            </not>
-        </preConditions>
-
-        <createTable tableName="PARTIES">
-            <column name="DESCRIPTION" type="TEXT"/>
-            <column name="AUTHID" type="TEXT"/>
-            <column name="DISPLAYNAME" type="TEXT"/>
-            <column name="ROLE" type="TEXT"/>
-        </createTable>
-    </changeSet>
-
-    <changeSet author="scf" id="2021-05-11-PLUS-PARTIES-2" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <changeLogPropertyDefined property="id-Party" value="LONG" />
-            <not>
-                <columnExists columnName="ID" tableName="PARTIES" />
-            </not>
-        </preConditions>
-        <addColumn tableName="PARTIES">
-            <column name="ID" type="${idTypeLong}" autoIncrement="true" >
-                <constraints primaryKey="true" primaryKeyName="PARTIES_PKEY" />
-            </column>
-        </addColumn>
-    </changeSet>
-
-    <changeSet author="scf" id="2021-05-11-PLUS-PARTIES-3" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <or>
-                <changeLogPropertyDefined property="id-Party" value="STRING" />
-                <changeLogPropertyDefined property="id-Party" value="UUID" />
-            </or>
-            <not>
-                <columnExists columnName="ID" tableName="PARTIES" />
-            </not>
-        </preConditions>
-        <addColumn tableName="PARTIES">
-            <column name="ID" type="${idType-Party}" defaultValueComputed="${defaultValueComputed-Party}" >
-                <constraints primaryKey="true" primaryKeyName="PARTIES_PKEY"/>
-            </column>
-        </addColumn>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/tableProjects.xml b/liquibase/plus/tableProjects.xml
deleted file mode 100644
index ad3a255..0000000
--- a/liquibase/plus/tableProjects.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021-2023 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2023-05-15-PLUS-PROJECTS-1" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <or>
-                    <tableExists tableName="PROJECTS" />
-                </or>
-            </not>
-        </preConditions>
-
-        <createTable tableName="PROJECTS">
-            <column name="NAME" type="TEXT"/>
-            <column name="DESCRIPTION" type="TEXT"/>
-            <column name="PROPERTIES" type="JSONB"/>
-            <column name="CLASSIFICATION" type="TEXT"/>
-            <column name="TERMSOFUSE" type="TEXT"/>
-            <column name="PRIVACYPOLICY" type="TEXT"/>
-            <column name="URL" type="TEXT"/>
-            <column name="CREATION_TIME" type="TIMESTAMP WITH TIME ZONE"/>
-            <column name="START_TIME" type="TIMESTAMP WITH TIME ZONE"/>
-        </createTable>
-    </changeSet>
-
-    <changeSet author="scf" id="2021-05-11-PLUS-PROJECTS-2" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <changeLogPropertyDefined property="id-Project" value="LONG" />
-            <not>
-                <columnExists columnName="ID" tableName="PROJECTS" />
-            </not>
-        </preConditions>
-        <addColumn tableName="PROJECTS">
-            <column name="ID" type="${idTypeLong}" autoIncrement="true" >
-                <constraints primaryKey="true" primaryKeyName="PROJECTS_PKEY" />
-            </column>
-        </addColumn>
-    </changeSet>
-
-    <changeSet author="scf" id="2021-05-11-PLUS-PROJECTS-3" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <or>
-                <changeLogPropertyDefined property="id-Project" value="STRING" />
-                <changeLogPropertyDefined property="id-Project" value="UUID" />
-            </or>
-            <not>
-                <columnExists columnName="ID" tableName="PROJECTS" />
-            </not>
-        </preConditions>
-        <addColumn tableName="PROJECTS">
-            <column name="ID" type="${idType-Project}" defaultValueComputed="${defaultValueComputed-Project}" >
-                <constraints primaryKey="true" primaryKeyName="PROJECTS_PKEY"/>
-            </column>
-        </addColumn>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/tableRelations.xml b/liquibase/plus/tableRelations.xml
deleted file mode 100644
index 22d68ea..0000000
--- a/liquibase/plus/tableRelations.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021-2023 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2023-05-15-PLUS-RELATIONS-1" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <or>
-                    <tableExists tableName="RELATIONS" />
-                </or>
-            </not>
-        </preConditions>
-        <createTable tableName="RELATIONS">
-            <column name="DESCRIPTION" type="TEXT"/>
-            <column name="PROPERTIES" type="JSONB"/>
-            <column name="ROLE" type="TEXT"/>
-            <column name="EXTERNAL_OBJECT" type="TEXT"/>
-            <column name="SUBJECT_ID" type="${idType-Observation}">
-                <constraints nullable="false"/>
-            </column>
-            <column name="OBJECT_ID" type="${idType-Observation}">
-                <constraints nullable="true"/>
-            </column>
-            <column name="GROUP_ID" type="${idType-Group}">
-                <constraints nullable="true"/>
-            </column>
-        </createTable>
-    </changeSet>
-
-    <changeSet author="scf" id="2021-07-23-PLUS-RELATIONS-2" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <changeLogPropertyDefined property="id-Relation" value="LONG" />
-            <not>
-                <columnExists columnName="ID" tableName="RELATIONS" />
-            </not>
-        </preConditions>
-        <addColumn tableName="RELATIONS">
-            <column name="ID" type="${idTypeLong}" autoIncrement="true" >
-                <constraints primaryKey="true" primaryKeyName="RELATIONS_PKEY" />
-            </column>
-        </addColumn>
-    </changeSet>
-
-    <changeSet author="scf" id="2021-07-23-PLUS-RELATIONS-3" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <or>
-                <changeLogPropertyDefined property="id-Relation" value="STRING" />
-                <changeLogPropertyDefined property="id-Relation" value="UUID" />
-            </or>
-            <not>
-                <columnExists columnName="ID" tableName="RELATIONS" />
-            </not>
-        </preConditions>
-        <addColumn tableName="RELATIONS">
-            <column name="ID" type="${idType-Relation}" defaultValueComputed="${defaultValueComputed-Relation}" >
-                <constraints primaryKey="true" primaryKeyName="RELATIONS_PKEY"/>
-            </column>
-        </addColumn>
-    </changeSet>
-
-    <changeSet author="am" id="2021-07-23-PLUS-RELATIONS-4" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <createIndex tableName="RELATIONS" indexName="RELATIONS_OBJECT_ID">
-            <column name="OBJECT_ID" />
-        </createIndex>
-        
-        <createIndex tableName="RELATIONS" indexName="RELATIONS_SUBJECT_ID">
-            <column name="SUBJECT_ID" />
-        </createIndex>
-        
-        <createIndex tableName="RELATIONS" indexName="RELATIONS_GROUP_ID">
-            <column name="GROUP_ID" />
-        </createIndex>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/tableThings.xml b/liquibase/plus/tableThings.xml
deleted file mode 100644
index cdc0216..0000000
--- a/liquibase/plus/tableThings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <changeSet author="am" id="2021-11-15-PLUS-THINGS" objectQuotingStrategy="QUOTE_ALL_OBJECTS">
-        <preConditions onFail="MARK_RAN">
-            <tableExists tableName="THINGS" />
-        </preConditions>
-
-        <addColumn tableName="THINGS">
-            <column name="PARTY_ID" type="${idType-Party}">
-                <constraints nullable="true"/>
-            </column>
-        </addColumn>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/liquibase/plus/tables.xml b/liquibase/plus/tables.xml
deleted file mode 100644
index aa1895f..0000000
--- a/liquibase/plus/tables.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <!--
-     Copyright (C) 2021 Secure Dimensions GmbH, D-81377
-     Munich, Germany.
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU Lesser General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    -->
-    <include relativeToChangelogFile="true" file="tableProjects.xml" />
-    <include relativeToChangelogFile="true" file="tableParties.xml" />
-    <include relativeToChangelogFile="true" file="tableLicenses.xml" />
-    <include relativeToChangelogFile="true" file="tableThings.xml" />
-    <include relativeToChangelogFile="true" file="tableDatastreams.xml" />
-    <include relativeToChangelogFile="true" file="tableMultiDatastreams.xml" />
-    <include relativeToChangelogFile="true" file="tableGroups.xml" />
-    <include relativeToChangelogFile="true" file="tableRelations.xml" />
-    <include relativeToChangelogFile="true" file="tableGroupsObservations.xml" />
-    <include relativeToChangelogFile="true" file="tableGroupsRelations.xml" />
-    <include relativeToChangelogFile="true" file="foreignKeys.xml" />
-    <include relativeToChangelogFile="true" file="insertCCLicenes.xml" />
-
-</databaseChangeLog>