diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml
index f5ac399ce..d043aa803 100644
--- a/bom/compile-model/pom.xml
+++ b/bom/compile-model/pom.xml
@@ -15,10 +15,11 @@
   <name>openHAB Core :: BOM :: Compile Model</name>
 
   <properties>
+    <classgraph.version>4.8.35.v20190528-1517</classgraph.version>
     <emf.1.version>2.12.0</emf.1.version>
     <emf.3.version>2.11.0</emf.3.version>
-    <emf.mwe.version>1.4.0</emf.mwe.version>
-    <emf.mwe2.version>2.10.0</emf.mwe2.version>
+    <emf.mwe.version>1.5.0</emf.mwe.version>
+    <emf.mwe2.version>2.11.0</emf.mwe2.version>
   </properties>
 
   <dependencies>
@@ -86,6 +87,10 @@
       <version>${xtext.version}</version>
       <scope>compile</scope>
       <exclusions>
+        <exclusion>
+          <groupId>io.github.classgraph</groupId>
+          <artifactId>classgraph</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.eclipse.platform</groupId>
           <artifactId>org.eclipse.osgi</artifactId>
@@ -93,6 +98,14 @@
       </exclusions>
     </dependency>
 
+    <!-- Xtext is using a classgraph artifact from Eclipse Orbit -->
+    <!-- Karaf feature validation fails when using classgraph from Maven Central -->
+    <dependency>
+      <groupId>org.eclipse.orbit.bundles</groupId>
+      <artifactId>io.github.classgraph</artifactId>
+      <version>${classgraph.version}</version>
+    </dependency>
+
     <!--Xbase -->
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 1d11be372..a5f2f28e3 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -718,7 +718,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>21.0</version>
+      <version>27.1-jre</version>
       <scope>compile</scope>
     </dependency>
 
@@ -729,6 +729,11 @@
       <version>3.2.0.v201101311130</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.orbit.bundles</groupId>
+      <artifactId>io.github.classgraph</artifactId>
+      <version>4.8.35.v20190528-1517</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.emf</groupId>
       <artifactId>org.eclipse.emf.common</artifactId>
@@ -756,31 +761,37 @@
     <dependency>
       <groupId>org.eclipse.xtend</groupId>
       <artifactId>org.eclipse.xtend.lib</artifactId>
-      <version>2.17.0</version>
+      <version>2.19.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtend</groupId>
       <artifactId>org.eclipse.xtend.lib.macro</artifactId>
-      <version>2.17.0</version>
+      <version>2.19.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext</artifactId>
-      <version>2.17.0</version>
+      <version>2.19.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.common.types</artifactId>
-      <version>2.17.0</version>
+      <version>2.19.0</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>io.github.classgraph</groupId>
+          <artifactId>classgraph</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.ide</artifactId>
-      <version>2.17.0</version>
+      <version>2.19.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -792,25 +803,25 @@
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.util</artifactId>
-      <version>2.17.0</version>
+      <version>2.19.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.xbase</artifactId>
-      <version>2.17.0</version>
+      <version>2.19.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.xbase.ide</artifactId>
-      <version>2.17.0</version>
+      <version>2.19.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
       <artifactId>org.eclipse.xtext.xbase.lib</artifactId>
-      <version>2.17.0</version>
+      <version>2.19.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -858,7 +869,7 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <version>7.0</version>
+      <version>7.1</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/item/DefaultSitemapProvider.java b/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/item/DefaultSitemapProvider.java
index 6035f06bd..2b129e0f3 100644
--- a/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/item/DefaultSitemapProvider.java
+++ b/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/item/DefaultSitemapProvider.java
@@ -20,13 +20,13 @@ import org.eclipse.smarthome.core.thing.Thing;
 import org.eclipse.smarthome.core.thing.ThingRegistry;
 import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
 import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener;
-import org.eclipse.smarthome.model.sitemap.Sitemap;
-import org.eclipse.smarthome.model.sitemap.SitemapFactory;
 import org.eclipse.smarthome.model.sitemap.SitemapProvider;
-import org.eclipse.smarthome.model.sitemap.impl.DefaultImpl;
-import org.eclipse.smarthome.model.sitemap.impl.FrameImpl;
-import org.eclipse.smarthome.model.sitemap.impl.SitemapImpl;
-import org.eclipse.smarthome.model.sitemap.impl.TextImpl;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
+import org.eclipse.smarthome.model.sitemap.sitemap.SitemapFactory;
+import org.eclipse.smarthome.model.sitemap.sitemap.impl.DefaultImpl;
+import org.eclipse.smarthome.model.sitemap.sitemap.impl.FrameImpl;
+import org.eclipse.smarthome.model.sitemap.sitemap.impl.SitemapImpl;
+import org.eclipse.smarthome.model.sitemap.sitemap.impl.TextImpl;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java
index 20c3bdf2c..e69446fe8 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java
@@ -36,10 +36,10 @@ import org.eclipse.smarthome.io.rest.sitemap.internal.PageChangeListener;
 import org.eclipse.smarthome.io.rest.sitemap.internal.SitemapEvent;
 import org.eclipse.smarthome.model.core.EventType;
 import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener;
-import org.eclipse.smarthome.model.sitemap.LinkableWidget;
-import org.eclipse.smarthome.model.sitemap.Sitemap;
 import org.eclipse.smarthome.model.sitemap.SitemapProvider;
-import org.eclipse.smarthome.model.sitemap.Widget;
+import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
+import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
 import org.eclipse.smarthome.ui.items.ItemUIRegistry;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java
index 9781181d8..449def450 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java
@@ -32,11 +32,11 @@ import org.eclipse.smarthome.core.library.CoreItemFactory;
 import org.eclipse.smarthome.core.types.State;
 import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper;
 import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback;
-import org.eclipse.smarthome.model.sitemap.Chart;
-import org.eclipse.smarthome.model.sitemap.ColorArray;
-import org.eclipse.smarthome.model.sitemap.Frame;
-import org.eclipse.smarthome.model.sitemap.VisibilityRule;
-import org.eclipse.smarthome.model.sitemap.Widget;
+import org.eclipse.smarthome.model.sitemap.sitemap.Chart;
+import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray;
+import org.eclipse.smarthome.model.sitemap.sitemap.Frame;
+import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule;
+import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
 import org.eclipse.smarthome.ui.items.ItemUIRegistry;
 
 /**
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResource.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResource.java
index d01e76c2f..834b17418 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResource.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResource.java
@@ -62,24 +62,24 @@ import org.eclipse.smarthome.io.rest.RESTResource;
 import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper;
 import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService;
 import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback;
-import org.eclipse.smarthome.model.sitemap.Chart;
-import org.eclipse.smarthome.model.sitemap.ColorArray;
-import org.eclipse.smarthome.model.sitemap.Frame;
-import org.eclipse.smarthome.model.sitemap.Image;
-import org.eclipse.smarthome.model.sitemap.LinkableWidget;
-import org.eclipse.smarthome.model.sitemap.List;
-import org.eclipse.smarthome.model.sitemap.Mapping;
-import org.eclipse.smarthome.model.sitemap.Mapview;
-import org.eclipse.smarthome.model.sitemap.Selection;
-import org.eclipse.smarthome.model.sitemap.Setpoint;
-import org.eclipse.smarthome.model.sitemap.Sitemap;
 import org.eclipse.smarthome.model.sitemap.SitemapProvider;
-import org.eclipse.smarthome.model.sitemap.Slider;
-import org.eclipse.smarthome.model.sitemap.Switch;
-import org.eclipse.smarthome.model.sitemap.Video;
-import org.eclipse.smarthome.model.sitemap.VisibilityRule;
-import org.eclipse.smarthome.model.sitemap.Webview;
-import org.eclipse.smarthome.model.sitemap.Widget;
+import org.eclipse.smarthome.model.sitemap.sitemap.Chart;
+import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray;
+import org.eclipse.smarthome.model.sitemap.sitemap.Frame;
+import org.eclipse.smarthome.model.sitemap.sitemap.Image;
+import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget;
+import org.eclipse.smarthome.model.sitemap.sitemap.List;
+import org.eclipse.smarthome.model.sitemap.sitemap.Mapping;
+import org.eclipse.smarthome.model.sitemap.sitemap.Mapview;
+import org.eclipse.smarthome.model.sitemap.sitemap.Selection;
+import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
+import org.eclipse.smarthome.model.sitemap.sitemap.Slider;
+import org.eclipse.smarthome.model.sitemap.sitemap.Switch;
+import org.eclipse.smarthome.model.sitemap.sitemap.Video;
+import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule;
+import org.eclipse.smarthome.model.sitemap.sitemap.Webview;
+import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
 import org.eclipse.smarthome.ui.items.ItemUIRegistry;
 import org.glassfish.jersey.media.sse.EventOutput;
 import org.glassfish.jersey.media.sse.OutboundEvent;
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java b/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java
index b62e7605f..734b49100 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java
@@ -42,11 +42,11 @@ import org.eclipse.smarthome.core.library.types.PercentType;
 import org.eclipse.smarthome.core.types.Command;
 import org.eclipse.smarthome.core.types.State;
 import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.model.sitemap.ColorArray;
-import org.eclipse.smarthome.model.sitemap.Sitemap;
 import org.eclipse.smarthome.model.sitemap.SitemapProvider;
-import org.eclipse.smarthome.model.sitemap.VisibilityRule;
-import org.eclipse.smarthome.model.sitemap.Widget;
+import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
+import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule;
+import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
 import org.eclipse.smarthome.test.java.JavaTest;
 import org.eclipse.smarthome.ui.items.ItemUIRegistry;
 import org.junit.Before;
diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RegistryProvider.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RegistryProvider.java
index 2e25a0487..bfee755ba 100644
--- a/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RegistryProvider.java
+++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RegistryProvider.java
@@ -17,12 +17,12 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 import org.eclipse.smarthome.model.ide.ItemsIdeSetup;
-import org.eclipse.smarthome.model.ide.SitemapIdeSetup;
 import org.eclipse.smarthome.model.persistence.ide.PersistenceIdeSetup;
 import org.eclipse.smarthome.model.rule.ide.RulesIdeSetup;
 import org.eclipse.smarthome.model.script.ScriptServiceUtil;
 import org.eclipse.smarthome.model.script.engine.ScriptEngine;
 import org.eclipse.smarthome.model.script.ide.ScriptIdeSetup;
+import org.eclipse.smarthome.model.sitemap.ide.SitemapIdeSetup;
 import org.eclipse.smarthome.model.thing.ide.ThingIdeSetup;
 import org.eclipse.xtext.XtextPackage;
 import org.eclipse.xtext.resource.FileExtensionProvider;
diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeModule.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeModule.xtend
similarity index 86%
rename from bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeModule.xtend
rename to bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeModule.xtend
index 58c0ab25d..30546e022 100644
--- a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeModule.xtend
+++ b/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeModule.xtend
@@ -11,9 +11,9 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.19.0
  */
-package org.eclipse.smarthome.model.ide
+package org.eclipse.smarthome.model.sitemap.ide
 
 
 /**
diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeSetup.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeSetup.xtend
similarity index 77%
rename from bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeSetup.xtend
rename to bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeSetup.xtend
index ec2fb4b46..c7af07183 100644
--- a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/ide/SitemapIdeSetup.xtend
+++ b/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeSetup.xtend
@@ -11,13 +11,13 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.19.0
  */
-package org.eclipse.smarthome.model.ide
+package org.eclipse.smarthome.model.sitemap.ide
 
 import com.google.inject.Guice
-import org.eclipse.smarthome.model.SitemapRuntimeModule
-import org.eclipse.smarthome.model.SitemapStandaloneSetup
+import org.eclipse.smarthome.model.sitemap.SitemapRuntimeModule
+import org.eclipse.smarthome.model.sitemap.SitemapStandaloneSetup
 import org.eclipse.xtext.util.Modules2
 
 /**
diff --git a/bundles/org.openhab.core.model.sitemap.runtime/src/org/eclipse/smarthome/model/sitemap/runtime/internal/SitemapRuntimeActivator.java b/bundles/org.openhab.core.model.sitemap.runtime/src/org/eclipse/smarthome/model/sitemap/runtime/internal/SitemapRuntimeActivator.java
index ea72c4c01..829222c92 100644
--- a/bundles/org.openhab.core.model.sitemap.runtime/src/org/eclipse/smarthome/model/sitemap/runtime/internal/SitemapRuntimeActivator.java
+++ b/bundles/org.openhab.core.model.sitemap.runtime/src/org/eclipse/smarthome/model/sitemap/runtime/internal/SitemapRuntimeActivator.java
@@ -12,8 +12,8 @@
  */
 package org.eclipse.smarthome.model.sitemap.runtime.internal;
 
-import org.eclipse.smarthome.model.SitemapStandaloneSetup;
 import org.eclipse.smarthome.model.core.ModelParser;
+import org.eclipse.smarthome.model.sitemap.SitemapStandaloneSetup;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.model.sitemap/bnd.bnd b/bundles/org.openhab.core.model.sitemap/bnd.bnd
index 57dae4e95..0f8beebd0 100644
--- a/bundles/org.openhab.core.model.sitemap/bnd.bnd
+++ b/bundles/org.openhab.core.model.sitemap/bnd.bnd
@@ -1,16 +1,16 @@
 Bundle-SymbolicName: ${project.artifactId}
-Export-Package: org.eclipse.smarthome.model,\
- org.eclipse.smarthome.model.formatting,\
- org.eclipse.smarthome.model.generator,\
- org.eclipse.smarthome.model.parser.antlr,\
- org.eclipse.smarthome.model.parser.antlr.internal,\
- org.eclipse.smarthome.model.scoping,\
- org.eclipse.smarthome.model.serializer,\
- org.eclipse.smarthome.model.services,\
- org.eclipse.smarthome.model.sitemap,\
- org.eclipse.smarthome.model.sitemap.impl,\
- org.eclipse.smarthome.model.sitemap.util,\
- org.eclipse.smarthome.model.validation
+Export-Package: org.eclipse.smarthome.model.sitemap,\
+ org.eclipse.smarthome.model.sitemap.formatting,\
+ org.eclipse.smarthome.model.sitemap.generator,\
+ org.eclipse.smarthome.model.sitemap.parser.antlr,\
+ org.eclipse.smarthome.model.sitemap.parser.antlr.internal,\
+ org.eclipse.smarthome.model.sitemap.scoping,\
+ org.eclipse.smarthome.model.sitemap.serializer,\
+ org.eclipse.smarthome.model.sitemap.services,\
+ org.eclipse.smarthome.model.sitemap.sitemap,\
+ org.eclipse.smarthome.model.sitemap.sitemap.impl,\
+ org.eclipse.smarthome.model.sitemap.sitemap.util,\
+ org.eclipse.smarthome.model.sitemap.validation
 Import-Package: org.apache.commons.lang,\
  org.apache.log4j,\
  org.eclipse.jdt.annotation;resolution:=optional,\
diff --git a/bundles/org.openhab.core.model.sitemap/plugin.xml b/bundles/org.openhab.core.model.sitemap/plugin.xml
index 74e883211..97e86ccb1 100644
--- a/bundles/org.openhab.core.model.sitemap/plugin.xml
+++ b/bundles/org.openhab.core.model.sitemap/plugin.xml
@@ -5,8 +5,8 @@
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
-       uri = "http://www.eclipse.org/smarthome/model/Sitemap" 
-       class = "org.eclipse.smarthome.model.sitemap.SitemapPackage"
+       uri = "http://www.eclipse.org/smarthome/model/sitemap/Sitemap" 
+       class = "org.eclipse.smarthome.model.sitemap.sitemap.SitemapPackage"
        genModel = "model/generated/Sitemap.genmodel" /> 
 	
   </extension>
diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml
index 95b087125..42a0bca59 100644
--- a/bundles/org.openhab.core.model.sitemap/pom.xml
+++ b/bundles/org.openhab.core.model.sitemap/pom.xml
@@ -52,7 +52,7 @@
           <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <arguments>
-            <argument>file://${project.basedir}/src/org/eclipse/smarthome/model/GenerateSitemap.mwe2</argument>
+            <argument>file://${project.basedir}/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2</argument>
             <argument>-p</argument>
             <argument>rootPath=/${project.basedir}/..</argument>
           </arguments>
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/GenerateSitemap.mwe2 b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2
similarity index 92%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/GenerateSitemap.mwe2
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2
index b7028a348..e6be9976f 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/GenerateSitemap.mwe2
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-module org.eclipse.smarthome.model.GenerateSitemap
+module org.eclipse.smarthome.model.sitemap.GenerateSitemap
 
 import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
 
 var rootPath = ".."
 var projectName = "org.openhab.core.model.sitemap"
-var languageName = "org.eclipse.smarthome.model.Sitemap"
+var languageName = "org.eclipse.smarthome.model.sitemap.Sitemap"
 var fileExtensions = "sitemap"
 var generateXtendStub = true
 var encoding = "UTF-8"
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.properties b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.properties
similarity index 53%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.properties
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.properties
index 8d83c4f45..ce789b8c3 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.properties
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.properties
@@ -1,3 +1,3 @@
-grammarURI=classpath:/org/openhab/model/Sitemap.xtext
+grammarURI=classpath:/org/openhab/model/sitemap/Sitemap.xtext
 file.extensions=sitemap
 projectName=org.eclipse.smarthome.model.sitemap
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.xtext b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.xtext
similarity index 98%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.xtext
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.xtext
index 026ba283a..5ec683692 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/Sitemap.xtext
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.xtext
@@ -1,4 +1,4 @@
-grammar org.eclipse.smarthome.model.Sitemap with org.eclipse.xtext.common.Terminals
+grammar org.eclipse.smarthome.model.sitemap.Sitemap with org.eclipse.xtext.common.Terminals
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 generate sitemap "http://www.eclipse.org/smarthome/model/Sitemap"
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapProvider.java b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapProvider.java
index dd4c06206..aab431bc2 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapProvider.java
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapProvider.java
@@ -14,9 +14,11 @@ package org.eclipse.smarthome.model.sitemap;
 
 import java.util.Set;
 
+
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
 
 @NonNullByDefault
 public interface SitemapProvider {
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapRuntimeModule.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapRuntimeModule.xtend
similarity index 83%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapRuntimeModule.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapRuntimeModule.xtend
index 18b489a29..b5a14670a 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapRuntimeModule.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapRuntimeModule.xtend
@@ -14,9 +14,9 @@ package
 /*
  * generated by Xtext
  */
-org.eclipse.smarthome.model
+org.eclipse.smarthome.model.sitemap
 
-import org.eclipse.smarthome.model.valueconverter.SitemapConverters
+import org.eclipse.smarthome.model.sitemap.valueconverter.SitemapConverters
 import org.eclipse.xtext.conversion.IValueConverterService
 import org.eclipse.xtext.linking.lazy.LazyURIEncoder
 import com.google.inject.Binder
@@ -25,7 +25,7 @@ import com.google.inject.name.Names
 /** 
  * Use this class to register components to be used at runtime / without the Equinox extension registry.
  */
-class SitemapRuntimeModule extends org.eclipse.smarthome.model.AbstractSitemapRuntimeModule {
+class SitemapRuntimeModule extends org.eclipse.smarthome.model.sitemap.AbstractSitemapRuntimeModule {
     override Class<? extends IValueConverterService> bindIValueConverterService() {
         return SitemapConverters
     }
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapStandaloneSetup.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapStandaloneSetup.xtend
similarity index 96%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapStandaloneSetup.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapStandaloneSetup.xtend
index f77ea4288..b733a6057 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/SitemapStandaloneSetup.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapStandaloneSetup.xtend
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model
+package org.eclipse.smarthome.model.sitemap
 
 import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.resource.Resource
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/formatting/SitemapFormatter.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/formatting/SitemapFormatter.xtend
similarity index 96%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/formatting/SitemapFormatter.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/formatting/SitemapFormatter.xtend
index b44331730..f400b9c19 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/formatting/SitemapFormatter.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/formatting/SitemapFormatter.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.formatting
+package org.eclipse.smarthome.model.sitemap.formatting
 
 import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter
 import org.eclipse.xtext.formatting.impl.FormattingConfig
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/generator/SitemapGenerator.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/generator/SitemapGenerator.xtend
similarity index 95%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/generator/SitemapGenerator.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/generator/SitemapGenerator.xtend
index 20bc588f2..3a9b40be7 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/generator/SitemapGenerator.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/generator/SitemapGenerator.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.generator
+package org.eclipse.smarthome.model.sitemap.generator
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.xtext.generator.AbstractGenerator
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/internal/SitemapProviderImpl.java b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/internal/SitemapProviderImpl.java
index b615fdfb4..8506e30e2 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/internal/SitemapProviderImpl.java
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/internal/SitemapProviderImpl.java
@@ -25,7 +25,7 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.smarthome.model.core.EventType;
 import org.eclipse.smarthome.model.core.ModelRepository;
 import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener;
-import org.eclipse.smarthome.model.sitemap.Sitemap;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
 import org.eclipse.smarthome.model.sitemap.SitemapProvider;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/scoping/SitemapScopeProvider.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/scoping/SitemapScopeProvider.xtend
similarity index 92%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/scoping/SitemapScopeProvider.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/scoping/SitemapScopeProvider.xtend
index 346924964..fa6eda10e 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/scoping/SitemapScopeProvider.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/scoping/SitemapScopeProvider.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.scoping
+package org.eclipse.smarthome.model.sitemap.scoping
 
 /**
  * This class contains custom scoping description.
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSemanticSequencer.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSemanticSequencer.xtend
similarity index 90%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSemanticSequencer.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSemanticSequencer.xtend
index 6e62544eb..99f844740 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSemanticSequencer.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSemanticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.serializer
+package org.eclipse.smarthome.model.sitemap.serializer
 
 
 class SitemapSemanticSequencer extends AbstractSitemapSemanticSequencer {
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSyntacticSequencer.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSyntacticSequencer.xtend
similarity index 90%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSyntacticSequencer.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSyntacticSequencer.xtend
index 59313855a..7c14985f9 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/serializer/SitemapSyntacticSequencer.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSyntacticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.serializer
+package org.eclipse.smarthome.model.sitemap.serializer
 
 
 class SitemapSyntacticSequencer extends AbstractSitemapSyntacticSequencer {
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/validation/SitemapValidator.xtend b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/validation/SitemapValidator.xtend
similarity index 88%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/validation/SitemapValidator.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/validation/SitemapValidator.xtend
index 2926fe2fd..363b9ccb3 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/validation/SitemapValidator.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/validation/SitemapValidator.xtend
@@ -13,15 +13,15 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.validation
+package org.eclipse.smarthome.model.sitemap.validation
 
-import org.eclipse.smarthome.model.sitemap.Frame
-import org.eclipse.smarthome.model.sitemap.LinkableWidget
-import org.eclipse.smarthome.model.sitemap.Sitemap
-import org.eclipse.smarthome.model.sitemap.SitemapPackage
-import org.eclipse.smarthome.model.sitemap.Widget
+import org.eclipse.smarthome.model.sitemap.sitemap.Frame
+import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget
+import org.eclipse.smarthome.model.sitemap.sitemap.Setpoint
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap
+import org.eclipse.smarthome.model.sitemap.sitemap.SitemapPackage
+import org.eclipse.smarthome.model.sitemap.sitemap.Widget
 import org.eclipse.xtext.validation.Check
-import org.eclipse.smarthome.model.sitemap.Setpoint
 import java.math.BigDecimal
 
 //import org.eclipse.xtext.validation.Check
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/valueconverter/SitemapConverters.java b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/valueconverter/SitemapConverters.java
similarity index 97%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/valueconverter/SitemapConverters.java
rename to bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/valueconverter/SitemapConverters.java
index 83f6d37cb..bdc36a63b 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/valueconverter/SitemapConverters.java
+++ b/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/valueconverter/SitemapConverters.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.valueconverter;
+package org.eclipse.smarthome.model.sitemap.valueconverter;
 
 import java.util.regex.Pattern;
 
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java
index 660102765..b7f9e27ef 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java
@@ -74,17 +74,17 @@ import org.eclipse.smarthome.core.types.StateOption;
 import org.eclipse.smarthome.core.types.Type;
 import org.eclipse.smarthome.core.types.UnDefType;
 import org.eclipse.smarthome.core.types.util.UnitUtils;
-import org.eclipse.smarthome.model.sitemap.ColorArray;
-import org.eclipse.smarthome.model.sitemap.Default;
-import org.eclipse.smarthome.model.sitemap.Group;
-import org.eclipse.smarthome.model.sitemap.LinkableWidget;
-import org.eclipse.smarthome.model.sitemap.Mapping;
-import org.eclipse.smarthome.model.sitemap.Sitemap;
-import org.eclipse.smarthome.model.sitemap.SitemapFactory;
-import org.eclipse.smarthome.model.sitemap.Slider;
-import org.eclipse.smarthome.model.sitemap.Switch;
-import org.eclipse.smarthome.model.sitemap.VisibilityRule;
-import org.eclipse.smarthome.model.sitemap.Widget;
+import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray;
+import org.eclipse.smarthome.model.sitemap.sitemap.Default;
+import org.eclipse.smarthome.model.sitemap.sitemap.Group;
+import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget;
+import org.eclipse.smarthome.model.sitemap.sitemap.Mapping;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
+import org.eclipse.smarthome.model.sitemap.sitemap.SitemapFactory;
+import org.eclipse.smarthome.model.sitemap.sitemap.Slider;
+import org.eclipse.smarthome.model.sitemap.sitemap.Switch;
+import org.eclipse.smarthome.model.sitemap.sitemap.VisibilityRule;
+import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
 import org.eclipse.smarthome.ui.internal.UIActivator;
 import org.eclipse.smarthome.ui.items.ItemUIProvider;
 import org.eclipse.smarthome.ui.items.ItemUIRegistry;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletService.java b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletService.java
index 3bc341a6a..c75a8e436 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletService.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletService.java
@@ -34,10 +34,10 @@ import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.smarthome.core.library.types.StringType;
 import org.eclipse.smarthome.core.types.State;
 import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.sitemap.Image;
-import org.eclipse.smarthome.model.sitemap.Sitemap;
-import org.eclipse.smarthome.model.sitemap.Video;
-import org.eclipse.smarthome.model.sitemap.Widget;
+import org.eclipse.smarthome.model.sitemap.sitemap.Image;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
+import org.eclipse.smarthome.model.sitemap.sitemap.Video;
+import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
 import org.eclipse.smarthome.ui.items.ItemUIRegistry;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIProvider.java b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIProvider.java
index fa06446ad..f64e00463 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIProvider.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIProvider.java
@@ -15,7 +15,7 @@ package org.eclipse.smarthome.ui.items;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.model.sitemap.Widget;
+import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
 
 /**
  * This interface describes the methods that need to be implemented by a provider that
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIRegistry.java b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIRegistry.java
index 28f8789c9..17afc8801 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIRegistry.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIRegistry.java
@@ -22,9 +22,9 @@ import org.eclipse.smarthome.core.items.Item;
 import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.eclipse.smarthome.core.library.types.QuantityType;
 import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.model.sitemap.LinkableWidget;
-import org.eclipse.smarthome.model.sitemap.Sitemap;
-import org.eclipse.smarthome.model.sitemap.Widget;
+import org.eclipse.smarthome.model.sitemap.sitemap.LinkableWidget;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
+import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
 
 /**
  * This interface is used by a service which combines the core item registry
diff --git a/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java b/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java
index 056b94a90..58fa1de75 100644
--- a/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java
+++ b/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java
@@ -40,13 +40,13 @@ import org.eclipse.smarthome.core.types.StateDescription;
 import org.eclipse.smarthome.core.types.StateOption;
 import org.eclipse.smarthome.core.types.UnDefType;
 import org.eclipse.smarthome.core.types.util.UnitUtils;
-import org.eclipse.smarthome.model.sitemap.ColorArray;
-import org.eclipse.smarthome.model.sitemap.Mapping;
-import org.eclipse.smarthome.model.sitemap.Sitemap;
-import org.eclipse.smarthome.model.sitemap.SitemapFactory;
-import org.eclipse.smarthome.model.sitemap.Slider;
-import org.eclipse.smarthome.model.sitemap.Switch;
-import org.eclipse.smarthome.model.sitemap.Widget;
+import org.eclipse.smarthome.model.sitemap.sitemap.ColorArray;
+import org.eclipse.smarthome.model.sitemap.sitemap.Mapping;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
+import org.eclipse.smarthome.model.sitemap.sitemap.SitemapFactory;
+import org.eclipse.smarthome.model.sitemap.sitemap.Slider;
+import org.eclipse.smarthome.model.sitemap.sitemap.Switch;
+import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
 import org.eclipse.smarthome.ui.items.ItemUIProvider;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java b/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java
index 43b1064ca..34f1d912e 100644
--- a/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java
+++ b/bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java
@@ -29,10 +29,10 @@ import org.eclipse.smarthome.core.library.types.OnOffType;
 import org.eclipse.smarthome.core.library.types.StringType;
 import org.eclipse.smarthome.core.types.UnDefType;
 import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.sitemap.Image;
-import org.eclipse.smarthome.model.sitemap.Sitemap;
-import org.eclipse.smarthome.model.sitemap.Switch;
-import org.eclipse.smarthome.model.sitemap.Video;
+import org.eclipse.smarthome.model.sitemap.sitemap.Image;
+import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
+import org.eclipse.smarthome.model.sitemap.sitemap.Switch;
+import org.eclipse.smarthome.model.sitemap.sitemap.Video;
 import org.eclipse.smarthome.ui.items.ItemUIRegistry;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
index 9f746051f..f0b17bec7 100644
--- a/features/karaf/openhab-core/src/main/feature/feature.xml
+++ b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -25,7 +25,7 @@
 
     <feature dependency="true">openhab.tp-gson</feature>
 
-    <requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.17.0)(!(version&gt;=2.18.0)))"</requirement>
+    <requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.19.0)(!(version&gt;=2.20.0)))"</requirement>
     <feature dependency="true">openhab.tp-xtext</feature>
 
     <requirement>openhab.tp;filter:="(feature=jax-rs)"</requirement>
@@ -379,10 +379,10 @@
 
   <feature name="openhab-core-model-lsp" version="${project.version}">
 
-    <requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.17.0)(!(version&gt;=2.18.0)))"</requirement>
+    <requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.19.0)(!(version&gt;=2.20.0)))"</requirement>
     <feature dependency="true">openhab.tp-xtext-ide</feature>
 
-    <requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.6.0)(!(version&gt;=0.7.0)))"</requirement>
+    <requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.8.0)(!(version&gt;=0.9.0)))"</requirement>
     <feature dependency="true">openhab.tp-lsp4j</feature>
 
     <feature>openhab-core-model-item-ide</feature>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index b8a652bdf..20014900f 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -188,9 +188,9 @@
   </feature>
 
   <feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
-    <capability>openhab.tp;feature=lsp4j;version=0.6.0</capability>
-    <bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.6.0</bundle>
-    <bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.6.0</bundle>
+    <capability>openhab.tp;feature=lsp4j;version=0.8.0</capability>
+    <bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.8.0</bundle>
+    <bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.8.0</bundle>
 
     <feature dependency="true">openhab.tp-gson</feature>
     <feature dependency="true">openhab.tp-xtext</feature>
@@ -221,51 +221,55 @@
   </feature>
 
   <feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
-    <capability>openhab.tp;feature=xtext;version=2.17.0</capability>
+    <capability>openhab.tp;feature=xtext;version=2.19.0</capability>
 
-    <bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.17.0</bundle>
+    <bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.19.0</bundle>
+
+    <bundle dependency="true">mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.35.v20190528-1517</bundle>
 
     <bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.12.0</bundle>
     <bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.12.0</bundle>
     <bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.11.0</bundle>
     <bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.12.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.17.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.19.0</bundle>
 
     <bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
 
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.17.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.17.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.17.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.17.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.17.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.17.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.19.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.19.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.19.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.19.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.19.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.19.0</bundle>
 
-    <bundle dependency="true">mvn:com.google.guava/guava/21.0</bundle>
+    <bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.1</bundle>
+    <bundle dependency="true">mvn:com.google.guava/guava/27.1-jre</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
 
     <!--<bundle dependency="true">mvn:com.google.inject/guice/3.0</bundle>-->
     <!--<bundle dependency="true">wrap:mvn:org.antlr/antlr-runtime/3.2</bundle>-->
     <!--<bundle dependency="true">wrap:mvn:aopalliance/aopalliance/1.0</bundle>-->
 
+
     <bundle dependency="true">mvn:de.maggu2810.p2redist/com.google.inject/3.0.0.v201312141243</bundle>
     <bundle dependency="true">mvn:de.maggu2810.p2redist/org.antlr.runtime/3.2.0.v201101311130</bundle>
 
-    <bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.6.100</bundle>
-    <bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.6.100</bundle>
+    <bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.10.400</bundle>
+    <bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.8.400</bundle>
+    <bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.9.0</bundle>
 
     <!-- Add ASM package -->
     <!-- org.eclipse.xtext.common.types is using Require-Bundle -->
-    <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/7.0</bundle>
+    <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/7.1</bundle>
   </feature>
 
   <feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
-    <capability>openhab.tp;feature=xtext-ide;version=2.17.0</capability>
+    <capability>openhab.tp;feature=xtext-ide;version=2.19.0</capability>
     <feature dependency="true">openhab.tp-xtext</feature>
 
     <!-- Support for the Language Server Protocol -->
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.17.0</bundle>
-    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.17.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.19.0</bundle>
+    <bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.19.0</bundle>
   </feature>
 
   <!--
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index f298dbba9..f4a60b9d1 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -18,7 +18,6 @@ Fragment-Host: org.openhab.core.automation
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	jollyday;version='[0.5.9,0.5.10)',\
 	org.apache.commons.collections;version='[3.2.1,3.2.2)',\
 	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
@@ -39,14 +38,15 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.automation;version='[2.5.0,2.5.1)',\
 	org.openhab.core.automation.tests;version='[2.5.0,2.5.1)',\
 	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
 	org.openhab.core.test;version='[2.5.0,2.5.1)',\
 	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
 	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
-	tec.uom.se;version='[1.0.10,1.0.11)'
+	tec.uom.se;version='[1.0.10,1.0.11)',\
+	jollyday;version='[0.5.9,0.5.10)',\
+	org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
+	org.threeten.extra;version='[1.5.0,1.5.1)'
diff --git a/itests/org.openhab.core.binding.xml.tests/itest.bndrun b/itests/org.openhab.core.binding.xml.tests/itest.bndrun
index 0655459b6..13dc91046 100644
--- a/itests/org.openhab.core.binding.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.binding.xml.tests/itest.bndrun
@@ -41,4 +41,5 @@ Fragment-Host: org.openhab.core.binding.xml
 	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
-	tec.uom.se;version='[1.0.10,1.0.11)'
+	tec.uom.se;version='[1.0.10,1.0.11)',\
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
index d659dd998..c7b115a79 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -45,4 +45,5 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
-	tec.uom.se;version='[1.0.10,1.0.11)'
+	tec.uom.se;version='[1.0.10,1.0.11)',\
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 514842e25..e3fca0fdd 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -39,4 +39,5 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.openhab.core.test;version='[2.5.0,2.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
-	tec.uom.se;version='[1.0.10,1.0.11)'
+	tec.uom.se;version='[1.0.10,1.0.11)',\
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.model.core.tests/itest.bndrun b/itests/org.openhab.core.model.core.tests/itest.bndrun
index 7d91ade51..6b4e2bfd4 100644
--- a/itests/org.openhab.core.model.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.core.tests/itest.bndrun
@@ -38,37 +38,46 @@ Fragment-Host: org.openhab.core.model.core
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
-	com.google.guava;version='[21.0.0,21.0.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
-	org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
-	org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
 	org.openhab.core.model.core.tests;version='[2.5.0,2.5.1)',\
 	org.openhab.core.test;version='[2.5.0,2.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
-	joda-time;version='[2.9.2,2.9.3)',\
-	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
+	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
+	org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
+	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
+	tec.uom.se;version='[1.0.10,1.0.11)',\
+	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
+	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
+	com.google.guava;version='[27.1.0,27.1.1)',\
+	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
+	org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
+	org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
+	io.github.classgraph;version='[4.8.35,4.8.36)',\
+	joda-time;version='[2.9.2,2.9.3)',\
+	jollyday;version='[0.5.9,0.5.10)',\
+	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
 	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
 	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
-	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
-	org.objectweb.asm;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
+	org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
+	org.objectweb.asm;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
 	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
 	org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
@@ -79,10 +88,10 @@ Fragment-Host: org.openhab.core.model.core
 	org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
 	org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
 	org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
 	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	org.openhab.core.transform;version='[2.5.0,2.5.1)',\
 	org.openhab.core.voice;version='[2.5.0,2.5.1)',\
@@ -92,10 +101,4 @@ Fragment-Host: org.openhab.core.model.core
 	org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
 	org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
-	jollyday;version='[0.5.9,0.5.10)',\
-	org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\
-	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
-	tec.uom.se;version='[1.0.10,1.0.11)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)'
+	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index 7e2e27dd4..f86669c15 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -40,19 +40,10 @@ Fragment-Host: org.openhab.core.model.item
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
-	com.google.guava;version='[21.0.0,21.0.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
-	org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
-	org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
-	org.objectweb.asm;version='[7.0.0,7.0.1)',\
 	org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
@@ -77,16 +68,12 @@ Fragment-Host: org.openhab.core.model.item
 	org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
-	org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
 	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
 	org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
@@ -102,4 +89,19 @@ Fragment-Host: org.openhab.core.model.item
 	org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
-	tec.uom.se;version='[1.0.10,1.0.11)'
+	tec.uom.se;version='[1.0.10,1.0.11)',\
+	com.google.guava;version='[27.1.0,27.1.1)',\
+	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
+	io.github.classgraph;version='[4.8.35,4.8.36)',\
+	org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
+	org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
+	org.objectweb.asm;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
+	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.model.persistence.tests/itest.bndrun b/itests/org.openhab.core.model.persistence.tests/itest.bndrun
index 373ab0b53..5c5f9b9b4 100644
--- a/itests/org.openhab.core.model.persistence.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.persistence.tests/itest.bndrun
@@ -40,19 +40,10 @@ Fragment-Host: org.openhab.core.model.persistence
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
-	com.google.guava;version='[21.0.0,21.0.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
-	org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
-	org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
-	org.objectweb.asm;version='[7.0.0,7.0.1)',\
 	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
@@ -72,9 +63,6 @@ Fragment-Host: org.openhab.core.model.persistence
 	org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
-	org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
 	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
 	org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
@@ -97,5 +85,17 @@ Fragment-Host: org.openhab.core.model.persistence
 	jollyday;version='[0.5.9,0.5.10)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
-	org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'
+	com.google.guava;version='[27.1.0,27.1.1)',\
+	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
+	io.github.classgraph;version='[4.8.35,4.8.36)',\
+	org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
+	org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
+	org.objectweb.asm;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.tree;version='[7.1.0,7.1.1)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index 98ec6e4ec..1b1b841c0 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -63,24 +63,12 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
-	com.google.guava;version='[21.0.0,21.0.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
 	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
 	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
-	org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
-	org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
-	org.objectweb.asm;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
@@ -102,4 +90,18 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
-	org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)'
+	com.google.guava;version='[27.1.0,27.1.1)',\
+	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
+	io.github.classgraph;version='[4.8.35,4.8.36)',\
+	org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
+	org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
+	org.objectweb.asm;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
+	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index 8d77263f6..4fd93c0fb 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -60,24 +60,12 @@ Fragment-Host: org.openhab.core.model.script
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
-	com.google.guava;version='[21.0.0,21.0.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
 	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
 	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
-	org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
-	org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
-	org.objectweb.asm;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
 	org.openhab.core.model.script.tests;version='[2.5.0,2.5.1)',\
 	org.openhab.core.test;version='[2.5.0,2.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
@@ -87,7 +75,6 @@ Fragment-Host: org.openhab.core.model.script
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
 	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
@@ -97,4 +84,19 @@ Fragment-Host: org.openhab.core.model.script
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
-	org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)'
+	com.google.guava;version='[27.1.0,27.1.1)',\
+	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
+	io.github.classgraph;version='[4.8.35,4.8.36)',\
+	org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
+	org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
+	org.objectweb.asm;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
+	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index 3acf4d3f9..81888f86c 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -81,20 +81,8 @@ Fragment-Host: org.openhab.core.model.thing
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
-	com.google.guava;version='[21.0.0,21.0.1)',\
 	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
 	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
-	org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
-	org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
-	org.objectweb.asm;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
-	org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
@@ -107,5 +95,21 @@ Fragment-Host: org.openhab.core.model.thing
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)'
+	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
+	com.google.guava;version='[27.1.0,27.1.1)',\
+	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
+	io.github.classgraph;version='[4.8.35,4.8.36)',\
+	org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
+	org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
+	org.objectweb.asm;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
+	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
 
diff --git a/itests/org.openhab.core.thing.xml.tests/itest.bndrun b/itests/org.openhab.core.thing.xml.tests/itest.bndrun
index d60ed7381..893efb552 100644
--- a/itests/org.openhab.core.thing.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.xml.tests/itest.bndrun
@@ -46,4 +46,5 @@ Fragment-Host: org.openhab.core.thing.xml
 	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
-	tec.uom.se;version='[1.0.10,1.0.11)'
+	tec.uom.se;version='[1.0.10,1.0.11)',\
+	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index 850d9fc70..b64a49484 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -46,13 +46,13 @@ Fragment-Host: org.openhab.core.voice
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
 	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
-	org.objectweb.asm;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
-	org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
 	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
-	tec.uom.se;version='[1.0.10,1.0.11)'
+	tec.uom.se;version='[1.0.10,1.0.11)',\
+	org.objectweb.asm;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
+	org.objectweb.asm.tree;version='[7.1.0,7.1.1)'
diff --git a/pom.xml b/pom.xml
index 9a22d1b11..743616f65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
     <karaf.tooling.version>4.2.6</karaf.tooling.version>
     <sat.version>0.8.0</sat.version>
     <slf4j.version>1.7.21</slf4j.version>
-    <xtext.version>2.17.0</xtext.version>
+    <xtext.version>2.19.0</xtext.version>
     <spotless.version>1.24.3</spotless.version>
     <spotless.check.skip>true</spotless.check.skip> <!-- Spotless disabled for now -->
   </properties>