From a32c974621f6f7238d8ceb4e3a788564bd15fe0a Mon Sep 17 00:00:00 2001
From: Christoph Weitkamp <github@christophweitkamp.de>
Date: Fri, 27 Dec 2019 11:09:01 +0100
Subject: [PATCH 1/3] Moved files to new location

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
---
 .../{eclipse/smarthome => openhab}/core/audio/AudioException.java | 0
 .../{eclipse/smarthome => openhab}/core/audio/AudioFormat.java    | 0
 .../smarthome => openhab}/core/audio/AudioHTTPServer.java         | 0
 .../{eclipse/smarthome => openhab}/core/audio/AudioManager.java   | 0
 .../org/{eclipse/smarthome => openhab}/core/audio/AudioSink.java  | 0
 .../{eclipse/smarthome => openhab}/core/audio/AudioSource.java    | 0
 .../{eclipse/smarthome => openhab}/core/audio/AudioStream.java    | 0
 .../smarthome => openhab}/core/audio/ByteArrayAudioStream.java    | 0
 .../smarthome => openhab}/core/audio/FileAudioStream.java         | 0
 .../smarthome => openhab}/core/audio/FixedLengthAudioStream.java  | 0
 .../{eclipse/smarthome => openhab}/core/audio/URLAudioStream.java | 0
 .../core/audio/UnsupportedAudioFormatException.java               | 0
 .../core/audio/UnsupportedAudioStreamException.java               | 0
 .../core/audio/internal/AudioConsoleCommandExtension.java         | 0
 .../core/audio/internal/AudioManagerImpl.java                     | 0
 .../smarthome => openhab}/core/audio/internal/AudioServlet.java   | 0
 .../smarthome => openhab}/core/audio/utils/AudioStreamUtils.java  | 0
 .../core/audio/internal/AbstractAudioServletTest.java             | 0
 .../core/audio/internal/AudioConsoleTest.java                     | 0
 .../core/audio/internal/AudioFormatTest.java                      | 0
 .../core/audio/internal/AudioManagerServletTest.java              | 0
 .../core/audio/internal/AudioManagerTest.java                     | 0
 .../core/audio/internal/AudioServletTest.java                     | 0
 .../core/audio/internal/fake/AudioSinkFake.java                   | 0
 .../core/audio/internal/utils/BundledSoundFileHandler.java        | 0
 .../core}/auth/jaas/internal/JaasAuthenticationProvider.java      | 0
 .../core}/auth/oauth2client/internal/Keyword.java                 | 0
 .../core}/auth/oauth2client/internal/OAuthClientServiceImpl.java  | 0
 .../core}/auth/oauth2client/internal/OAuthConnector.java          | 0
 .../core}/auth/oauth2client/internal/OAuthFactoryImpl.java        | 0
 .../core}/auth/oauth2client/internal/OAuthStoreHandler.java       | 0
 .../core}/auth/oauth2client/internal/OAuthStoreHandlerImpl.java   | 0
 .../core}/auth/oauth2client/internal/PersistedParams.java         | 0
 .../core}/auth/oauth2client/internal/StorageRecordType.java       | 0
 .../auth/oauth2client/internal/cipher/SymmetricKeyCipher.java     | 0
 .../core/binding/xml/internal/BindingInfoConverter.java           | 0
 .../core/binding/xml/internal/BindingInfoReader.java              | 0
 .../core/binding/xml/internal/BindingInfoXmlProvider.java         | 0
 .../core/binding/xml/internal/BindingInfoXmlResult.java           | 0
 .../binding/xml/internal/BindingXmlConfigDescriptionProvider.java | 0
 .../core/binding/xml/internal/XmlBindingInfoProvider.java         | 0
 .../smarthome => openhab/core}/config/core/ConfigConstants.java   | 0
 .../smarthome => openhab/core}/config/core/ConfigDescription.java | 0
 .../core}/config/core/ConfigDescriptionAliasProvider.java         | 0
 .../core}/config/core/ConfigDescriptionBuilder.java               | 0
 .../core}/config/core/ConfigDescriptionParameter.java             | 0
 .../core}/config/core/ConfigDescriptionParameterBuilder.java      | 0
 .../core}/config/core/ConfigDescriptionParameterGroup.java        | 0
 .../core}/config/core/ConfigDescriptionProvider.java              | 0
 .../core}/config/core/ConfigDescriptionRegistry.java              | 0
 .../core}/config/core/ConfigOptionProvider.java                   | 0
 .../smarthome => openhab/core}/config/core/ConfigUtil.java        | 0
 .../core}/config/core/ConfigurableService.java                    | 0
 .../smarthome => openhab/core}/config/core/Configuration.java     | 0
 .../core}/config/core/ConfigurationDeserializer.java              | 0
 .../core}/config/core/ConfigurationSerializer.java                | 0
 .../smarthome => openhab/core}/config/core/FilterCriteria.java    | 0
 .../smarthome => openhab/core}/config/core/ParameterOption.java   | 0
 .../core}/config/core/dto/ConfigDescriptionDTO.java               | 0
 .../core}/config/core/dto/ConfigDescriptionDTOMapper.java         | 0
 .../core}/config/core/dto/ConfigDescriptionParameterDTO.java      | 0
 .../core}/config/core/dto/ConfigDescriptionParameterGroupDTO.java | 0
 .../core}/config/core/dto/FilterCriteriaDTO.java                  | 0
 .../core}/config/core/dto/ParameterOptionDTO.java                 | 0
 .../core}/config/core/i18n/ConfigI18nLocalizationService.java     | 0
 .../core}/config/core/internal/ConfigMapper.java                  | 0
 .../config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java | 0
 .../config/core/internal/i18n/ConfigDescriptionI18nUtil.java      | 0
 .../config/core/internal/i18n/I18nConfigOptionsProvider.java      | 0
 .../internal/metadata/MetadataConfigDescriptionProviderImpl.java  | 0
 .../config/core/internal/net/NetworkConfigOptionProvider.java     | 0
 .../config/core/internal/normalization/AbstractNormalizer.java    | 0
 .../config/core/internal/normalization/BooleanNormalizer.java     | 0
 .../config/core/internal/normalization/DecimalNormalizer.java     | 0
 .../core}/config/core/internal/normalization/IntNormalizer.java   | 0
 .../core}/config/core/internal/normalization/ListNormalizer.java  | 0
 .../core}/config/core/internal/normalization/Normalizer.java      | 0
 .../config/core/internal/normalization/NormalizerFactory.java     | 0
 .../core}/config/core/internal/normalization/TextNormalizer.java  | 0
 .../internal/validation/ConfigDescriptionParameterValidator.java  | 0
 .../validation/ConfigDescriptionParameterValidatorFactory.java    | 0
 .../core/internal/validation/ConfigDescriptionValidatorImpl.java  | 0
 .../core}/config/core/internal/validation/MessageKey.java         | 0
 .../core}/config/core/internal/validation/MinMaxValidator.java    | 0
 .../core}/config/core/internal/validation/PatternValidator.java   | 0
 .../core}/config/core/internal/validation/RequiredValidator.java  | 0
 .../core}/config/core/internal/validation/TypeIntrospections.java | 0
 .../core}/config/core/internal/validation/TypeValidator.java      | 0
 .../config/core/metadata/MetadataConfigDescriptionProvider.java   | 0
 .../core}/config/core/status/ConfigStatusCallback.java            | 0
 .../core}/config/core/status/ConfigStatusInfo.java                | 0
 .../core}/config/core/status/ConfigStatusMessage.java             | 0
 .../core}/config/core/status/ConfigStatusProvider.java            | 0
 .../core}/config/core/status/ConfigStatusService.java             | 0
 .../core}/config/core/status/ConfigStatusSource.java              | 0
 .../core}/config/core/status/events/ConfigStatusEventFactory.java | 0
 .../core}/config/core/status/events/ConfigStatusInfoEvent.java    | 0
 .../core}/config/core/validation/ConfigDescriptionValidator.java  | 0
 .../core}/config/core/validation/ConfigValidationException.java   | 0
 .../core}/config/core/validation/ConfigValidationMessage.java     | 0
 .../core}/config/core/ConfigDescriptionBuilderTest.java           | 0
 .../core}/config/core/ConfigDescriptionParameterBuilderTest.java  | 0
 .../core}/config/core/ConfigDescriptionRegistryTest.java          | 0
 .../smarthome => openhab/core}/config/core/ConfigUtilTest.java    | 0
 .../smarthome => openhab/core}/config/core/ConfigurationTest.java | 0
 .../config/core/internal/i18n/I18nConfigOptionsProviderTest.java  | 0
 .../metadata/MetadataConfigDescriptionProviderImplTest.java       | 0
 .../core}/config/core/internal/normalization/NormalizerTest.java  | 0
 .../core/internal/validation/ConfigDescriptionValidatorTest.java  | 0
 .../core/internal/validation/ConfigValidationExceptionTest.java   | 0
 .../core}/config/core/status/ConfigStatusInfoTest.java            | 0
 .../core}/config/core/status/ConfigStatusServiceTest.java         | 0
 .../core}/config/discovery/mdns/MDNSDiscoveryParticipant.java     | 0
 .../config/discovery/mdns/internal/MDNSDiscoveryService.java      | 0
 .../core}/config/discovery/upnp/UpnpDiscoveryParticipant.java     | 0
 .../config/discovery/upnp/internal/UpnpDiscoveryService.java      | 0
 .../usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java      | 0
 .../usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java    | 0
 .../usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java      | 0
 .../discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java | 0
 .../config/discovery/usbserial/UsbSerialDeviceInformation.java    | 0
 .../core}/config/discovery/usbserial/UsbSerialDiscovery.java      | 0
 .../config/discovery/usbserial/UsbSerialDiscoveryListener.java    | 0
 .../config/discovery/usbserial/UsbSerialDiscoveryParticipant.java | 0
 .../discovery/usbserial/internal/UsbSerialDiscoveryService.java   | 0
 .../core}/config/discovery/AbstractDiscoveryService.java          | 0
 .../core}/config/discovery/DiscoveryListener.java                 | 0
 .../core}/config/discovery/DiscoveryResult.java                   | 0
 .../core}/config/discovery/DiscoveryResultBuilder.java            | 0
 .../core}/config/discovery/DiscoveryResultFlag.java               | 0
 .../core}/config/discovery/DiscoveryService.java                  | 0
 .../core}/config/discovery/DiscoveryServiceCallback.java          | 0
 .../core}/config/discovery/DiscoveryServiceRegistry.java          | 0
 .../core}/config/discovery/ExtendedDiscoveryService.java          | 0
 .../smarthome => openhab/core}/config/discovery/ScanListener.java | 0
 .../core}/config/discovery/UpnpDiscoveryParticipant.java          | 0
 .../core}/config/discovery/dto/DiscoveryResultDTO.java            | 0
 .../core}/config/discovery/dto/DiscoveryResultDTOMapper.java      | 0
 .../smarthome => openhab/core}/config/discovery/inbox/Inbox.java  | 0
 .../core}/config/discovery/inbox/InboxAutoApprovePredicate.java   | 0
 .../core}/config/discovery/inbox/InboxFilterCriteria.java         | 0
 .../core}/config/discovery/inbox/InboxListener.java               | 0
 .../core}/config/discovery/inbox/InboxPredicates.java             | 0
 .../core}/config/discovery/inbox/events/AbstractInboxEvent.java   | 0
 .../core}/config/discovery/inbox/events/InboxAddedEvent.java      | 0
 .../core}/config/discovery/inbox/events/InboxEventFactory.java    | 0
 .../core}/config/discovery/inbox/events/InboxRemovedEvent.java    | 0
 .../core}/config/discovery/inbox/events/InboxUpdatedEvent.java    | 0
 .../core}/config/discovery/internal/AutomaticInboxProcessor.java  | 0
 .../core}/config/discovery/internal/DiscoveryResultImpl.java      | 0
 .../config/discovery/internal/DiscoveryServiceRegistryImpl.java   | 0
 .../core}/config/discovery/internal/PersistentInbox.java          | 0
 .../internal/console/DiscoveryConsoleCommandExtension.java        | 0
 .../discovery/internal/console/InboxConsoleCommandExtension.java  | 0
 .../core}/config/discovery/inbox/InboxPredicatesTest.java         | 0
 .../config/discovery/inbox/events/InboxEventFactoryTest.java      | 0
 .../config/discovery/internal/AutomaticInboxProcessorTest.java    | 0
 .../core}/config/discovery/internal/DiscoveryResultImplTest.java  | 0
 .../core}/config/discovery/internal/PersistentInboxTest.java      | 0
 .../core}/config/dispatch/internal/ConfigDispatcher.java          | 0
 .../config/dispatch/internal/ConfigDispatcherFileWatcher.java     | 0
 .../config/dispatch/internal/ConfigDispatcherFileWatcherTest.java | 0
 .../core}/config/serial/internal/SerialConfigOptionProvider.java  | 0
 .../core}/config/xml/AbstractXmlBasedProvider.java                | 0
 .../core}/config/xml/AbstractXmlConfigDescriptionProvider.java    | 0
 .../core}/config/xml/ConfigDescriptionConverter.java              | 0
 .../core}/config/xml/ConfigDescriptionParameterConverter.java     | 0
 .../config/xml/ConfigDescriptionParameterGroupConverter.java      | 0
 .../core}/config/xml/ConfigXmlConfigDescriptionProvider.java      | 0
 .../core}/config/xml/FilterCriteriaConverter.java                 | 0
 .../core}/config/xml/internal/ConfigDescriptionReader.java        | 0
 .../core}/config/xml/internal/ConfigDescriptionXmlProvider.java   | 0
 .../core}/config/xml/osgi/XmlDocumentBundleTracker.java           | 0
 .../core}/config/xml/osgi/XmlDocumentProvider.java                | 0
 .../core}/config/xml/osgi/XmlDocumentProviderFactory.java         | 0
 .../core}/config/xml/util/ConverterAssertion.java                 | 0
 .../core}/config/xml/util/ConverterAttributeMapValidator.java     | 0
 .../core}/config/xml/util/ConverterValueMap.java                  | 0
 .../core}/config/xml/util/GenericUnmarshaller.java                | 0
 .../core}/config/xml/util/NodeAttributes.java                     | 0
 .../core}/config/xml/util/NodeAttributesConverter.java            | 0
 .../smarthome => openhab/core}/config/xml/util/NodeIterator.java  | 0
 .../smarthome => openhab/core}/config/xml/util/NodeList.java      | 0
 .../core}/config/xml/util/NodeListConverter.java                  | 0
 .../smarthome => openhab/core}/config/xml/util/NodeName.java      | 0
 .../smarthome => openhab/core}/config/xml/util/NodeValue.java     | 0
 .../core}/config/xml/util/NodeValueConverter.java                 | 0
 .../core}/config/xml/util/XmlDocumentReader.java                  | 0
 .../smarthome => openhab}/core/ephemeris/EphemerisManager.java    | 0
 .../core/ephemeris/internal/EphemerisManagerImpl.java             | 0
 .../core/extension/sample/internal/SampleExtensionService.java    | 0
 .../org/{eclipse/smarthome => openhab}/core/id/InstanceUUID.java  | 0
 .../smarthome => openhab}/core/id/internal/UUIDResource.java      | 0
 .../java/org/{eclipse/smarthome => openhab}/core/id/UUIDTest.java | 0
 .../core}/io/console/eclipse/internal/ConsoleSupportEclipse.java  | 0
 .../core}/io/console/eclipse/internal/OSGiConsole.java            | 0
 .../core}/io/console/karaf/internal/CommandWrapper.java           | 0
 .../core}/io/console/karaf/internal/ConsoleSupportKaraf.java      | 0
 .../core}/io/console/karaf/internal/OSGiConsole.java              | 0
 .../core}/io/console/rfc147/internal/CommandWrapper.java          | 0
 .../io/console/rfc147/internal/ConsoleCommandsContainer.java      | 0
 .../core}/io/console/rfc147/internal/ConsoleSupportRfc147.java    | 0
 .../core}/io/console/rfc147/internal/OSGiConsole.java             | 0
 .../rfc147/internal/extension/HelpConsoleCommandExtension.java    | 0
 .../{eclipse/smarthome => openhab/core}/io/console/Console.java   | 0
 .../smarthome => openhab/core}/io/console/ConsoleInterpreter.java | 0
 .../io/console/extensions/AbstractConsoleCommandExtension.java    | 0
 .../core}/io/console/extensions/ConsoleCommandExtension.java      | 0
 .../console/internal/extension/ItemConsoleCommandExtension.java   | 0
 .../internal/extension/MetadataConsoleCommandExtension.java       | 0
 .../console/internal/extension/SendConsoleCommandExtension.java   | 0
 .../console/internal/extension/StatusConsoleCommandExtension.java | 0
 .../console/internal/extension/UpdateConsoleCommandExtension.java | 0
 .../core}/io/http/auth/basic/internal/BasicChallengeHandler.java  | 0
 .../io/http/auth/basic/internal/BasicCredentialsExtractor.java    | 0
 .../core}/io/http/auth/CredentialsExtractor.java                  | 0
 .../core}/io/http/auth/internal/AuthenticationHandler.java        | 0
 .../core}/io/http/auth/internal/RedirectHandler.java              | 0
 .../org/{eclipse/smarthome => openhab/core}/io/http/Handler.java  | 0
 .../smarthome => openhab/core}/io/http/HandlerContext.java        | 0
 .../smarthome => openhab/core}/io/http/HandlerPriorities.java     | 0
 .../core}/io/http/HttpContextFactoryService.java                  | 0
 .../smarthome => openhab/core}/io/http/WrappingHttpContext.java   | 0
 .../core}/io/http/internal/BundleHttpContext.java                 | 0
 .../smarthome => openhab/core}/io/http/internal/CatchHandler.java | 0
 .../core}/io/http/internal/DefaultHandlerContext.java             | 0
 .../core}/io/http/internal/DelegatingHttpContext.java             | 0
 .../core}/io/http/internal/HttpContextFactoryServiceImpl.java     | 0
 .../core}/io/http/internal/SmartHomeHttpContext.java              | 0
 .../core}/io/http/servlet/BaseSmartHomeServlet.java               | 0
 .../core}/io/http/servlet/SmartHomeBundleServlet.java             | 0
 .../core}/io/http/servlet/SmartHomeServlet.java                   | 0
 .../core}/io/http/internal/HttpContextFactoryServiceImplTest.java | 0
 .../core}/io/monitor/internal/EventLogger.java                    | 0
 .../{eclipse/smarthome => openhab/core}/io/net/exec/ExecUtil.java | 0
 .../core}/io/net/http/ExtensibleTrustManager.java                 | 0
 .../smarthome => openhab/core}/io/net/http/HttpClientFactory.java | 0
 .../core}/io/net/http/HttpClientInitializationException.java      | 0
 .../core}/io/net/http/HttpRequestBuilder.java                     | 0
 .../{eclipse/smarthome => openhab/core}/io/net/http/HttpUtil.java | 0
 .../core}/io/net/http/TlsCertificateProvider.java                 | 0
 .../smarthome => openhab/core}/io/net/http/TlsProvider.java       | 0
 .../core}/io/net/http/TlsTrustManagerProvider.java                | 0
 .../core}/io/net/http/TrustAllTrustMananger.java                  | 0
 .../core}/io/net/http/TrustManagerProvider.java                   | 0
 .../smarthome => openhab/core}/io/net/http/WebSocketFactory.java  | 0
 .../core}/io/net/http/internal/ExtensibleTrustManagerImpl.java    | 0
 .../io/net/http/internal/TlsCertificateTrustManagerAdapter.java   | 0
 .../core}/io/net/http/internal/TrustManagerUtil.java              | 0
 .../core}/io/net/http/internal/WebClientFactoryImpl.java          | 0
 .../smarthome => openhab/core}/io/net/http/BaseHttpUtilTest.java  | 0
 .../core}/io/net/http/HttpRequestBuilderTest.java                 | 0
 .../smarthome => openhab/core}/io/net/http/HttpUtilTest.java      | 0
 .../io/net/http/internal/ExtensibleTrustManagerImplTest.java      | 0
 .../core}/io/net/http/internal/WebClientFactoryImplTest.java      | 0
 .../core}/io/rest/audio/internal/AudioMapper.java                 | 0
 .../core}/io/rest/audio/internal/AudioResource.java               | 0
 .../core}/io/rest/audio/internal/AudioSinkDTO.java                | 0
 .../core}/io/rest/audio/internal/AudioSourceDTO.java              | 0
 .../core}/io/rest/auth/internal/SmartHomeRestServletConfig.java   | 0
 .../core}/io/rest/core/config/ConfigurationService.java           | 0
 .../io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java   | 0
 .../rest/core/config/EnrichedConfigDescriptionParameterDTO.java   | 0
 .../core}/io/rest/core/internal/GsonProvider.java                 | 0
 .../core}/io/rest/core/internal/RESTCoreActivator.java            | 0
 .../core}/io/rest/core/internal/binding/BindingResource.java      | 0
 .../core}/io/rest/core/internal/channel/ChannelTypeResource.java  | 0
 .../io/rest/core/internal/config/ConfigDescriptionResource.java   | 0
 .../core}/io/rest/core/internal/discovery/DiscoveryResource.java  | 0
 .../core}/io/rest/core/internal/discovery/InboxResource.java      | 0
 .../core}/io/rest/core/internal/extensions/ExtensionResource.java | 0
 .../core}/io/rest/core/internal/item/ItemResource.java            | 0
 .../core}/io/rest/core/internal/item/MetadataSelectorMatcher.java | 0
 .../core}/io/rest/core/internal/link/ItemChannelLinkResource.java | 0
 .../io/rest/core/internal/persistence/PersistenceResource.java    | 0
 .../core}/io/rest/core/internal/profile/ProfileTypeResource.java  | 0
 .../rest/core/internal/service/ConfigurableServiceResource.java   | 0
 .../core}/io/rest/core/internal/thing/ThingResource.java          | 0
 .../core}/io/rest/core/internal/thing/ThingTypeResource.java      | 0
 .../core}/io/rest/core/item/EnrichedGroupItemDTO.java             | 0
 .../core}/io/rest/core/item/EnrichedItemDTO.java                  | 0
 .../core}/io/rest/core/item/EnrichedItemDTOMapper.java            | 0
 .../core}/io/rest/core/persistence/ItemHistoryListDTO.java        | 0
 .../core}/io/rest/core/service/ConfigurableServiceDTO.java        | 0
 .../core}/io/rest/core/thing/EnrichedChannelDTO.java              | 0
 .../core}/io/rest/core/thing/EnrichedThingDTO.java                | 0
 .../core}/io/rest/core/thing/EnrichedThingDTOMapper.java          | 0
 .../rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java  | 0
 .../io/rest/core/internal/channel/ChannelTypeResourceTest.java    | 0
 .../io/rest/core/internal/item/MetadataSelectorMatcherTest.java   | 0
 .../core}/io/rest/core/item/EnrichedItemDTOMapperTest.java        | 0
 .../core}/io/rest/core/thing/EnrichedThingDTOMapperTest.java      | 0
 .../core}/io/rest/log/internal/LogConstants.java                  | 0
 .../core}/io/rest/log/internal/LogHandler.java                    | 0
 .../core}/io/rest/mdns/internal/MDNSAnnouncer.java                | 0
 .../core}/io/rest/optimize/internal/Activator.java                | 0
 .../core}/io/rest/optimize/internal/ResourceFilterImpl.java       | 0
 .../core}/io/rest/sitemap/SitemapSubscriptionService.java         | 0
 .../core}/io/rest/sitemap/internal/MappingDTO.java                | 0
 .../core}/io/rest/sitemap/internal/PageChangeListener.java        | 0
 .../core}/io/rest/sitemap/internal/PageDTO.java                   | 0
 .../core}/io/rest/sitemap/internal/ServerAliveEvent.java          | 0
 .../core}/io/rest/sitemap/internal/SitemapChangedEvent.java       | 0
 .../core}/io/rest/sitemap/internal/SitemapDTO.java                | 0
 .../core}/io/rest/sitemap/internal/SitemapEvent.java              | 0
 .../core}/io/rest/sitemap/internal/SitemapEventOutput.java        | 0
 .../core}/io/rest/sitemap/internal/SitemapResource.java           | 0
 .../core}/io/rest/sitemap/internal/SitemapWidgetEvent.java        | 0
 .../core}/io/rest/sitemap/internal/WidgetDTO.java                 | 0
 .../core}/io/rest/sitemap/internal/SitemapResourceTest.java       | 0
 .../smarthome => openhab/core}/io/rest/sse/SseResource.java       | 0
 .../smarthome => openhab/core}/io/rest/sse/beans/EventBean.java   | 0
 .../core}/io/rest/sse/internal/SseActivator.java                  | 0
 .../core}/io/rest/sse/internal/SseEventOutput.java                | 0
 .../core}/io/rest/sse/internal/listeners/SseEventSubscriber.java  | 0
 .../core}/io/rest/sse/internal/util/SseUtil.java                  | 0
 .../core}/io/rest/sse/internal/util/SseUtilTest.java              | 0
 .../core}/io/rest/voice/internal/HLIMapper.java                   | 0
 .../core}/io/rest/voice/internal/HumanLanguageInterpreterDTO.java | 0
 .../core}/io/rest/voice/internal/VoiceDTO.java                    | 0
 .../core}/io/rest/voice/internal/VoiceMapper.java                 | 0
 .../core}/io/rest/voice/internal/VoiceResource.java               | 0
 .../{eclipse/smarthome => openhab/core}/io/rest/DTOMapper.java    | 0
 .../{eclipse/smarthome => openhab/core}/io/rest/JSONResponse.java | 0
 .../smarthome => openhab/core}/io/rest/LocaleService.java         | 0
 .../smarthome => openhab/core}/io/rest/LocaleServiceImpl.java     | 0
 .../smarthome => openhab/core}/io/rest/RESTConstants.java         | 0
 .../{eclipse/smarthome => openhab/core}/io/rest/RESTResource.java | 0
 .../core}/io/rest/Stream2JSONInputStream.java                     | 0
 .../smarthome => openhab/core}/io/rest/internal/Constants.java    | 0
 .../core}/io/rest/internal/DTOMapperImpl.java                     | 0
 .../core}/io/rest/internal/filter/CorsFilter.java                 | 0
 .../core}/io/rest/internal/filter/ProxyFilter.java                | 0
 .../core}/io/rest/internal/filter/SatisfiableResourceFilter.java  | 0
 .../core}/io/rest/internal/resources/RootResource.java            | 0
 .../core}/io/rest/internal/resources/beans/RootBean.java          | 0
 .../smarthome => openhab/core}/io/rest/JSONResponseTest.java      | 0
 .../core}/io/rest/Stream2JSONInputStreamTest.java                 | 0
 .../core}/io/rest/internal/filter/CorsFilterTest.java             | 0
 .../core}/io/rest/internal/filter/ProxyFilterTest.java            | 0
 .../io/rest/internal/filter/SatisfiableResourceFilterTest.java    | 0
 .../smarthome => openhab/core}/io/transport/mdns/MDNSClient.java  | 0
 .../smarthome => openhab/core}/io/transport/mdns/MDNSService.java | 0
 .../core}/io/transport/mdns/ServiceDescription.java               | 0
 .../io/transport/mdns/discovery/MDNSDiscoveryParticipant.java     | 0
 .../core}/io/transport/mdns/internal/MDNSActivator.java           | 0
 .../core}/io/transport/mdns/internal/MDNSClientImpl.java          | 0
 .../core}/io/transport/mdns/internal/MDNSServiceImpl.java         | 0
 .../core}/io/transport/mqtt/MqttActionCallback.java               | 0
 .../core}/io/transport/mqtt/MqttBrokerConnection.java             | 0
 .../core}/io/transport/mqtt/MqttBrokerConnectionConfig.java       | 0
 .../core}/io/transport/mqtt/MqttConnectionObserver.java           | 0
 .../core}/io/transport/mqtt/MqttConnectionState.java              | 0
 .../core}/io/transport/mqtt/MqttException.java                    | 0
 .../core}/io/transport/mqtt/MqttMessageSubscriber.java            | 0
 .../smarthome => openhab/core}/io/transport/mqtt/MqttService.java | 0
 .../core}/io/transport/mqtt/MqttServiceObserver.java              | 0
 .../core}/io/transport/mqtt/MqttWillAndTestament.java             | 0
 .../core}/io/transport/mqtt/internal/ClientCallback.java          | 0
 .../mqtt/internal/MqttBrokerConnectionServiceInstance.java        | 0
 .../mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java  | 0
 .../core}/io/transport/mqtt/internal/MqttServiceImpl.java         | 0
 .../core}/io/transport/mqtt/internal/TopicSubscribers.java        | 0
 .../transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java   | 0
 .../transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java   | 0
 .../io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java | 0
 .../io/transport/mqtt/reconnect/AbstractReconnectStrategy.java    | 0
 .../io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java    | 0
 .../core}/io/transport/mqtt/ssl/CustomTrustManagerFactory.java    | 0
 .../mqtt/sslcontext/AcceptAllCertificatesSSLContext.java          | 0
 .../io/transport/mqtt/sslcontext/CustomSSLContextProvider.java    | 0
 .../core}/io/transport/mqtt/sslcontext/SSLContextProvider.java    | 0
 .../core}/io/transport/mqtt/MqttBrokerConnectionEx.java           | 0
 .../core}/io/transport/mqtt/MqttBrokerConnectionTests.java        | 0
 .../core}/io/transport/mqtt/internal/MqttServiceTests.java        | 0
 .../core}/io/transport/mqtt/internal/TopicSubscriberTests.java    | 0
 .../core}/io/transport/serial/internal/JavaCommPortProvider.java  | 0
 .../core}/io/transport/serial/internal/SerialPortEventImpl.java   | 0
 .../io/transport/serial/internal/SerialPortIdentifierImpl.java    | 0
 .../core}/io/transport/serial/internal/SerialPortImpl.java        | 0
 .../serial/rxtx/rfc2217/internal/RFC2217PortProvider.java         | 0
 .../serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java    | 0
 .../core}/io/transport/serial/internal/RxTxPortProvider.java      | 0
 .../core}/io/transport/serial/internal/SerialPortEventImpl.java   | 0
 .../io/transport/serial/internal/SerialPortIdentifierImpl.java    | 0
 .../core}/io/transport/serial/internal/SerialPortUtil.java        | 0
 .../core}/io/transport/serial/rxtx/RxTxSerialPort.java            | 0
 .../core}/io/transport/serial/PortInUseException.java             | 0
 .../core}/io/transport/serial/ProtocolType.java                   | 0
 .../core}/io/transport/serial/SerialPort.java                     | 0
 .../core}/io/transport/serial/SerialPortEvent.java                | 0
 .../core}/io/transport/serial/SerialPortEventListener.java        | 0
 .../core}/io/transport/serial/SerialPortIdentifier.java           | 0
 .../core}/io/transport/serial/SerialPortManager.java              | 0
 .../core}/io/transport/serial/SerialPortProvider.java             | 0
 .../io/transport/serial/UnsupportedCommOperationException.java    | 0
 .../core}/io/transport/serial/internal/SerialPortManagerImpl.java | 0
 .../core}/io/transport/serial/internal/SerialPortRegistry.java    | 0
 .../transport/serial/internal/console/SerialCommandExtension.java | 0
 .../core}/io/transport/upnp/UpnpIOParticipant.java                | 0
 .../core}/io/transport/upnp/UpnpIOService.java                    | 0
 .../core}/io/transport/upnp/internal/UpnpIOServiceImpl.java       | 0
 .../core}/io/transport/upnp/internal/UpnpIOServiceTest.java       | 0
 .../{eclipse/smarthome => openhab/core}/model/core/EventType.java | 0
 .../smarthome => openhab/core}/model/core/ModelCoreConstants.java | 0
 .../smarthome => openhab/core}/model/core/ModelParser.java        | 0
 .../smarthome => openhab/core}/model/core/ModelRepository.java    | 0
 .../core}/model/core/ModelRepositoryChangeListener.java           | 0
 .../{eclipse/smarthome => openhab/core}/model/core/SafeEMF.java   | 0
 .../core}/model/core/internal/ModelCoreActivator.java             | 0
 .../core}/model/core/internal/ModelRepositoryImpl.java            | 0
 .../core}/model/core/internal/SafeEMFImpl.java                    | 0
 .../core}/model/core/internal/folder/FolderObserver.java          | 0
 .../core}/model/core/internal/util/MathUtils.java                 | 0
 .../model/core/valueconverter/ValueTypeToStringConverter.java     | 0
 .../smarthome => openhab/core}/model/ide/ItemsIdeModule.xtend     | 0
 .../smarthome => openhab/core}/model/ide/ItemsIdeSetup.xtend      | 0
 .../core}/model/item/runtime/internal/ItemRuntimeActivator.java   | 0
 .../{eclipse/smarthome => openhab/core}/model/GenerateItems.mwe2  | 0
 .../src/org/{eclipse/smarthome => openhab/core}/model/Items.xtext | 0
 .../smarthome => openhab/core}/model/ItemsRuntimeModule.xtend     | 0
 .../smarthome => openhab/core}/model/ItemsStandaloneSetup.xtend   | 0
 .../core}/model/formatting/ItemsFormatter.xtend                   | 0
 .../core}/model/generator/ItemsGenerator.xtend                    | 0
 .../core}/model/internal/valueconverter/ItemValueConverters.java  | 0
 .../core}/model/item/BindingConfigParseException.java             | 0
 .../core}/model/item/BindingConfigReader.java                     | 0
 .../core}/model/item/internal/GenericItemProvider.java            | 0
 .../core}/model/item/internal/GenericMetadataProvider.java        | 0
 .../core}/model/scoping/ItemsScopeProvider.xtend                  | 0
 .../core}/model/serializer/ItemsSemanticSequencer.xtend           | 0
 .../core}/model/serializer/ItemsSyntacticSequencer.xtend          | 0
 .../core}/model/validation/ItemsValidator.xtend                   | 0
 .../core}/model/lazygen/GlobalResourceSet.java                    | 0
 .../smarthome => openhab/core}/model/lazygen/LazyGenerator.java   | 0
 .../core}/model/lazygen/LazyLanguageConfig.java                   | 0
 .../core}/model/lazygen/LazyStandaloneSetup.java                  | 0
 .../core}/model/lsp/internal/MappingUriExtensions.java            | 0
 .../core}/model/lsp/internal/ModelServer.java                     | 0
 .../core}/model/lsp/internal/RegistryProvider.java                | 0
 .../core}/model/lsp/internal/RuntimeServerModule.java             | 0
 .../core}/model/lsp/internal/MappingUriExtensionsTest.java        | 0
 .../core}/model/persistence/ide/PersistenceIdeModule.xtend        | 0
 .../core}/model/persistence/ide/PersistenceIdeSetup.xtend         | 0
 .../persistence/runtime/internal/PersistenceRuntimeActivator.java | 0
 .../core}/model/persistence/GeneratePersistence.mwe2              | 0
 .../core}/model/persistence/Persistence.xtext                     | 0
 .../core}/model/persistence/PersistenceRuntimeModule.xtend        | 0
 .../core}/model/persistence/PersistenceStandaloneSetup.xtend      | 0
 .../core}/model/persistence/extensions/PersistenceExtensions.java | 0
 .../core}/model/persistence/formatting/PersistenceFormatter.xtend | 0
 .../core}/model/persistence/generator/PersistenceGenerator.xtend  | 0
 .../core}/model/persistence/internal/PersistenceModelManager.java | 0
 .../core}/model/persistence/scoping/GlobalStrategies.java         | 0
 .../model/persistence/scoping/PersistenceGlobalScopeProvider.java | 0
 .../model/persistence/scoping/PersistenceScopeProvider.xtend      | 0
 .../persistence/serializer/PersistenceSemanticSequencer.xtend     | 0
 .../persistence/serializer/PersistenceSyntacticSequencer.xtend    | 0
 .../core}/model/persistence/validation/PersistenceValidator.xtend | 0
 .../core}/model/rule/ide/RulesIdeModule.xtend                     | 0
 .../smarthome => openhab/core}/model/rule/ide/RulesIdeSetup.xtend | 0
 .../smarthome => openhab/core}/model/rule/runtime/RuleEngine.java | 0
 .../core}/model/rule/runtime/internal/RuleRuntimeActivator.java   | 0
 .../core}/model/rule/runtime/internal/engine/ExecuteRuleJob.java  | 0
 .../model/rule/runtime/internal/engine/GuiceAwareJobFactory.java  | 0
 .../model/rule/runtime/internal/engine/RuleContextHelper.java     | 0
 .../core}/model/rule/runtime/internal/engine/RuleEngineImpl.java  | 0
 .../model/rule/runtime/internal/engine/RuleEvaluationContext.java | 0
 .../model/rule/runtime/internal/engine/RuleTriggerManager.java    | 0
 .../smarthome => openhab/core}/model/rule/GenerateRules.mwe2      | 0
 .../{eclipse/smarthome => openhab/core}/model/rule/Rules.xtext    | 0
 .../core}/model/rule/RulesRuntimeModule.xtend                     | 0
 .../core}/model/rule/RulesStandaloneSetup.xtend                   | 0
 .../core}/model/rule/formatting/RulesFormatter.xtend              | 0
 .../core}/model/rule/jvmmodel/RulesItemRefresher.java             | 0
 .../core}/model/rule/jvmmodel/RulesJvmModelInferrer.xtend         | 0
 .../core}/model/rule/jvmmodel/RulesRefresher.java                 | 0
 .../core}/model/rule/jvmmodel/RulesThingRefresher.java            | 0
 .../core}/model/rule/scoping/RulesImplicitlyImportedTypes.java    | 0
 .../core}/model/rule/scoping/RulesScopeProvider.xtend             | 0
 .../core}/model/rule/serializer/RulesSemanticSequencer.xtend      | 0
 .../core}/model/rule/serializer/RulesSyntacticSequencer.xtend     | 0
 .../core}/model/rule/validation/RulesValidator.xtend              | 0
 .../core}/model/script/ide/ScriptIdeModule.xtend                  | 0
 .../core}/model/script/ide/ScriptIdeSetup.xtend                   | 0
 .../core}/model/script/runtime/ScriptRuntime.java                 | 0
 .../model/script/runtime/internal/engine/ScriptEngineImpl.java    | 0
 .../core}/model/script/runtime/internal/engine/ScriptImpl.java    | 0
 .../smarthome => openhab/core}/model/script/GenerateScript.mwe2   | 0
 .../model/script/OptimizingFeatureScopeTrackerProvider2.java      | 0
 .../{eclipse/smarthome => openhab/core}/model/script/Script.xtext | 0
 .../core}/model/script/ScriptRuntimeModule.xtend                  | 0
 .../core}/model/script/ScriptServiceUtil.java                     | 0
 .../core}/model/script/ScriptStandaloneSetup.xtend                | 0
 .../smarthome => openhab/core}/model/script/ServiceModule.java    | 0
 .../smarthome => openhab/core}/model/script/actions/Audio.java    | 0
 .../smarthome => openhab/core}/model/script/actions/BusEvent.java | 0
 .../core}/model/script/actions/Ephemeris.java                     | 0
 .../smarthome => openhab/core}/model/script/actions/Exec.java     | 0
 .../smarthome => openhab/core}/model/script/actions/HTTP.java     | 0
 .../core}/model/script/actions/LogAction.java                     | 0
 .../smarthome => openhab/core}/model/script/actions/Ping.java     | 0
 .../core}/model/script/actions/ScriptExecution.java               | 0
 .../smarthome => openhab/core}/model/script/actions/Things.java   | 0
 .../smarthome => openhab/core}/model/script/actions/Timer.java    | 0
 .../smarthome => openhab/core}/model/script/actions/Voice.java    | 0
 .../core}/model/script/engine/IActionServiceProvider.java         | 0
 .../core}/model/script/engine/IThingActionsProvider.java          | 0
 .../smarthome => openhab/core}/model/script/engine/Script.java    | 0
 .../core}/model/script/engine/ScriptEngine.java                   | 0
 .../core}/model/script/engine/ScriptError.java                    | 0
 .../core}/model/script/engine/ScriptException.java                | 0
 .../core}/model/script/engine/ScriptExecutionException.java       | 0
 .../core}/model/script/engine/ScriptParsingException.java         | 0
 .../core}/model/script/engine/action/ActionDoc.java               | 0
 .../core}/model/script/engine/action/ActionService.java           | 0
 .../core}/model/script/engine/action/ParamDoc.java                | 0
 .../script/extension/ScriptEngineConsoleCommandExtension.java     | 0
 .../core}/model/script/formatting/ScriptFormatter.xtend           | 0
 .../core}/model/script/internal/RuleHumanLanguageInterpreter.java | 0
 .../core}/model/script/internal/ScriptEncodingProvider.java       | 0
 .../core}/model/script/internal/actions/TimerExecutionJob.java    | 0
 .../core}/model/script/internal/actions/TimerImpl.java            | 0
 .../internal/engine/ServiceTrackerActionServiceProvider.xtend     | 0
 .../internal/engine/ServiceTrackerThingActionsProvider.xtend      | 0
 .../model/script/internal/engine/action/AudioActionService.java   | 0
 .../script/internal/engine/action/EphemerisActionService.java     | 0
 .../script/internal/engine/action/PersistenceActionService.java   | 0
 .../model/script/internal/engine/action/ThingActionService.java   | 0
 .../internal/engine/action/TransformationActionService.java       | 0
 .../model/script/internal/engine/action/VoiceActionService.java   | 0
 .../core}/model/script/interpreter/ScriptInterpreter.xtend        | 0
 .../core}/model/script/jvmmodel/ScriptItemRefresher.java          | 0
 .../core}/model/script/jvmmodel/ScriptJvmModelInferrer.xtend      | 0
 .../core}/model/script/jvmmodel/ScriptTypeComputer.java           | 0
 .../core}/model/script/lib/NumberExtensions.java                  | 0
 .../core}/model/script/scoping/ActionClassLoader.java             | 0
 .../core}/model/script/scoping/ScriptImplicitlyImportedTypes.java | 0
 .../script/scoping/ScriptImportSectionNamespaceScopeProvider.java | 0
 .../core}/model/script/scoping/ScriptScopeProvider.xtend          | 0
 .../core}/model/script/scoping/StateAndCommandProvider.java       | 0
 .../core}/model/script/serializer/ScriptSemanticSequencer.xtend   | 0
 .../core}/model/script/serializer/ScriptSyntacticSequencer.xtend  | 0
 .../core}/model/script/validation/ScriptValidator.xtend           | 0
 .../core}/model/sitemap/ide/SitemapIdeModule.xtend                | 0
 .../core}/model/sitemap/ide/SitemapIdeSetup.xtend                 | 0
 .../model/sitemap/runtime/internal/SitemapRuntimeActivator.java   | 0
 .../smarthome => openhab/core}/model/sitemap/GenerateSitemap.mwe2 | 0
 .../smarthome => openhab/core}/model/sitemap/Sitemap.properties   | 0
 .../smarthome => openhab/core}/model/sitemap/Sitemap.xtext        | 0
 .../smarthome => openhab/core}/model/sitemap/SitemapProvider.java | 0
 .../core}/model/sitemap/SitemapRuntimeModule.xtend                | 0
 .../core}/model/sitemap/SitemapStandaloneSetup.xtend              | 0
 .../core}/model/sitemap/formatting/SitemapFormatter.xtend         | 0
 .../core}/model/sitemap/generator/SitemapGenerator.xtend          | 0
 .../core}/model/sitemap/internal/SitemapProviderImpl.java         | 0
 .../core}/model/sitemap/scoping/SitemapScopeProvider.xtend        | 0
 .../core}/model/sitemap/serializer/SitemapSemanticSequencer.xtend | 0
 .../model/sitemap/serializer/SitemapSyntacticSequencer.xtend      | 0
 .../core}/model/sitemap/validation/SitemapValidator.xtend         | 0
 .../core}/model/sitemap/valueconverter/SitemapConverters.java     | 0
 .../core}/model/thing/ide/ThingIdeModule.xtend                    | 0
 .../core}/model/thing/ide/ThingIdeSetup.xtend                     | 0
 .../core}/model/thing/runtime/internal/ThingRuntimeActivator.java | 0
 .../thing/internal/GenericThingProviderMultipleBundlesTest.java   | 0
 .../smarthome => openhab/core}/model/thing/GenerateThing.mwe2     | 0
 .../{eclipse/smarthome => openhab/core}/model/thing/Thing.xtext   | 0
 .../core}/model/thing/ThingRuntimeModule.xtend                    | 0
 .../core}/model/thing/ThingStandaloneSetup.xtend                  | 0
 .../core}/model/thing/formatting/ThingFormatter.xtend             | 0
 .../core}/model/thing/generator/ThingGenerator.xtend              | 0
 .../model/thing/internal/GenericItemChannelLinkProvider.java      | 0
 .../core}/model/thing/internal/GenericThingProvider.xtend         | 0
 .../core}/model/thing/scoping/ThingScopeProvider.xtend            | 0
 .../core}/model/thing/serializer/ThingSemanticSequencer.xtend     | 0
 .../core}/model/thing/serializer/ThingSyntacticSequencer.xtend    | 0
 .../model/thing/serializer/ThingSyntacticSequencerExtension.java  | 0
 .../core}/model/thing/validation/ThingValidator.xtend             | 0
 .../core}/model/thing/valueconverter/ThingValueConverters.java    | 0
 .../core}/model/thing/valueconverter/UIDtoStringConverter.java    | 0
 .../smarthome => openhab}/core/persistence/FilterCriteria.java    | 0
 .../smarthome => openhab}/core/persistence/HistoricItem.java      | 0
 .../core/persistence/ModifiablePersistenceService.java            | 0
 .../core/persistence/PersistenceItemInfo.java                     | 0
 .../core/persistence/PersistenceManager.java                      | 0
 .../core/persistence/PersistenceService.java                      | 0
 .../core/persistence/PersistenceServiceConfiguration.java         | 0
 .../core/persistence/PersistenceServiceRegistry.java              | 0
 .../core/persistence/QueryablePersistenceService.java             | 0
 .../smarthome => openhab}/core/persistence/SimpleFilter.java      | 0
 .../core/persistence/SimpleItemConfiguration.java                 | 0
 .../core/persistence/config/SimpleAllConfig.java                  | 0
 .../core/persistence/config/SimpleConfig.java                     | 0
 .../core/persistence/config/SimpleGroupConfig.java                | 0
 .../core/persistence/config/SimpleItemConfig.java                 | 0
 .../core/persistence/dto/ItemHistoryDTO.java                      | 0
 .../core/persistence/dto/PersistenceServiceDTO.java               | 0
 .../core/persistence/internal/PersistItemsJob.java                | 0
 .../core/persistence/internal/PersistenceManagerImpl.java         | 0
 .../core/persistence/internal/PersistenceServiceRegistryImpl.java | 0
 .../core/persistence/strategy/SimpleCronStrategy.java             | 0
 .../core/persistence/strategy/SimpleStrategy.java                 | 0
 .../core/scheduler/internal/SchedulerActivator.java               | 0
 .../smarthome => openhab}/core/semantics/SemanticTags.java        | 0
 .../smarthome => openhab}/core/semantics/SemanticsPredicates.java | 0
 .../smarthome => openhab}/core/semantics/SemanticsService.java    | 0
 .../core/semantics/internal/SemanticsMetadataProvider.java        | 0
 .../core/semantics/internal/SemanticsServiceImpl.java             | 0
 .../smarthome => openhab}/core/semantics/model/Equipment.java     | 0
 .../smarthome => openhab}/core/semantics/model/Location.java      | 0
 .../smarthome => openhab}/core/semantics/model/Point.java         | 0
 .../smarthome => openhab}/core/semantics/model/Property.java      | 0
 .../{eclipse/smarthome => openhab}/core/semantics/model/Tag.java  | 0
 .../smarthome => openhab}/core/semantics/model/TagInfo.java       | 0
 .../core/semantics/model/equipment/Battery.java                   | 0
 .../core/semantics/model/equipment/Blinds.java                    | 0
 .../core/semantics/model/equipment/Camera.java                    | 0
 .../smarthome => openhab}/core/semantics/model/equipment/Car.java | 0
 .../core/semantics/model/equipment/CleaningRobot.java             | 0
 .../core/semantics/model/equipment/Door.java                      | 0
 .../core/semantics/model/equipment/Equipments.java                | 0
 .../core/semantics/model/equipment/FrontDoor.java                 | 0
 .../core/semantics/model/equipment/GarageDoor.java                | 0
 .../core/semantics/model/equipment/HVAC.java                      | 0
 .../core/semantics/model/equipment/Inverter.java                  | 0
 .../core/semantics/model/equipment/LawnMower.java                 | 0
 .../core/semantics/model/equipment/Lightbulb.java                 | 0
 .../core/semantics/model/equipment/Lock.java                      | 0
 .../core/semantics/model/equipment/MotionDetector.java            | 0
 .../core/semantics/model/equipment/NetworkAppliance.java          | 0
 .../core/semantics/model/equipment/PowerOutlet.java               | 0
 .../core/semantics/model/equipment/Projector.java                 | 0
 .../core/semantics/model/equipment/RadiatorControl.java           | 0
 .../core/semantics/model/equipment/Receiver.java                  | 0
 .../core/semantics/model/equipment/RemoteControl.java             | 0
 .../core/semantics/model/equipment/Screen.java                    | 0
 .../core/semantics/model/equipment/Siren.java                     | 0
 .../core/semantics/model/equipment/SmokeDetector.java             | 0
 .../core/semantics/model/equipment/Speaker.java                   | 0
 .../core/semantics/model/equipment/Valve.java                     | 0
 .../core/semantics/model/equipment/WallSwitch.java                | 0
 .../core/semantics/model/equipment/WebService.java                | 0
 .../core/semantics/model/equipment/WhiteGood.java                 | 0
 .../core/semantics/model/equipment/Window.java                    | 0
 .../core/semantics/model/location/Attic.java                      | 0
 .../core/semantics/model/location/Basement.java                   | 0
 .../core/semantics/model/location/Bathroom.java                   | 0
 .../core/semantics/model/location/Bedroom.java                    | 0
 .../core/semantics/model/location/Building.java                   | 0
 .../core/semantics/model/location/Carport.java                    | 0
 .../core/semantics/model/location/Corridor.java                   | 0
 .../core/semantics/model/location/FirstFloor.java                 | 0
 .../core/semantics/model/location/Floor.java                      | 0
 .../core/semantics/model/location/Garage.java                     | 0
 .../core/semantics/model/location/Garden.java                     | 0
 .../core/semantics/model/location/GroundFloor.java                | 0
 .../core/semantics/model/location/Indoor.java                     | 0
 .../core/semantics/model/location/Kitchen.java                    | 0
 .../core/semantics/model/location/LivingRoom.java                 | 0
 .../core/semantics/model/location/Locations.java                  | 0
 .../core/semantics/model/location/Outdoor.java                    | 0
 .../smarthome => openhab}/core/semantics/model/location/Room.java | 0
 .../core/semantics/model/location/Terrace.java                    | 0
 .../smarthome => openhab}/core/semantics/model/point/Alarm.java   | 0
 .../smarthome => openhab}/core/semantics/model/point/Control.java | 0
 .../core/semantics/model/point/LowBattery.java                    | 0
 .../core/semantics/model/point/Measurement.java                   | 0
 .../core/semantics/model/point/OpenLevel.java                     | 0
 .../core/semantics/model/point/OpenState.java                     | 0
 .../smarthome => openhab}/core/semantics/model/point/Points.java  | 0
 .../core/semantics/model/point/Setpoint.java                      | 0
 .../smarthome => openhab}/core/semantics/model/point/Status.java  | 0
 .../smarthome => openhab}/core/semantics/model/point/Switch.java  | 0
 .../core/semantics/model/point/Tampered.java                      | 0
 .../smarthome => openhab}/core/semantics/model/point/Tilt.java    | 0
 .../smarthome => openhab}/core/semantics/model/property/CO.java   | 0
 .../smarthome => openhab}/core/semantics/model/property/CO2.java  | 0
 .../core/semantics/model/property/ColorTemperature.java           | 0
 .../core/semantics/model/property/Current.java                    | 0
 .../core/semantics/model/property/Energy.java                     | 0
 .../core/semantics/model/property/Frequency.java                  | 0
 .../smarthome => openhab}/core/semantics/model/property/Gas.java  | 0
 .../core/semantics/model/property/Humidity.java                   | 0
 .../core/semantics/model/property/Light.java                      | 0
 .../core/semantics/model/property/Noise.java                      | 0
 .../smarthome => openhab}/core/semantics/model/property/Oil.java  | 0
 .../core/semantics/model/property/Power.java                      | 0
 .../core/semantics/model/property/Presence.java                   | 0
 .../core/semantics/model/property/Pressure.java                   | 0
 .../core/semantics/model/property/Properties.java                 | 0
 .../smarthome => openhab}/core/semantics/model/property/Rain.java | 0
 .../core/semantics/model/property/Smoke.java                      | 0
 .../core/semantics/model/property/SoundVolume.java                | 0
 .../core/semantics/model/property/Temperature.java                | 0
 .../core/semantics/model/property/Voltage.java                    | 0
 .../core/semantics/model/property/Water.java                      | 0
 .../smarthome => openhab}/core/semantics/model/property/Wind.java | 0
 .../smarthome => openhab}/core/semantics/SemanticTagsTest.java    | 0
 .../core/semantics/internal/SemanticsServiceImplTest.java         | 0
 .../core}/storage/json/internal/JsonStorage.java                  | 0
 .../core}/storage/json/internal/JsonStorageService.java           | 0
 .../core}/storage/json/internal/StorageEntry.java                 | 0
 .../core}/storage/json/internal/StorageEntryMapDeserializer.java  | 0
 .../core}/storage/json/internal/JsonStorageTest.java              | 0
 .../core}/storage/mapdb/internal/MapDbStorage.java                | 0
 .../core}/storage/mapdb/internal/MapDbStorageService.java         | 0
 .../core}/storage/mapdb/internal/PropertiesTypeAdapter.java       | 0
 .../storage/mapdb/internal/PropertiesTypeAdapterFactory.java      | 0
 .../core}/storage/mapdb/internal/MapDbStorageServiceTest.java     | 0
 .../core}/magic/binding/MagicBindingConstants.java                | 0
 .../smarthome => openhab/core}/magic/binding/MagicService.java    | 0
 .../magic/binding/handler/MagicActionModuleThingHandler.java      | 0
 .../core}/magic/binding/handler/MagicBridgeHandler.java           | 0
 .../core}/magic/binding/handler/MagicBridgedThingHandler.java     | 0
 .../core}/magic/binding/handler/MagicChattyThingHandler.java      | 0
 .../core}/magic/binding/handler/MagicColorLightHandler.java       | 0
 .../magic/binding/handler/MagicConfigurableThingHandler.java      | 0
 .../core}/magic/binding/handler/MagicContactHandler.java          | 0
 .../core}/magic/binding/handler/MagicDelayedOnlineHandler.java    | 0
 .../core}/magic/binding/handler/MagicDimmableLightHandler.java    | 0
 .../binding/handler/MagicDynamicStateDescriptionThingHandler.java | 0
 .../core}/magic/binding/handler/MagicExtensibleThingHandler.java  | 0
 .../magic/binding/handler/MagicFirmwareUpdateThingHandler.java    | 0
 .../core}/magic/binding/handler/MagicImageHandler.java            | 0
 .../core}/magic/binding/handler/MagicLocationThingHandler.java    | 0
 .../core}/magic/binding/handler/MagicOnOffLightHandler.java       | 0
 .../core}/magic/binding/handler/MagicOnlineOfflineHandler.java    | 0
 .../core}/magic/binding/handler/MagicPlayerHandler.java           | 0
 .../core}/magic/binding/handler/MagicRolllershutterHandler.java   | 0
 .../core}/magic/binding/handler/MagicThermostatThingHandler.java  | 0
 .../core}/magic/binding/internal/MagicDiscoveryService.java       | 0
 .../binding/internal/MagicDynamicStateDescriptionProvider.java    | 0
 .../core}/magic/binding/internal/MagicHandlerFactory.java         | 0
 .../core}/magic/binding/internal/MagicServiceConfig.java          | 0
 .../core}/magic/binding/internal/MagicServiceImpl.java            | 0
 .../internal/automation/modules/MagicMultiActionMarker.java       | 0
 .../automation/modules/MagicMultiServiceMultiActions.java         | 0
 .../internal/automation/modules/MagicSingleActionService.java     | 0
 .../internal/automation/modules/MagicThingActionsService.java     | 0
 .../magic/binding/internal/firmware/MagicFirmwareProvider.java    | 0
 .../core}/magic/binding/internal/http/MagicHttpResource.java      | 0
 .../core}/magic/internal/metadata/MagicMetadataProvider.java      | 0
 .../core}/magic/internal/metadata/MagicMetadataProvider2.java     | 0
 .../core}/magic/internal/metadata/MagicMetadataUsingService.java  | 0
 .../core}/magic/service/MagicMultiInstanceService.java            | 0
 .../core}/magic/service/MagicMultiInstanceServiceMarker.java      | 0
 .../core}/magic/binding/handler/MagicColorLightHandlerTest.java   | 0
 .../magic/binding/handler/MagicDimmableLightHandlerTest.java      | 0
 .../core}/magic/binding/handler/MagicOnOffLightHandlerTest.java   | 0
 .../core}/magic/binding/internal/MagicHandlerFactoryTest.java     | 0
 .../core}/magic/binding/internal/MagicServiceImplTest.java        | 0
 .../smarthome => openhab/core}/test/AsyncResultWrapper.java       | 0
 .../{eclipse/smarthome => openhab/core}/test/BundleCloseable.java | 0
 .../smarthome => openhab/core}/test/SyntheticBundleInstaller.java | 0
 .../{eclipse/smarthome => openhab/core}/test/TestPortUtil.java    | 0
 .../org/{eclipse/smarthome => openhab/core}/test/TestServer.java  | 0
 .../core}/test/internal/java/MissingServiceAnalyzer.java          | 0
 .../smarthome => openhab/core}/test/java/JavaOSGiTest.java        | 0
 .../{eclipse/smarthome => openhab/core}/test/java/JavaTest.java   | 0
 .../smarthome => openhab/core}/test/storage/VolatileStorage.java  | 0
 .../core}/test/storage/VolatileStorageService.java                | 0
 .../smarthome => openhab/core}/test/java/JavaTestTest.java        | 0
 .../core/thing/xml/internal/AbstractDescriptionTypeConverter.java | 0
 .../core/thing/xml/internal/BridgeTypeConverter.java              | 0
 .../core/thing/xml/internal/BridgeTypeXmlResult.java              | 0
 .../core/thing/xml/internal/ChannelConverter.java                 | 0
 .../core/thing/xml/internal/ChannelGroupTypeConverter.java        | 0
 .../core/thing/xml/internal/ChannelGroupTypeXmlResult.java        | 0
 .../core/thing/xml/internal/ChannelTypeConverter.java             | 0
 .../core/thing/xml/internal/ChannelTypeXmlResult.java             | 0
 .../core/thing/xml/internal/ChannelXmlResult.java                 | 0
 .../core/thing/xml/internal/CommandDescriptionConverter.java      | 0
 .../core/thing/xml/internal/EventDescriptionConverter.java        | 0
 .../core/thing/xml/internal/StateDescriptionConverter.java        | 0
 .../core/thing/xml/internal/ThingDescriptionConverter.java        | 0
 .../core/thing/xml/internal/ThingDescriptionList.java             | 0
 .../core/thing/xml/internal/ThingDescriptionReader.java           | 0
 .../core/thing/xml/internal/ThingTypeConverter.java               | 0
 .../core/thing/xml/internal/ThingTypeXmlProvider.java             | 0
 .../core/thing/xml/internal/ThingTypeXmlResult.java               | 0
 .../thing/xml/internal/ThingXmlConfigDescriptionProvider.java     | 0
 .../core/thing/xml/internal/XmlChannelGroupTypeProvider.java      | 0
 .../core/thing/xml/internal/XmlChannelTypeProvider.java           | 0
 .../smarthome => openhab}/core/thing/xml/internal/XmlHelper.java  | 0
 .../core/thing/xml/internal/XmlThingTypeProvider.java             | 0
 .../smarthome => openhab}/core/thing/xml/internal/Example.java    | 0
 .../core/thing/xml/internal/XmlHelperTest.java                    | 0
 .../org/{eclipse/smarthome => openhab}/core/thing/Bridge.java     | 0
 .../org/{eclipse/smarthome => openhab}/core/thing/Channel.java    | 0
 .../smarthome => openhab}/core/thing/ChannelGroupUID.java         | 0
 .../org/{eclipse/smarthome => openhab}/core/thing/ChannelUID.java | 0
 .../smarthome => openhab}/core/thing/CommonTriggerEvents.java     | 0
 .../core/thing/DefaultSystemChannelTypeProvider.java              | 0
 .../smarthome => openhab}/core/thing/ManagedThingProvider.java    | 0
 .../java/org/{eclipse/smarthome => openhab}/core/thing/Thing.java | 0
 .../{eclipse/smarthome => openhab}/core/thing/ThingManager.java   | 0
 .../{eclipse/smarthome => openhab}/core/thing/ThingProvider.java  | 0
 .../{eclipse/smarthome => openhab}/core/thing/ThingRegistry.java  | 0
 .../core/thing/ThingRegistryChangeListener.java                   | 0
 .../{eclipse/smarthome => openhab}/core/thing/ThingStatus.java    | 0
 .../smarthome => openhab}/core/thing/ThingStatusDetail.java       | 0
 .../smarthome => openhab}/core/thing/ThingStatusInfo.java         | 0
 .../core/thing/ThingTypeMigrationService.java                     | 0
 .../{eclipse/smarthome => openhab}/core/thing/ThingTypeUID.java   | 0
 .../org/{eclipse/smarthome => openhab}/core/thing/ThingUID.java   | 0
 .../java/org/{eclipse/smarthome => openhab}/core/thing/UID.java   | 0
 .../core/thing/binding/BaseBridgeHandler.java                     | 0
 .../core/thing/binding/BaseDynamicCommandDescriptionProvider.java | 0
 .../core/thing/binding/BaseDynamicStateDescriptionProvider.java   | 0
 .../core/thing/binding/BaseThingHandler.java                      | 0
 .../core/thing/binding/BaseThingHandlerFactory.java               | 0
 .../smarthome => openhab}/core/thing/binding/BridgeHandler.java   | 0
 .../core/thing/binding/ConfigStatusBridgeHandler.java             | 0
 .../core/thing/binding/ConfigStatusThingHandler.java              | 0
 .../smarthome => openhab}/core/thing/binding/ThingActions.java    | 0
 .../core/thing/binding/ThingActionsScope.java                     | 0
 .../core/thing/binding/ThingConfigStatusSource.java               | 0
 .../smarthome => openhab}/core/thing/binding/ThingFactory.java    | 0
 .../smarthome => openhab}/core/thing/binding/ThingHandler.java    | 0
 .../core/thing/binding/ThingHandlerCallback.java                  | 0
 .../core/thing/binding/ThingHandlerFactory.java                   | 0
 .../core/thing/binding/ThingHandlerService.java                   | 0
 .../core/thing/binding/ThingTypeProvider.java                     | 0
 .../core/thing/binding/builder/BridgeBuilder.java                 | 0
 .../core/thing/binding/builder/ChannelBuilder.java                | 0
 .../core/thing/binding/builder/ThingBuilder.java                  | 0
 .../core/thing/binding/builder/ThingStatusInfoBuilder.java        | 0
 .../core/thing/binding/firmware/Firmware.java                     | 0
 .../core/thing/binding/firmware/FirmwareBuilder.java              | 0
 .../core/thing/binding/firmware/FirmwareRestriction.java          | 0
 .../binding/firmware/FirmwareUpdateBackgroundTransferHandler.java | 0
 .../core/thing/binding/firmware/FirmwareUpdateHandler.java        | 0
 .../core/thing/binding/firmware/ProgressCallback.java             | 0
 .../core/thing/binding/firmware/ProgressStep.java                 | 0
 .../{eclipse/smarthome => openhab}/core/thing/dto/ChannelDTO.java | 0
 .../smarthome => openhab}/core/thing/dto/ChannelDTOMapper.java    | 0
 .../core/thing/dto/ChannelDefinitionDTO.java                      | 0
 .../core/thing/dto/ChannelGroupDefinitionDTO.java                 | 0
 .../smarthome => openhab}/core/thing/dto/ChannelTypeDTO.java      | 0
 .../core/thing/dto/StrippedThingTypeDTO.java                      | 0
 .../core/thing/dto/StrippedThingTypeDTOMapper.java                | 0
 .../{eclipse/smarthome => openhab}/core/thing/dto/ThingDTO.java   | 0
 .../smarthome => openhab}/core/thing/dto/ThingDTOMapper.java      | 0
 .../smarthome => openhab}/core/thing/dto/ThingTypeDTO.java        | 0
 .../core/thing/events/AbstractThingRegistryEvent.java             | 0
 .../core/thing/events/ChannelTriggeredEvent.java                  | 0
 .../smarthome => openhab}/core/thing/events/ThingAddedEvent.java  | 0
 .../core/thing/events/ThingEventFactory.java                      | 0
 .../core/thing/events/ThingRemovedEvent.java                      | 0
 .../core/thing/events/ThingStatusInfoChangedEvent.java            | 0
 .../core/thing/events/ThingStatusInfoEvent.java                   | 0
 .../core/thing/events/ThingUpdatedEvent.java                      | 0
 .../core/thing/firmware/FirmwareEventFactory.java                 | 0
 .../core/thing/firmware/FirmwareProvider.java                     | 0
 .../core/thing/firmware/FirmwareRegistry.java                     | 0
 .../smarthome => openhab}/core/thing/firmware/FirmwareStatus.java | 0
 .../core/thing/firmware/FirmwareStatusInfo.java                   | 0
 .../core/thing/firmware/FirmwareStatusInfoEvent.java              | 0
 .../core/thing/firmware/FirmwareUpdateProgressInfo.java           | 0
 .../core/thing/firmware/FirmwareUpdateProgressInfoEvent.java      | 0
 .../core/thing/firmware/FirmwareUpdateResult.java                 | 0
 .../core/thing/firmware/FirmwareUpdateResultInfo.java             | 0
 .../core/thing/firmware/FirmwareUpdateResultInfoEvent.java        | 0
 .../core/thing/firmware/FirmwareUpdateService.java                | 0
 .../core/thing/firmware/dto/FirmwareDTO.java                      | 0
 .../core/thing/firmware/dto/FirmwareStatusDTO.java                | 0
 .../core/thing/i18n/ChannelGroupTypeI18nLocalizationService.java  | 0
 .../core/thing/i18n/ChannelTypeI18nLocalizationService.java       | 0
 .../core/thing/i18n/ThingStatusInfoI18nLocalizationService.java   | 0
 .../core/thing/i18n/ThingTypeI18nLocalizationService.java         | 0
 .../core/thing/internal/AutoUpdateConfigDescriptionProvider.java  | 0
 .../core/thing/internal/AutoUpdateManager.java                    | 0
 .../smarthome => openhab}/core/thing/internal/BridgeImpl.java     | 0
 .../core/thing/internal/ChannelCommandDescriptionProvider.java    | 0
 .../core/thing/internal/ChannelItemProvider.java                  | 0
 .../core/thing/internal/ChannelStateDescriptionProvider.java      | 0
 .../core/thing/internal/CommunicationManager.java                 | 0
 .../core/thing/internal/ProfileContextImpl.java                   | 0
 .../core/thing/internal/ThingConfigDescriptionAliasProvider.java  | 0
 .../core/thing/internal/ThingFactoryHelper.java                   | 0
 .../smarthome => openhab}/core/thing/internal/ThingImpl.java      | 0
 .../core/thing/internal/ThingManagerImpl.java                     | 0
 .../core/thing/internal/ThingRegistryImpl.java                    | 0
 .../smarthome => openhab}/core/thing/internal/ThingTracker.java   | 0
 .../internal/console/FirmwareUpdateConsoleCommandExtension.java   | 0
 .../core/thing/internal/console/LinkConsoleCommandExtension.java  | 0
 .../core/thing/internal/console/ThingConsoleCommandExtension.java | 0
 .../core/thing/internal/firmware/FirmwareImpl.java                | 0
 .../core/thing/internal/firmware/FirmwareRegistryImpl.java        | 0
 .../core/thing/internal/firmware/FirmwareUpdateServiceImpl.java   | 0
 .../core/thing/internal/firmware/ParameterChecks.java             | 0
 .../core/thing/internal/firmware/ProgressCallbackImpl.java        | 0
 .../core/thing/internal/i18n/ChannelGroupI18nUtil.java            | 0
 .../core/thing/internal/i18n/ChannelI18nUtil.java                 | 0
 .../core/thing/internal/i18n/ThingTypeI18nUtil.java               | 0
 .../internal/link/ItemChannelLinkConfigDescriptionProvider.java   | 0
 .../core/thing/internal/profiles/ProfileCallbackImpl.java         | 0
 .../core/thing/internal/profiles/ProfileTypeRegistryImpl.java     | 0
 .../core/thing/internal/profiles/RawButtonOnOffSwitchProfile.java | 0
 .../thing/internal/profiles/RawButtonTogglePlayerProfile.java     | 0
 .../internal/profiles/RawButtonToggleRollershutterProfile.java    | 0
 .../thing/internal/profiles/RawButtonToggleSwitchProfile.java     | 0
 .../core/thing/internal/profiles/RawRockerDimmerProfile.java      | 0
 .../thing/internal/profiles/RawRockerNextPreviousProfile.java     | 0
 .../core/thing/internal/profiles/RawRockerOnOffProfile.java       | 0
 .../core/thing/internal/profiles/RawRockerPlayPauseProfile.java   | 0
 .../internal/profiles/RawRockerRewindFastforwardProfile.java      | 0
 .../core/thing/internal/profiles/RawRockerStopMoveProfile.java    | 0
 .../core/thing/internal/profiles/RawRockerUpDownProfile.java      | 0
 .../core/thing/internal/profiles/StateProfileTypeImpl.java        | 0
 .../core/thing/internal/profiles/SystemDefaultProfile.java        | 0
 .../core/thing/internal/profiles/SystemFollowProfile.java         | 0
 .../core/thing/internal/profiles/SystemOffsetProfile.java         | 0
 .../core/thing/internal/profiles/SystemProfileFactory.java        | 0
 .../core/thing/internal/profiles/TimestampChangeProfile.java      | 0
 .../core/thing/internal/profiles/TimestampUpdateProfile.java      | 0
 .../core/thing/internal/profiles/TriggerProfileTypeImpl.java      | 0
 .../core/thing/internal/profiles/i18n/ProfileI18nUtil.java        | 0
 .../core/thing/internal/type/AbstractChannelTypeBuilder.java      | 0
 .../core/thing/internal/type/StateChannelTypeBuilderImpl.java     | 0
 .../core/thing/internal/type/TriggerChannelTypeBuilderImpl.java   | 0
 .../smarthome => openhab}/core/thing/link/AbstractLink.java       | 0
 .../core/thing/link/AbstractLinkRegistry.java                     | 0
 .../smarthome => openhab}/core/thing/link/ItemChannelLink.java    | 0
 .../core/thing/link/ItemChannelLinkProvider.java                  | 0
 .../core/thing/link/ItemChannelLinkRegistry.java                  | 0
 .../core/thing/link/ManagedItemChannelLinkProvider.java           | 0
 .../smarthome => openhab}/core/thing/link/ThingLinkManager.java   | 0
 .../core/thing/link/dto/AbstractLinkDTO.java                      | 0
 .../core/thing/link/dto/ItemChannelLinkDTO.java                   | 0
 .../thing/link/events/AbstractItemChannelLinkRegistryEvent.java   | 0
 .../core/thing/link/events/ItemChannelLinkAddedEvent.java         | 0
 .../core/thing/link/events/ItemChannelLinkRemovedEvent.java       | 0
 .../core/thing/link/events/LinkEventFactory.java                  | 0
 .../smarthome => openhab}/core/thing/profiles/Profile.java        | 0
 .../smarthome => openhab}/core/thing/profiles/ProfileAdvisor.java | 0
 .../core/thing/profiles/ProfileCallback.java                      | 0
 .../smarthome => openhab}/core/thing/profiles/ProfileContext.java | 0
 .../smarthome => openhab}/core/thing/profiles/ProfileFactory.java | 0
 .../smarthome => openhab}/core/thing/profiles/ProfileType.java    | 0
 .../core/thing/profiles/ProfileTypeBuilder.java                   | 0
 .../core/thing/profiles/ProfileTypeProvider.java                  | 0
 .../core/thing/profiles/ProfileTypeRegistry.java                  | 0
 .../smarthome => openhab}/core/thing/profiles/ProfileTypeUID.java | 0
 .../smarthome => openhab}/core/thing/profiles/StateProfile.java   | 0
 .../core/thing/profiles/StateProfileType.java                     | 0
 .../smarthome => openhab}/core/thing/profiles/SystemProfiles.java | 0
 .../smarthome => openhab}/core/thing/profiles/TriggerProfile.java | 0
 .../core/thing/profiles/TriggerProfileType.java                   | 0
 .../core/thing/profiles/dto/ProfileTypeDTO.java                   | 0
 .../core/thing/profiles/dto/ProfileTypeDTOMapper.java             | 0
 .../thing/profiles/i18n/ProfileTypeI18nLocalizationService.java   | 0
 .../core/thing/type/AbstractDescriptionType.java                  | 0
 .../smarthome => openhab}/core/thing/type/AutoUpdatePolicy.java   | 0
 .../smarthome => openhab}/core/thing/type/BridgeType.java         | 0
 .../smarthome => openhab}/core/thing/type/ChannelDefinition.java  | 0
 .../core/thing/type/ChannelDefinitionBuilder.java                 | 0
 .../core/thing/type/ChannelGroupDefinition.java                   | 0
 .../smarthome => openhab}/core/thing/type/ChannelGroupType.java   | 0
 .../core/thing/type/ChannelGroupTypeBuilder.java                  | 0
 .../core/thing/type/ChannelGroupTypeProvider.java                 | 0
 .../core/thing/type/ChannelGroupTypeRegistry.java                 | 0
 .../core/thing/type/ChannelGroupTypeUID.java                      | 0
 .../smarthome => openhab}/core/thing/type/ChannelKind.java        | 0
 .../smarthome => openhab}/core/thing/type/ChannelType.java        | 0
 .../smarthome => openhab}/core/thing/type/ChannelTypeBuilder.java | 0
 .../core/thing/type/ChannelTypeProvider.java                      | 0
 .../core/thing/type/ChannelTypeRegistry.java                      | 0
 .../smarthome => openhab}/core/thing/type/ChannelTypeUID.java     | 0
 .../core/thing/type/DynamicCommandDescriptionProvider.java        | 0
 .../core/thing/type/DynamicStateDescriptionProvider.java          | 0
 .../core/thing/type/StateChannelTypeBuilder.java                  | 0
 .../{eclipse/smarthome => openhab}/core/thing/type/ThingType.java | 0
 .../smarthome => openhab}/core/thing/type/ThingTypeBuilder.java   | 0
 .../smarthome => openhab}/core/thing/type/ThingTypeRegistry.java  | 0
 .../core/thing/type/TriggerChannelTypeBuilder.java                | 0
 .../smarthome => openhab}/core/thing/util/ThingHandlerHelper.java | 0
 .../smarthome => openhab}/core/thing/util/ThingHelper.java        | 0
 .../smarthome => openhab}/core/thing/ChannelGroupUIDTest.java     | 0
 .../{eclipse/smarthome => openhab}/core/thing/ChannelTest.java    | 0
 .../{eclipse/smarthome => openhab}/core/thing/ChannelUIDTest.java | 0
 .../{eclipse/smarthome => openhab}/core/thing/ThingUIDTest.java   | 0
 .../org/{eclipse/smarthome => openhab}/core/thing/UIDTest.java    | 0
 .../core/thing/binding/builder/ChannelBuilderTest.java            | 0
 .../core/thing/binding/builder/ThingBuilderTest.java              | 0
 .../core/thing/binding/builder/ThingStatusInfoBuilderTest.java    | 0
 .../core/thing/firmware/FirmwareEventFactoryTest.java             | 0
 .../core/thing/internal/AutoUpdateManagerTest.java                | 0
 .../core/thing/internal/ChannelItemProviderTest.java              | 0
 .../smarthome => openhab}/core/thing/internal/ThingImplTest.java  | 0
 .../core/thing/internal/ThingManagerImplTest.java                 | 0
 .../core/thing/internal/firmware/ProgressCallbackTest.java        | 0
 .../thing/internal/profiles/RawButtonOnOffSwitchProfileTest.java  | 0
 .../thing/internal/profiles/RawButtonToggleSwitchProfileTest.java | 0
 .../core/thing/internal/profiles/SystemDefaultProfileTest.java    | 0
 .../core/thing/internal/profiles/SystemFollowProfileTest.java     | 0
 .../core/thing/internal/profiles/SystemOffsetProfileTest.java     | 0
 .../core/thing/internal/profiles/TimestampProfileTest.java        | 0
 .../core/thing/type/ChannelGroupTypeBuilderTest.java              | 0
 .../core/thing/type/ChannelTypeBuilderTest.java                   | 0
 .../core/thing/type/ThingTypeBuilderTest.java                     | 0
 .../core/thing/util/ThingHandlerHelperTest.java                   | 0
 .../smarthome => openhab}/core/thing/util/ThingHelperTest.java    | 0
 .../core/transform/AbstractFileTransformationService.java         | 0
 .../core/transform/TransformationException.java                   | 0
 .../core/transform/TransformationHelper.java                      | 0
 .../core/transform/TransformationService.java                     | 0
 .../core/transform/actions/Transformation.java                    | 0
 .../core/transform/internal/TransformationActivator.java          | 0
 .../core/transform/actions/TransformationTest.java                | 0
 .../core}/ui/icon/AbstractResourceIconProvider.java               | 0
 .../{eclipse/smarthome => openhab/core}/ui/icon/IconProvider.java | 0
 .../org/{eclipse/smarthome => openhab/core}/ui/icon/IconSet.java  | 0
 .../core}/ui/icon/internal/CustomIconProvider.java                | 0
 .../smarthome => openhab/core}/ui/icon/internal/IconServlet.java  | 0
 .../core}/ui/icon/internal/IconSetResource.java                   | 0
 .../core}/ui/icon/AbstractResourceIconProviderTest.java           | 0
 .../core}/ui/icon/internal/IconServletTest.java                   | 0
 .../smarthome => openhab/core}/ui/chart/ChartProvider.java        | 0
 .../smarthome => openhab/core}/ui/internal/UIActivator.java       | 0
 .../core}/ui/internal/chart/ChartServlet.java                     | 0
 .../core}/ui/internal/chart/defaultchartprovider/ChartTheme.java  | 0
 .../ui/internal/chart/defaultchartprovider/ChartThemeBlack.java   | 0
 .../ui/internal/chart/defaultchartprovider/ChartThemeBright.java  | 0
 .../ui/internal/chart/defaultchartprovider/ChartThemeDark.java    | 0
 .../ui/internal/chart/defaultchartprovider/ChartThemeWhite.java   | 0
 .../internal/chart/defaultchartprovider/DefaultChartProvider.java | 0
 .../core}/ui/internal/items/ItemUIRegistryImpl.java               | 0
 .../core}/ui/internal/proxy/AsyncProxyServlet.java                | 0
 .../core}/ui/internal/proxy/BlockingProxyServlet.java             | 0
 .../core}/ui/internal/proxy/ProxyServletService.java              | 0
 .../smarthome => openhab/core}/ui/items/ItemUIProvider.java       | 0
 .../smarthome => openhab/core}/ui/items/ItemUIRegistry.java       | 0
 .../core}/ui/internal/items/ItemUIRegistryImplTest.java           | 0
 .../core}/ui/internal/proxy/ProxyServletServiceTest.java          | 0
 .../smarthome => openhab}/core/voice/AudioStartEvent.java         | 0
 .../{eclipse/smarthome => openhab}/core/voice/AudioStopEvent.java | 0
 .../{eclipse/smarthome => openhab}/core/voice/KSErrorEvent.java   | 0
 .../org/{eclipse/smarthome => openhab}/core/voice/KSEvent.java    | 0
 .../{eclipse/smarthome => openhab}/core/voice/KSException.java    | 0
 .../org/{eclipse/smarthome => openhab}/core/voice/KSListener.java | 0
 .../org/{eclipse/smarthome => openhab}/core/voice/KSService.java  | 0
 .../smarthome => openhab}/core/voice/KSServiceHandle.java         | 0
 .../{eclipse/smarthome => openhab}/core/voice/KSpottedEvent.java  | 0
 .../smarthome => openhab}/core/voice/RecognitionStartEvent.java   | 0
 .../smarthome => openhab}/core/voice/RecognitionStopEvent.java    | 0
 .../org/{eclipse/smarthome => openhab}/core/voice/STTEvent.java   | 0
 .../{eclipse/smarthome => openhab}/core/voice/STTException.java   | 0
 .../{eclipse/smarthome => openhab}/core/voice/STTListener.java    | 0
 .../org/{eclipse/smarthome => openhab}/core/voice/STTService.java | 0
 .../smarthome => openhab}/core/voice/STTServiceHandle.java        | 0
 .../core/voice/SpeechRecognitionErrorEvent.java                   | 0
 .../smarthome => openhab}/core/voice/SpeechRecognitionEvent.java  | 0
 .../smarthome => openhab}/core/voice/SpeechStartEvent.java        | 0
 .../smarthome => openhab}/core/voice/SpeechStopEvent.java         | 0
 .../{eclipse/smarthome => openhab}/core/voice/TTSException.java   | 0
 .../org/{eclipse/smarthome => openhab}/core/voice/TTSService.java | 0
 .../java/org/{eclipse/smarthome => openhab}/core/voice/Voice.java | 0
 .../{eclipse/smarthome => openhab}/core/voice/VoiceManager.java   | 0
 .../core/voice/internal/DialogProcessor.java                      | 0
 .../core/voice/internal/VoiceConsoleCommandExtension.java         | 0
 .../core/voice/internal/VoiceManagerImpl.java                     | 0
 .../core/voice/internal/text/StandardInterpreter.java             | 0
 .../{eclipse/smarthome => openhab}/core/voice/text/ASTNode.java   | 0
 .../core/voice/text/AbstractRuleBasedInterpreter.java             | 0
 .../smarthome => openhab}/core/voice/text/Expression.java         | 0
 .../core/voice/text/ExpressionAlternatives.java                   | 0
 .../core/voice/text/ExpressionCardinality.java                    | 0
 .../core/voice/text/ExpressionIdentifier.java                     | 0
 .../smarthome => openhab}/core/voice/text/ExpressionLet.java      | 0
 .../smarthome => openhab}/core/voice/text/ExpressionMatch.java    | 0
 .../smarthome => openhab}/core/voice/text/ExpressionSequence.java | 0
 .../core/voice/text/HumanLanguageInterpreter.java                 | 0
 .../core/voice/text/InterpretationException.java                  | 0
 .../core/voice/text/InterpretationResult.java                     | 0
 .../org/{eclipse/smarthome => openhab}/core/voice/text/Rule.java  | 0
 .../{eclipse/smarthome => openhab}/core/voice/text/TokenList.java | 0
 .../smarthome => openhab}/core/voice/STTExceptionTest.java        | 0
 .../core/voice/SpeechRecognitionErrorEventTest.java               | 0
 .../core/voice/SpeechRecognitionEventTest.java                    | 0
 .../smarthome => openhab}/core/voice/TTSExceptionTest.java        | 0
 .../{eclipse/smarthome => openhab}/core/auth/Authentication.java  | 0
 .../smarthome => openhab}/core/auth/AuthenticationException.java  | 0
 .../smarthome => openhab}/core/auth/AuthenticationManager.java    | 0
 .../smarthome => openhab}/core/auth/AuthenticationProvider.java   | 0
 .../org/{eclipse/smarthome => openhab}/core/auth/Credentials.java | 0
 .../java/org/{eclipse/smarthome => openhab}/core/auth/Role.java   | 0
 .../smarthome => openhab}/core/auth/SecurityException.java        | 0
 .../core/auth/UnsupportedCredentialsException.java                | 0
 .../core/auth/UsernamePasswordCredentials.java                    | 0
 .../core/auth/client/oauth2/AccessTokenRefreshListener.java       | 0
 .../core/auth/client/oauth2/AccessTokenResponse.java              | 0
 .../core/auth/client/oauth2/OAuthClientService.java               | 0
 .../core/auth/client/oauth2/OAuthException.java                   | 0
 .../core/auth/client/oauth2/OAuthFactory.java                     | 0
 .../core/auth/client/oauth2/OAuthResponseException.java           | 0
 .../core/auth/client/oauth2/StorageCipher.java                    | 0
 .../{eclipse/smarthome => openhab}/core/binding/BindingInfo.java  | 0
 .../smarthome => openhab}/core/binding/BindingInfoProvider.java   | 0
 .../smarthome => openhab}/core/binding/BindingInfoRegistry.java   | 0
 .../smarthome => openhab}/core/binding/dto/BindingInfoDTO.java    | 0
 .../core/binding/i18n/BindingI18nLocalizationService.java         | 0
 .../core/binding/internal/i18n/BindingI18nUtil.java               | 0
 .../{eclipse/smarthome => openhab}/core/cache/ExpiringCache.java  | 0
 .../smarthome => openhab}/core/cache/ExpiringCacheAsync.java      | 0
 .../smarthome => openhab}/core/cache/ExpiringCacheMap.java        | 0
 .../{eclipse/smarthome => openhab}/core/common/AbstractUID.java   | 0
 .../smarthome => openhab}/core/common/NamedThreadFactory.java     | 0
 .../core/common/QueueingThreadPoolExecutor.java                   | 0
 .../{eclipse/smarthome => openhab}/core/common/SafeCaller.java    | 0
 .../smarthome => openhab}/core/common/SafeCallerBuilder.java      | 0
 .../smarthome => openhab}/core/common/ThreadFactoryBuilder.java   | 0
 .../smarthome => openhab}/core/common/ThreadPoolManager.java      | 0
 .../core/common/osgi/ResourceBundleClassLoader.java               | 0
 .../core/common/registry/AbstractManagedProvider.java             | 0
 .../core/common/registry/AbstractProvider.java                    | 0
 .../core/common/registry/AbstractRegistry.java                    | 0
 .../core/common/registry/DefaultAbstractManagedProvider.java      | 0
 .../smarthome => openhab}/core/common/registry/Identifiable.java  | 0
 .../core/common/registry/ManagedProvider.java                     | 0
 .../smarthome => openhab}/core/common/registry/Provider.java      | 0
 .../core/common/registry/ProviderChangeListener.java              | 0
 .../smarthome => openhab}/core/common/registry/Registry.java      | 0
 .../core/common/registry/RegistryChangeListener.java              | 0
 .../{eclipse/smarthome => openhab}/core/events/AbstractEvent.java | 0
 .../smarthome => openhab}/core/events/AbstractEventFactory.java   | 0
 .../core/events/AbstractTypedEventSubscriber.java                 | 0
 .../org/{eclipse/smarthome => openhab}/core/events/Event.java     | 0
 .../{eclipse/smarthome => openhab}/core/events/EventFactory.java  | 0
 .../{eclipse/smarthome => openhab}/core/events/EventFilter.java   | 0
 .../smarthome => openhab}/core/events/EventPublisher.java         | 0
 .../smarthome => openhab}/core/events/EventSubscriber.java        | 0
 .../smarthome => openhab}/core/events/TopicEventFilter.java       | 0
 .../{eclipse/smarthome => openhab}/core/extension/Extension.java  | 0
 .../smarthome => openhab}/core/extension/ExtensionEvent.java      | 0
 .../core/extension/ExtensionEventFactory.java                     | 0
 .../smarthome => openhab}/core/extension/ExtensionService.java    | 0
 .../smarthome => openhab}/core/extension/ExtensionType.java       | 0
 .../org/{eclipse/smarthome => openhab}/core/i18n/I18nUtil.java    | 0
 .../{eclipse/smarthome => openhab}/core/i18n/LocaleProvider.java  | 0
 .../{eclipse/smarthome => openhab}/core/i18n/LocalizedKey.java    | 0
 .../smarthome => openhab}/core/i18n/LocationProvider.java         | 0
 .../smarthome => openhab}/core/i18n/TimeZoneProvider.java         | 0
 .../smarthome => openhab}/core/i18n/TranslationProvider.java      | 0
 .../{eclipse/smarthome => openhab}/core/i18n/UnitProvider.java    | 0
 .../core/internal/auth/AuthenticationManagerImpl.java             | 0
 .../core/internal/common/AbstractInvocationHandler.java           | 0
 .../core/internal/common/CombinedClassLoader.java                 | 0
 .../core/internal/common/DuplicateExecutionException.java         | 0
 .../smarthome => openhab}/core/internal/common/Invocation.java    | 0
 .../core/internal/common/InvocationHandlerAsync.java              | 0
 .../core/internal/common/InvocationHandlerSync.java               | 0
 .../core/internal/common/SafeCallManager.java                     | 0
 .../core/internal/common/SafeCallManagerImpl.java                 | 0
 .../core/internal/common/SafeCallerBuilderImpl.java               | 0
 .../core/internal/common/SafeCallerImpl.java                      | 0
 .../core/internal/common/WrappedScheduledExecutorService.java     | 0
 .../smarthome => openhab}/core/internal/events/EventHandler.java  | 0
 .../core/internal/events/OSGiEventManager.java                    | 0
 .../core/internal/events/OSGiEventPublisher.java                  | 0
 .../core/internal/events/ThreadedEventHandler.java                | 0
 .../core/internal/i18n/I18nProviderImpl.java                      | 0
 .../core/internal/i18n/LanguageResourceBundleManager.java         | 0
 .../core/internal/i18n/ResourceBundleTracker.java                 | 0
 .../core/internal/items/GroupFunctionHelper.java                  | 0
 .../core/internal/items/ItemBuilderFactoryImpl.java               | 0
 .../core/internal/items/ItemBuilderImpl.java                      | 0
 .../core/internal/items/ItemRegistryImpl.java                     | 0
 .../core/internal/items/ItemStateConverterImpl.java               | 0
 .../smarthome => openhab}/core/internal/items/ItemUpdater.java    | 0
 .../core/internal/items/ManagedMetadataProviderImpl.java          | 0
 .../core/internal/items/MetadataRegistryImpl.java                 | 0
 .../core/internal/library/unit/UnitInitializer.java               | 0
 .../core/internal/scheduler/CronAdjuster.java                     | 0
 .../core/internal/scheduler/CronSchedulerImpl.java                | 0
 .../core/internal/scheduler/DelegatedSchedulerImpl.java           | 0
 .../core/internal/scheduler/PeriodicAdjuster.java                 | 0
 .../core/internal/scheduler/PeriodicSchedulerImpl.java            | 0
 .../core/internal/scheduler/SchedulerImpl.java                    | 0
 .../core/internal/service/BundleResolverImpl.java                 | 0
 .../core/internal/service/CommandDescriptionServiceImpl.java      | 0
 .../core/internal/service/ReadyServiceImpl.java                   | 0
 .../core/internal/service/StateDescriptionServiceImpl.java        | 0
 .../core/internal/types/CommandDescriptionImpl.java               | 0
 .../core/internal/types/StateDescriptionFragmentImpl.java         | 0
 .../org/{eclipse/smarthome => openhab}/core/items/ActiveItem.java | 0
 .../{eclipse/smarthome => openhab}/core/items/GenericItem.java    | 0
 .../{eclipse/smarthome => openhab}/core/items/GroupFunction.java  | 0
 .../org/{eclipse/smarthome => openhab}/core/items/GroupItem.java  | 0
 .../java/org/{eclipse/smarthome => openhab}/core/items/Item.java  | 0
 .../{eclipse/smarthome => openhab}/core/items/ItemBuilder.java    | 0
 .../smarthome => openhab}/core/items/ItemBuilderFactory.java      | 0
 .../{eclipse/smarthome => openhab}/core/items/ItemFactory.java    | 0
 .../smarthome => openhab}/core/items/ItemLookupException.java     | 0
 .../smarthome => openhab}/core/items/ItemNotFoundException.java   | 0
 .../smarthome => openhab}/core/items/ItemNotUniqueException.java  | 0
 .../{eclipse/smarthome => openhab}/core/items/ItemPredicates.java | 0
 .../{eclipse/smarthome => openhab}/core/items/ItemProvider.java   | 0
 .../{eclipse/smarthome => openhab}/core/items/ItemRegistry.java   | 0
 .../core/items/ItemRegistryChangeListener.java                    | 0
 .../smarthome => openhab}/core/items/ItemStateConverter.java      | 0
 .../org/{eclipse/smarthome => openhab}/core/items/ItemUtil.java   | 0
 .../smarthome => openhab}/core/items/ManagedItemProvider.java     | 0
 .../smarthome => openhab}/core/items/ManagedMetadataProvider.java | 0
 .../org/{eclipse/smarthome => openhab}/core/items/Metadata.java   | 0
 .../{eclipse/smarthome => openhab}/core/items/MetadataKey.java    | 0
 .../smarthome => openhab}/core/items/MetadataPredicates.java      | 0
 .../smarthome => openhab}/core/items/MetadataProvider.java        | 0
 .../smarthome => openhab}/core/items/MetadataRegistry.java        | 0
 .../{eclipse/smarthome => openhab}/core/items/RegistryHook.java   | 0
 .../smarthome => openhab}/core/items/StateChangeListener.java     | 0
 .../smarthome => openhab}/core/items/dto/GroupFunctionDTO.java    | 0
 .../smarthome => openhab}/core/items/dto/GroupItemDTO.java        | 0
 .../{eclipse/smarthome => openhab}/core/items/dto/ItemDTO.java    | 0
 .../smarthome => openhab}/core/items/dto/ItemDTOMapper.java       | 0
 .../smarthome => openhab}/core/items/dto/MetadataDTO.java         | 0
 .../core/items/events/AbstractItemEventSubscriber.java            | 0
 .../core/items/events/AbstractItemRegistryEvent.java              | 0
 .../core/items/events/GroupItemStateChangedEvent.java             | 0
 .../smarthome => openhab}/core/items/events/ItemAddedEvent.java   | 0
 .../smarthome => openhab}/core/items/events/ItemCommandEvent.java | 0
 .../smarthome => openhab}/core/items/events/ItemEventFactory.java | 0
 .../smarthome => openhab}/core/items/events/ItemRemovedEvent.java | 0
 .../core/items/events/ItemStateChangedEvent.java                  | 0
 .../smarthome => openhab}/core/items/events/ItemStateEvent.java   | 0
 .../core/items/events/ItemStatePredictedEvent.java                | 0
 .../smarthome => openhab}/core/items/events/ItemUpdatedEvent.java | 0
 .../smarthome => openhab}/core/library/CoreItemFactory.java       | 0
 .../core/library/dimension/ArealDensity.java                      | 0
 .../smarthome => openhab}/core/library/dimension/DataAmount.java  | 0
 .../core/library/dimension/DataTransferRate.java                  | 0
 .../smarthome => openhab}/core/library/dimension/Density.java     | 0
 .../smarthome => openhab}/core/library/dimension/Intensity.java   | 0
 .../core/library/dimension/VolumetricFlowRate.java                | 0
 .../smarthome => openhab}/core/library/items/CallItem.java        | 0
 .../smarthome => openhab}/core/library/items/ColorItem.java       | 0
 .../smarthome => openhab}/core/library/items/ContactItem.java     | 0
 .../smarthome => openhab}/core/library/items/DateTimeItem.java    | 0
 .../smarthome => openhab}/core/library/items/DimmerItem.java      | 0
 .../smarthome => openhab}/core/library/items/ImageItem.java       | 0
 .../smarthome => openhab}/core/library/items/LocationItem.java    | 0
 .../smarthome => openhab}/core/library/items/NumberItem.java      | 0
 .../smarthome => openhab}/core/library/items/PlayerItem.java      | 0
 .../core/library/items/RollershutterItem.java                     | 0
 .../smarthome => openhab}/core/library/items/StringItem.java      | 0
 .../smarthome => openhab}/core/library/items/SwitchItem.java      | 0
 .../core/library/types/ArithmeticGroupFunction.java               | 0
 .../core/library/types/DateTimeGroupFunction.java                 | 0
 .../smarthome => openhab}/core/library/types/DateTimeType.java    | 0
 .../smarthome => openhab}/core/library/types/DecimalType.java     | 0
 .../smarthome => openhab}/core/library/types/HSBType.java         | 0
 .../core/library/types/IncreaseDecreaseType.java                  | 0
 .../core/library/types/NextPreviousType.java                      | 0
 .../smarthome => openhab}/core/library/types/OnOffType.java       | 0
 .../smarthome => openhab}/core/library/types/OpenClosedType.java  | 0
 .../smarthome => openhab}/core/library/types/PercentType.java     | 0
 .../smarthome => openhab}/core/library/types/PlayPauseType.java   | 0
 .../smarthome => openhab}/core/library/types/PointType.java       | 0
 .../smarthome => openhab}/core/library/types/QuantityType.java    | 0
 .../core/library/types/QuantityTypeArithmeticGroupFunction.java   | 0
 .../smarthome => openhab}/core/library/types/RawType.java         | 0
 .../core/library/types/RewindFastforwardType.java                 | 0
 .../smarthome => openhab}/core/library/types/StopMoveType.java    | 0
 .../smarthome => openhab}/core/library/types/StringListType.java  | 0
 .../smarthome => openhab}/core/library/types/StringType.java      | 0
 .../smarthome => openhab}/core/library/types/UpDownType.java      | 0
 .../smarthome => openhab}/core/library/unit/BinaryPrefix.java     | 0
 .../smarthome => openhab}/core/library/unit/CustomUnits.java      | 0
 .../smarthome => openhab}/core/library/unit/ImperialUnits.java    | 0
 .../smarthome => openhab}/core/library/unit/MetricPrefix.java     | 0
 .../{eclipse/smarthome => openhab}/core/library/unit/SIUnits.java | 0
 .../smarthome => openhab}/core/library/unit/SmartHomeUnits.java   | 0
 .../org/{eclipse/smarthome => openhab}/core/net/CidrAddress.java  | 0
 .../{eclipse/smarthome => openhab}/core/net/HttpServiceUtil.java  | 0
 .../java/org/{eclipse/smarthome => openhab}/core/net/NetUtil.java | 0
 .../core/net/NetworkAddressChangeListener.java                    | 0
 .../smarthome => openhab}/core/net/NetworkAddressService.java     | 0
 .../{eclipse/smarthome => openhab}/core/scheduler/CronJob.java    | 0
 .../smarthome => openhab}/core/scheduler/CronScheduler.java       | 0
 .../smarthome => openhab}/core/scheduler/PeriodicScheduler.java   | 0
 .../core/scheduler/ScheduledCompletableFuture.java                | 0
 .../{eclipse/smarthome => openhab}/core/scheduler/Scheduler.java  | 0
 .../smarthome => openhab}/core/scheduler/SchedulerRunnable.java   | 0
 .../core/scheduler/SchedulerTemporalAdjuster.java                 | 0
 .../smarthome => openhab}/core/service/AbstractWatchService.java  | 0
 .../core/service/CommandDescriptionService.java                   | 0
 .../{eclipse/smarthome => openhab}/core/service/ReadyMarker.java  | 0
 .../smarthome => openhab}/core/service/ReadyMarkerFilter.java     | 0
 .../smarthome => openhab}/core/service/ReadyMarkerUtils.java      | 0
 .../{eclipse/smarthome => openhab}/core/service/ReadyService.java | 0
 .../core/service/StateDescriptionService.java                     | 0
 .../smarthome => openhab}/core/service/WatchQueueReader.java      | 0
 .../smarthome => openhab}/core/storage/DeletableStorage.java      | 0
 .../core/storage/DeletableStorageService.java                     | 0
 .../org/{eclipse/smarthome => openhab}/core/storage/Storage.java  | 0
 .../smarthome => openhab}/core/storage/StorageService.java        | 0
 .../org/{eclipse/smarthome => openhab}/core/types/Command.java    | 0
 .../smarthome => openhab}/core/types/CommandDescription.java      | 0
 .../core/types/CommandDescriptionBuilder.java                     | 0
 .../core/types/CommandDescriptionProvider.java                    | 0
 .../{eclipse/smarthome => openhab}/core/types/CommandOption.java  | 0
 .../{eclipse/smarthome => openhab}/core/types/ComplexType.java    | 0
 .../smarthome => openhab}/core/types/EventDescription.java        | 0
 .../{eclipse/smarthome => openhab}/core/types/EventOption.java    | 0
 .../org/{eclipse/smarthome => openhab}/core/types/EventType.java  | 0
 .../{eclipse/smarthome => openhab}/core/types/PrimitiveType.java  | 0
 .../{eclipse/smarthome => openhab}/core/types/RefreshType.java    | 0
 .../java/org/{eclipse/smarthome => openhab}/core/types/State.java | 0
 .../smarthome => openhab}/core/types/StateDescription.java        | 0
 .../core/types/StateDescriptionFragment.java                      | 0
 .../core/types/StateDescriptionFragmentBuilder.java               | 0
 .../core/types/StateDescriptionFragmentProvider.java              | 0
 .../core/types/StateDescriptionProvider.java                      | 0
 .../{eclipse/smarthome => openhab}/core/types/StateOption.java    | 0
 .../java/org/{eclipse/smarthome => openhab}/core/types/Type.java  | 0
 .../org/{eclipse/smarthome => openhab}/core/types/TypeParser.java | 0
 .../org/{eclipse/smarthome => openhab}/core/types/UnDefType.java  | 0
 .../{eclipse/smarthome => openhab}/core/types/util/UnitUtils.java | 0
 .../{eclipse/smarthome => openhab}/core/util/BundleResolver.java  | 0
 .../org/{eclipse/smarthome => openhab}/core/util/HexUtils.java    | 0
 .../org/{eclipse/smarthome => openhab}/core/util/UIDUtils.java    | 0
 .../core/auth/client/oauth2/AccessTokenResponseTest.java          | 0
 .../smarthome => openhab}/core/cache/ExpiringCacheMapTest.java    | 0
 .../smarthome => openhab}/core/cache/ExpiringCacheTest.java       | 0
 .../core/common/QueueingThreadPoolExecutorTest.java               | 0
 .../core/common/ThreadFactoryBuilderTest.java                     | 0
 .../smarthome => openhab}/core/common/ThreadPoolManagerTest.java  | 0
 .../core/common/osgi/ResourceBundleClassLoaderTest.java           | 0
 .../core/internal/i18n/I18nProviderImplTest.java                  | 0
 .../core/internal/items/ItemBuilderTest.java                      | 0
 .../core/internal/items/ItemStateConverterImplTest.java           | 0
 .../smarthome => openhab}/core/internal/items/ItemTagTest.java    | 0
 .../core/internal/items/MetadataRegistryImplTest.java             | 0
 .../core/internal/scheduler/CronAdjusterMiscTest.java             | 0
 .../core/internal/scheduler/CronAdjusterTest.java                 | 0
 .../core/internal/scheduler/CronSchedulerImplTest.java            | 0
 .../core/internal/scheduler/DelegatedSchedulerTest.java           | 0
 .../core/internal/scheduler/PeriodicSchedulerImplTest.java        | 0
 .../core/internal/scheduler/SchedulerImplTest.java                | 0
 .../core/internal/service/ReadyServiceImplTest.java               | 0
 .../core/internal/service/StateDescriptionServiceImplTest.java    | 0
 .../core/internal/types/StateDescriptionFragmentImplTest.java     | 0
 .../smarthome => openhab}/core/items/GenericItemTest.java         | 0
 .../smarthome => openhab}/core/items/MetadataKeyTest.java         | 0
 .../org/{eclipse/smarthome => openhab}/core/items/TestItem.java   | 0
 .../smarthome => openhab}/core/items/dto/ItemDTOMapperTest.java   | 0
 .../core/items/events/AbstractEventFactoryTest.java               | 0
 .../core/items/events/ItemEventFactoryTest.java                   | 0
 .../smarthome => openhab}/core/library/CoreItemFactoryTest.java   | 0
 .../core/library/dimension/VolumetricFlowRateTest.java            | 0
 .../smarthome => openhab}/core/library/items/CallItemTest.java    | 0
 .../smarthome => openhab}/core/library/items/ColorItemTest.java   | 0
 .../smarthome => openhab}/core/library/items/ContactItemTest.java | 0
 .../core/library/items/DateTimeItemTest.java                      | 0
 .../smarthome => openhab}/core/library/items/DimmerItemTest.java  | 0
 .../smarthome => openhab}/core/library/items/ImageItemTest.java   | 0
 .../core/library/items/LocationItemTest.java                      | 0
 .../smarthome => openhab}/core/library/items/NumberItemTest.java  | 0
 .../smarthome => openhab}/core/library/items/PlayerItemTest.java  | 0
 .../core/library/items/RollershutterItemTest.java                 | 0
 .../smarthome => openhab}/core/library/items/StateUtil.java       | 0
 .../smarthome => openhab}/core/library/items/StringItemTest.java  | 0
 .../smarthome => openhab}/core/library/items/SwitchItemTest.java  | 0
 .../core/library/types/ArithmeticGroupFunctionTest.java           | 0
 .../core/library/types/DateTimeGroupFunctionTest.java             | 0
 .../core/library/types/DateTimeTypeTest.java                      | 0
 .../smarthome => openhab}/core/library/types/DecimalTypeTest.java | 0
 .../smarthome => openhab}/core/library/types/HSBTypeTest.java     | 0
 .../smarthome => openhab}/core/library/types/OnOffTypeTest.java   | 0
 .../core/library/types/OpenClosedTypeTest.java                    | 0
 .../smarthome => openhab}/core/library/types/PercentTypeTest.java | 0
 .../smarthome => openhab}/core/library/types/PointTypeTest.java   | 0
 .../library/types/QuantityTypeArithmeticGroupFunctionTest.java    | 0
 .../core/library/types/QuantityTypeTest.java                      | 0
 .../core/library/types/StringListTypeTest.java                    | 0
 .../smarthome => openhab}/core/library/types/StringTypeTest.java  | 0
 .../smarthome => openhab}/core/library/types/UpDownTypeTest.java  | 0
 .../core/library/unit/SmartHomeUnitsTest.java                     | 0
 .../smarthome => openhab}/core/net/HttpServiceUtilTest.java       | 0
 .../org/{eclipse/smarthome => openhab}/core/net/NetUtilTest.java  | 0
 .../core/types/CommandDescriptionBuilderTest.java                 | 0
 .../core/types/StateDescriptionFragmentBuilderTest.java           | 0
 .../smarthome => openhab}/core/types/util/UnitUtilsTest.java      | 0
 .../{eclipse/smarthome => openhab}/core/util/HexUtilsTest.java    | 0
 .../{eclipse/smarthome => openhab}/core/util/UIDUtilsTest.java    | 0
 .../core}/auth/oauth2client/test/internal/AbstractTestAgent.java  | 0
 .../oauth2client/test/internal/AuthorizationCodeTestAgent.java    | 0
 .../auth/oauth2client/test/internal/ResourceOwnerTestAgent.java   | 0
 .../core}/auth/oauth2client/test/internal/TestAgent.java          | 0
 .../core}/auth/oauth2client/test/internal/cipher/CipherTest.java  | 0
 .../test/internal/console/ConsoleOAuthCommandExtension.java       | 0
 .../core/binding/xml/test/BindingInfoI18nTest.java                | 0
 .../core/binding/xml/test/BindingInfoTest.java                    | 0
 .../core/binding/xml/test/BindingInstaller.java                   | 0
 .../core}/config/core/ConfigOptionRegistryOSGiTest.java           | 0
 .../discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java     | 0
 .../core}/config/discovery/DiscoveryServiceMock.java              | 0
 .../core}/config/discovery/DiscoveryServiceMockOfBridge.java      | 0
 .../core}/config/discovery/DiscoveryServiceRegistryOSGiTest.java  | 0
 .../core}/config/discovery/inbox/DynamicThingUpdateOSGiTest.java  | 0
 .../core}/config/discovery/internal/InboxOSGiTest.java            | 0
 .../usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java  | 0
 .../linuxsysfs/internal/PollingUsbSerialScannerTest.java          | 0
 .../usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java  | 0
 .../linuxsysfs/testutil/UsbSerialDeviceInformationGenerator.java  | 0
 .../usbserial/internal/UsbSerialDiscoveryServiceTest.java         | 0
 .../usbserial/testutil/UsbSerialDeviceInformationGenerator.java   | 0
 .../core}/config/dispatch/internal/ConfigDispatcherOSGiTest.java  | 0
 .../core}/config/xml/test/BindingInstaller.java                   | 0
 .../core}/config/xml/test/ConfigDescriptionI18nTest.java          | 0
 .../core}/config/xml/test/ConfigDescriptionsTest.java             | 0
 .../core/ephemeris/internal/EphemerisManagerImplOSGiTest.java     | 0
 .../io/rest/core/internal/discovery/InboxResourceOSGITest.java    | 0
 .../core}/io/rest/core/internal/item/ItemResourceOSGiTest.java    | 0
 .../rest/core/internal/persistence/PersistenceResourceTest.java   | 0
 .../io/rest/core/internal/profile/ProfileTypeResourceTest.java    | 0
 .../internal/service/ConfigurableServiceResourceOSGiTest.java     | 0
 .../core/item/EnrichedItemDTOMapperWithTransformOSGiTest.java     | 0
 .../core}/model/core/internal/folder/FolderObserverTest.java      | 0
 .../core}/model/item/internal/GenericItemProviderTest.java        | 0
 .../core}/model/item/internal/GenericMetadataProviderTest.java    | 0
 .../model/persistence/extensions/PersistenceExtensionsTest.java   | 0
 .../core}/model/persistence/tests/TestPersistenceService.java     | 0
 .../model/rule/runtime/internal/engine/RuleExecutionTest.java     | 0
 .../core}/model/rule/runtime/internal/engine/RuleTriggerTest.java | 0
 .../core}/model/script/actions/ScriptExecutionTest.java           | 0
 .../core}/model/script/engine/ScriptEngineOSGiTest.java           | 0
 .../core}/model/script/lib/NumberExtensionsTest.java              | 0
 .../core}/model/script/scheduler/test/AbstractScheduler.java      | 0
 .../core}/model/script/scheduler/test/MockClosure.java            | 0
 .../core}/model/script/scheduler/test/MockScheduler.java          | 0
 .../core}/model/script/tests/lib/NumberExtensionsTest.java        | 0
 .../model/thing/test/GenericItemChannelLinkProviderJavaTest.java  | 0
 .../model/thing/test/hue/GenericItemChannelLinkProviderTest.java  | 0
 .../core}/model/thing/test/hue/GenericThingProviderTest.java      | 0
 .../core}/model/thing/test/hue/GenericThingProviderTest2.java     | 0
 .../core}/model/thing/test/hue/GenericThingProviderTest3.java     | 0
 .../core}/model/thing/test/hue/GenericThingProviderTest4.java     | 0
 .../model/thing/testsupport/hue/DumbThingHandlerFactory.java      | 0
 .../core}/model/thing/testsupport/hue/DumbThingTypeProvider.java  | 0
 .../model/thing/testsupport/hue/TestHueChannelTypeProvider.java   | 0
 .../thing/testsupport/hue/TestHueConfigDescriptionProvider.java   | 0
 .../model/thing/testsupport/hue/TestHueThingHandlerFactory.java   | 0
 .../model/thing/testsupport/hue/TestHueThingHandlerFactoryX.java  | 0
 .../model/thing/testsupport/hue/TestHueThingTypeProvider.java     | 0
 .../core}/storage/json/internal/JsonStorageServiceOSGiTest.java   | 0
 .../smarthome => openhab}/core/cache/ExpiringCacheAsyncTest.java  | 0
 .../core/internal/common/SafeCallerImplTest.java                  | 0
 .../core/internal/events/OSGiEventManagerOSGiTest.java            | 0
 .../core/internal/i18n/TranslationProviderOSGiTest.java           | 0
 .../core/internal/items/ItemUpdaterOSGiTest.java                  | 0
 .../smarthome => openhab}/core/items/GroupItemOSGiTest.java       | 0
 .../smarthome => openhab}/core/items/ItemRegistryImplTest.java    | 0
 .../core/items/ManagedItemProviderOSGiTest.java                   | 0
 .../org/{eclipse/smarthome => openhab}/core/items/TestItem.java   | 0
 .../core/items/events/AbstractItemEventSubscriberOSGiTest.java    | 0
 .../core/service/AbstractWatchServiceTest.java                    | 0
 .../core/thing/SystemWideChannelTypesTest.java                    | 0
 .../smarthome => openhab}/core/thing/ThingPropertiesTest.java     | 0
 .../core/thing/binding/BindingBaseClassesOSGiTest.java            | 0
 .../core/thing/binding/ChangeThingTypeOSGiTest.java               | 0
 .../core/thing/binding/ThingFactoryTest.java                      | 0
 .../core/thing/binding/firmware/FirmwareTest.java                 | 0
 .../core/thing/events/ThingEventFactoryTest.java                  | 0
 .../core/thing/factory/ManagedThingProviderOSGiTest.java          | 0
 .../smarthome => openhab}/core/thing/firmware/Constants.java      | 0
 .../firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java    | 0
 .../firmware/FirmwareUpdateServicePrerequisiteVersionTest.java    | 0
 .../firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java    | 0
 .../i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java      | 0
 .../core/thing/internal/CommunicationManagerOSGiTest.java         | 0
 .../core/thing/internal/SimpleThingTypeProvider.java              | 0
 .../core/thing/internal/ThingLinkManagerOSGiTest.java             | 0
 .../core/thing/internal/ThingManagerOSGiJavaTest.java             | 0
 .../core/thing/internal/ThingManagerOSGiTest.java                 | 0
 .../core/thing/internal/ThingRegistryOSGiTest.java                | 0
 .../core/thing/internal/firmware/FirmwareRegistryOSGiTest.java    | 0
 .../core/thing/internal/firmware/FirmwareUpdateServiceTest.java   | 0
 .../thing/internal/profiles/SystemProfileFactoryOSGiTest.java     | 0
 .../core/thing/link/ItemChannelLinkOSGiTest.java                  | 0
 .../smarthome => openhab}/core/thing/link/LinkEventOSGiTest.java  | 0
 .../core/thing/profiles/i18n/SystemProfileI18nOSGiTest.java       | 0
 .../core/thing/testutil/i18n/DefaultLocaleSetter.java             | 0
 .../core/thing/type/ChannelStateDescriptionProviderOSGiTest.java  | 0
 .../core/thing/xml/test/ChannelTypesI18nTest.java                 | 0
 .../core/thing/xml/test/ChannelTypesTest.java                     | 0
 .../core/thing/xml/test/ConfigDescriptionsTest.java               | 0
 .../core/thing/xml/test/LoadedTestBundle.java                     | 0
 .../core/thing/xml/test/SystemChannelsInChannelGroupsTest.java    | 0
 .../core/thing/xml/test/SystemWideChannelTypesTest.java           | 0
 .../core/thing/xml/test/ThingTypeI18nTest.java                    | 0
 .../smarthome => openhab}/core/thing/xml/test/ThingTypesTest.java | 0
 .../core/voice/internal/AudioManagerStub.java                     | 0
 .../core/voice/internal/AudioSourceStub.java                      | 0
 .../smarthome => openhab}/core/voice/internal/ConsoleStub.java    | 0
 .../core/voice/internal/HumanLanguageInterpreterStub.java         | 0
 .../smarthome => openhab}/core/voice/internal/KSServiceStub.java  | 0
 .../smarthome => openhab}/core/voice/internal/STTServiceStub.java | 0
 .../smarthome => openhab}/core/voice/internal/SinkStub.java       | 0
 .../smarthome => openhab}/core/voice/internal/TTSServiceStub.java | 0
 .../smarthome => openhab}/core/voice/internal/VoiceStub.java      | 0
 .../core/voice/javavoicemanager/VoiceManagerTest.java             | 0
 .../voice/voiceconsolecommandextension/InterpretCommandTest.java  | 0
 .../core/voice/voiceconsolecommandextension/SayCommandTest.java   | 0
 .../VoiceConsoleCommandExtensionTest.java                         | 0
 .../voice/voiceconsolecommandextension/VoicesCommandTest.java     | 0
 1506 files changed, 0 insertions(+), 0 deletions(-)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/AudioException.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/AudioFormat.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/AudioHTTPServer.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/AudioManager.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/AudioSink.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/AudioSource.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/AudioStream.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/ByteArrayAudioStream.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/FileAudioStream.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/FixedLengthAudioStream.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/URLAudioStream.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/UnsupportedAudioFormatException.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/UnsupportedAudioStreamException.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/internal/AudioConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/internal/AudioManagerImpl.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/internal/AudioServlet.java (100%)
 rename bundles/org.openhab.core.audio/src/main/java/org/{eclipse/smarthome => openhab}/core/audio/utils/AudioStreamUtils.java (100%)
 rename bundles/org.openhab.core.audio/src/test/java/org/{eclipse/smarthome => openhab}/core/audio/internal/AbstractAudioServletTest.java (100%)
 rename bundles/org.openhab.core.audio/src/test/java/org/{eclipse/smarthome => openhab}/core/audio/internal/AudioConsoleTest.java (100%)
 rename bundles/org.openhab.core.audio/src/test/java/org/{eclipse/smarthome => openhab}/core/audio/internal/AudioFormatTest.java (100%)
 rename bundles/org.openhab.core.audio/src/test/java/org/{eclipse/smarthome => openhab}/core/audio/internal/AudioManagerServletTest.java (100%)
 rename bundles/org.openhab.core.audio/src/test/java/org/{eclipse/smarthome => openhab}/core/audio/internal/AudioManagerTest.java (100%)
 rename bundles/org.openhab.core.audio/src/test/java/org/{eclipse/smarthome => openhab}/core/audio/internal/AudioServletTest.java (100%)
 rename bundles/org.openhab.core.audio/src/test/java/org/{eclipse/smarthome => openhab}/core/audio/internal/fake/AudioSinkFake.java (100%)
 rename bundles/org.openhab.core.audio/src/test/java/org/{eclipse/smarthome => openhab}/core/audio/internal/utils/BundledSoundFileHandler.java (100%)
 rename bundles/org.openhab.core.auth.jaas/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/jaas/internal/JaasAuthenticationProvider.java (100%)
 rename bundles/org.openhab.core.auth.oauth2client/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/internal/Keyword.java (100%)
 rename bundles/org.openhab.core.auth.oauth2client/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/internal/OAuthClientServiceImpl.java (100%)
 rename bundles/org.openhab.core.auth.oauth2client/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/internal/OAuthConnector.java (100%)
 rename bundles/org.openhab.core.auth.oauth2client/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/internal/OAuthFactoryImpl.java (100%)
 rename bundles/org.openhab.core.auth.oauth2client/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/internal/OAuthStoreHandler.java (100%)
 rename bundles/org.openhab.core.auth.oauth2client/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/internal/OAuthStoreHandlerImpl.java (100%)
 rename bundles/org.openhab.core.auth.oauth2client/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/internal/PersistedParams.java (100%)
 rename bundles/org.openhab.core.auth.oauth2client/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/internal/StorageRecordType.java (100%)
 rename bundles/org.openhab.core.auth.oauth2client/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java (100%)
 rename bundles/org.openhab.core.binding.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/xml/internal/BindingInfoConverter.java (100%)
 rename bundles/org.openhab.core.binding.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/xml/internal/BindingInfoReader.java (100%)
 rename bundles/org.openhab.core.binding.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/xml/internal/BindingInfoXmlProvider.java (100%)
 rename bundles/org.openhab.core.binding.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/xml/internal/BindingInfoXmlResult.java (100%)
 rename bundles/org.openhab.core.binding.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/xml/internal/BindingXmlConfigDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.binding.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/xml/internal/XmlBindingInfoProvider.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigConstants.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescription.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescriptionAliasProvider.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescriptionBuilder.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescriptionParameter.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescriptionParameterBuilder.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescriptionParameterGroup.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescriptionRegistry.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigOptionProvider.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigUtil.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigurableService.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/Configuration.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigurationDeserializer.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigurationSerializer.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/FilterCriteria.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ParameterOption.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/dto/ConfigDescriptionDTO.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/dto/ConfigDescriptionDTOMapper.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/dto/ConfigDescriptionParameterDTO.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/dto/ConfigDescriptionParameterGroupDTO.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/dto/FilterCriteriaDTO.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/dto/ParameterOptionDTO.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/i18n/ConfigI18nLocalizationService.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/ConfigMapper.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/i18n/ConfigDescriptionI18nUtil.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/i18n/I18nConfigOptionsProvider.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/net/NetworkConfigOptionProvider.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/normalization/AbstractNormalizer.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/normalization/BooleanNormalizer.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/normalization/DecimalNormalizer.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/normalization/IntNormalizer.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/normalization/ListNormalizer.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/normalization/Normalizer.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/normalization/NormalizerFactory.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/normalization/TextNormalizer.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/ConfigDescriptionParameterValidator.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/ConfigDescriptionValidatorImpl.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/MessageKey.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/MinMaxValidator.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/PatternValidator.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/RequiredValidator.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/TypeIntrospections.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/TypeValidator.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/metadata/MetadataConfigDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/status/ConfigStatusCallback.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/status/ConfigStatusInfo.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/status/ConfigStatusMessage.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/status/ConfigStatusProvider.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/status/ConfigStatusService.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/status/ConfigStatusSource.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/status/events/ConfigStatusEventFactory.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/status/events/ConfigStatusInfoEvent.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/validation/ConfigDescriptionValidator.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/validation/ConfigValidationException.java (100%)
 rename bundles/org.openhab.core.config.core/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/validation/ConfigValidationMessage.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescriptionBuilderTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescriptionParameterBuilderTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigDescriptionRegistryTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigUtilTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigurationTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/i18n/I18nConfigOptionsProviderTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/normalization/NormalizerTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/ConfigDescriptionValidatorTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/internal/validation/ConfigValidationExceptionTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/status/ConfigStatusInfoTest.java (100%)
 rename bundles/org.openhab.core.config.core/src/test/java/org/{eclipse/smarthome => openhab/core}/config/core/status/ConfigStatusServiceTest.java (100%)
 rename bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/mdns/MDNSDiscoveryParticipant.java (100%)
 rename bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/mdns/internal/MDNSDiscoveryService.java (100%)
 rename bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/upnp/UpnpDiscoveryParticipant.java (100%)
 rename bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/upnp/internal/UpnpDiscoveryService.java (100%)
 rename bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java (100%)
 rename bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java (100%)
 rename bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java (100%)
 rename bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java (100%)
 rename bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/UsbSerialDeviceInformation.java (100%)
 rename bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/UsbSerialDiscovery.java (100%)
 rename bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/UsbSerialDiscoveryListener.java (100%)
 rename bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java (100%)
 rename bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/AbstractDiscoveryService.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/DiscoveryListener.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/DiscoveryResult.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/DiscoveryResultBuilder.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/DiscoveryResultFlag.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/DiscoveryService.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/DiscoveryServiceCallback.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/DiscoveryServiceRegistry.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/ExtendedDiscoveryService.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/ScanListener.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/UpnpDiscoveryParticipant.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/dto/DiscoveryResultDTO.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/dto/DiscoveryResultDTOMapper.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/Inbox.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/InboxAutoApprovePredicate.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/InboxFilterCriteria.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/InboxListener.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/InboxPredicates.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/events/AbstractInboxEvent.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/events/InboxAddedEvent.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/events/InboxEventFactory.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/events/InboxRemovedEvent.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/events/InboxUpdatedEvent.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/internal/AutomaticInboxProcessor.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/internal/DiscoveryResultImpl.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/internal/DiscoveryServiceRegistryImpl.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/internal/PersistentInbox.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/internal/console/InboxConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/test/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/InboxPredicatesTest.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/test/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/events/InboxEventFactoryTest.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/test/java/org/{eclipse/smarthome => openhab/core}/config/discovery/internal/AutomaticInboxProcessorTest.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/test/java/org/{eclipse/smarthome => openhab/core}/config/discovery/internal/DiscoveryResultImplTest.java (100%)
 rename bundles/org.openhab.core.config.discovery/src/test/java/org/{eclipse/smarthome => openhab/core}/config/discovery/internal/PersistentInboxTest.java (100%)
 rename bundles/org.openhab.core.config.dispatch/src/main/java/org/{eclipse/smarthome => openhab/core}/config/dispatch/internal/ConfigDispatcher.java (100%)
 rename bundles/org.openhab.core.config.dispatch/src/main/java/org/{eclipse/smarthome => openhab/core}/config/dispatch/internal/ConfigDispatcherFileWatcher.java (100%)
 rename bundles/org.openhab.core.config.dispatch/src/test/java/org/{eclipse/smarthome => openhab/core}/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java (100%)
 rename bundles/org.openhab.core.config.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/config/serial/internal/SerialConfigOptionProvider.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/AbstractXmlBasedProvider.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/AbstractXmlConfigDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/ConfigDescriptionConverter.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/ConfigDescriptionParameterConverter.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/ConfigDescriptionParameterGroupConverter.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/ConfigXmlConfigDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/FilterCriteriaConverter.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/internal/ConfigDescriptionReader.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/internal/ConfigDescriptionXmlProvider.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/osgi/XmlDocumentBundleTracker.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/osgi/XmlDocumentProvider.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/osgi/XmlDocumentProviderFactory.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/ConverterAssertion.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/ConverterAttributeMapValidator.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/ConverterValueMap.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/GenericUnmarshaller.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/NodeAttributes.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/NodeAttributesConverter.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/NodeIterator.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/NodeList.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/NodeListConverter.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/NodeName.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/NodeValue.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/NodeValueConverter.java (100%)
 rename bundles/org.openhab.core.config.xml/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/util/XmlDocumentReader.java (100%)
 rename bundles/org.openhab.core.ephemeris/src/main/java/org/{eclipse/smarthome => openhab}/core/ephemeris/EphemerisManager.java (100%)
 rename bundles/org.openhab.core.ephemeris/src/main/java/org/{eclipse/smarthome => openhab}/core/ephemeris/internal/EphemerisManagerImpl.java (100%)
 rename bundles/org.openhab.core.extension.sample/src/main/java/org/{eclipse/smarthome => openhab}/core/extension/sample/internal/SampleExtensionService.java (100%)
 rename bundles/org.openhab.core.id/src/main/java/org/{eclipse/smarthome => openhab}/core/id/InstanceUUID.java (100%)
 rename bundles/org.openhab.core.id/src/main/java/org/{eclipse/smarthome => openhab}/core/id/internal/UUIDResource.java (100%)
 rename bundles/org.openhab.core.id/src/test/java/org/{eclipse/smarthome => openhab}/core/id/UUIDTest.java (100%)
 rename bundles/org.openhab.core.io.console.eclipse/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/eclipse/internal/ConsoleSupportEclipse.java (100%)
 rename bundles/org.openhab.core.io.console.eclipse/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/eclipse/internal/OSGiConsole.java (100%)
 rename bundles/org.openhab.core.io.console.karaf/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/karaf/internal/CommandWrapper.java (100%)
 rename bundles/org.openhab.core.io.console.karaf/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/karaf/internal/ConsoleSupportKaraf.java (100%)
 rename bundles/org.openhab.core.io.console.karaf/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/karaf/internal/OSGiConsole.java (100%)
 rename bundles/org.openhab.core.io.console.rfc147/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/rfc147/internal/CommandWrapper.java (100%)
 rename bundles/org.openhab.core.io.console.rfc147/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/rfc147/internal/ConsoleCommandsContainer.java (100%)
 rename bundles/org.openhab.core.io.console.rfc147/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/rfc147/internal/ConsoleSupportRfc147.java (100%)
 rename bundles/org.openhab.core.io.console.rfc147/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/rfc147/internal/OSGiConsole.java (100%)
 rename bundles/org.openhab.core.io.console.rfc147/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.io.console/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/Console.java (100%)
 rename bundles/org.openhab.core.io.console/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/ConsoleInterpreter.java (100%)
 rename bundles/org.openhab.core.io.console/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/extensions/AbstractConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.io.console/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/extensions/ConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.io.console/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/internal/extension/ItemConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.io.console/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/internal/extension/MetadataConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.io.console/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/internal/extension/SendConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.io.console/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/internal/extension/StatusConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.io.console/src/main/java/org/{eclipse/smarthome => openhab/core}/io/console/internal/extension/UpdateConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/auth/basic/internal/BasicChallengeHandler.java (100%)
 rename bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/auth/basic/internal/BasicCredentialsExtractor.java (100%)
 rename bundles/org.openhab.core.io.http.auth/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/auth/CredentialsExtractor.java (100%)
 rename bundles/org.openhab.core.io.http.auth/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/auth/internal/AuthenticationHandler.java (100%)
 rename bundles/org.openhab.core.io.http.auth/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/auth/internal/RedirectHandler.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/Handler.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/HandlerContext.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/HandlerPriorities.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/HttpContextFactoryService.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/WrappingHttpContext.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/internal/BundleHttpContext.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/internal/CatchHandler.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/internal/DefaultHandlerContext.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/internal/DelegatingHttpContext.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/internal/HttpContextFactoryServiceImpl.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/internal/SmartHomeHttpContext.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/servlet/BaseSmartHomeServlet.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/servlet/SmartHomeBundleServlet.java (100%)
 rename bundles/org.openhab.core.io.http/src/main/java/org/{eclipse/smarthome => openhab/core}/io/http/servlet/SmartHomeServlet.java (100%)
 rename bundles/org.openhab.core.io.http/src/test/java/org/{eclipse/smarthome => openhab/core}/io/http/internal/HttpContextFactoryServiceImplTest.java (100%)
 rename bundles/org.openhab.core.io.monitor/src/main/java/org/{eclipse/smarthome => openhab/core}/io/monitor/internal/EventLogger.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/exec/ExecUtil.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/ExtensibleTrustManager.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/HttpClientFactory.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/HttpClientInitializationException.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/HttpRequestBuilder.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/HttpUtil.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/TlsCertificateProvider.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/TlsProvider.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/TlsTrustManagerProvider.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/TrustAllTrustMananger.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/TrustManagerProvider.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/WebSocketFactory.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/internal/ExtensibleTrustManagerImpl.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/internal/TlsCertificateTrustManagerAdapter.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/internal/TrustManagerUtil.java (100%)
 rename bundles/org.openhab.core.io.net/src/main/java/org/{eclipse/smarthome => openhab/core}/io/net/http/internal/WebClientFactoryImpl.java (100%)
 rename bundles/org.openhab.core.io.net/src/test/java/org/{eclipse/smarthome => openhab/core}/io/net/http/BaseHttpUtilTest.java (100%)
 rename bundles/org.openhab.core.io.net/src/test/java/org/{eclipse/smarthome => openhab/core}/io/net/http/HttpRequestBuilderTest.java (100%)
 rename bundles/org.openhab.core.io.net/src/test/java/org/{eclipse/smarthome => openhab/core}/io/net/http/HttpUtilTest.java (100%)
 rename bundles/org.openhab.core.io.net/src/test/java/org/{eclipse/smarthome => openhab/core}/io/net/http/internal/ExtensibleTrustManagerImplTest.java (100%)
 rename bundles/org.openhab.core.io.net/src/test/java/org/{eclipse/smarthome => openhab/core}/io/net/http/internal/WebClientFactoryImplTest.java (100%)
 rename bundles/org.openhab.core.io.rest.audio/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/audio/internal/AudioMapper.java (100%)
 rename bundles/org.openhab.core.io.rest.audio/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/audio/internal/AudioResource.java (100%)
 rename bundles/org.openhab.core.io.rest.audio/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/audio/internal/AudioSinkDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.audio/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/audio/internal/AudioSourceDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.auth/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/auth/internal/SmartHomeRestServletConfig.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/config/ConfigurationService.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/GsonProvider.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/RESTCoreActivator.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/binding/BindingResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/channel/ChannelTypeResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/config/ConfigDescriptionResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/discovery/DiscoveryResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/discovery/InboxResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/extensions/ExtensionResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/item/ItemResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/item/MetadataSelectorMatcher.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/link/ItemChannelLinkResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/persistence/PersistenceResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/profile/ProfileTypeResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/service/ConfigurableServiceResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/thing/ThingResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/thing/ThingTypeResource.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/item/EnrichedGroupItemDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/item/EnrichedItemDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/item/EnrichedItemDTOMapper.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/persistence/ItemHistoryListDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/service/ConfigurableServiceDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/thing/EnrichedChannelDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/thing/EnrichedThingDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/thing/EnrichedThingDTOMapper.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/channel/ChannelTypeResourceTest.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/item/MetadataSelectorMatcherTest.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/item/EnrichedItemDTOMapperTest.java (100%)
 rename bundles/org.openhab.core.io.rest.core/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/thing/EnrichedThingDTOMapperTest.java (100%)
 rename bundles/org.openhab.core.io.rest.log/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/log/internal/LogConstants.java (100%)
 rename bundles/org.openhab.core.io.rest.log/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/log/internal/LogHandler.java (100%)
 rename bundles/org.openhab.core.io.rest.mdns/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/mdns/internal/MDNSAnnouncer.java (100%)
 rename bundles/org.openhab.core.io.rest.optimize/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/optimize/internal/Activator.java (100%)
 rename bundles/org.openhab.core.io.rest.optimize/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/optimize/internal/ResourceFilterImpl.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/SitemapSubscriptionService.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/MappingDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/PageChangeListener.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/PageDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/ServerAliveEvent.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/SitemapChangedEvent.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/SitemapDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/SitemapEvent.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/SitemapEventOutput.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/SitemapResource.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/SitemapWidgetEvent.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/WidgetDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/sitemap/internal/SitemapResourceTest.java (100%)
 rename bundles/org.openhab.core.io.rest.sse/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sse/SseResource.java (100%)
 rename bundles/org.openhab.core.io.rest.sse/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sse/beans/EventBean.java (100%)
 rename bundles/org.openhab.core.io.rest.sse/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sse/internal/SseActivator.java (100%)
 rename bundles/org.openhab.core.io.rest.sse/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sse/internal/SseEventOutput.java (100%)
 rename bundles/org.openhab.core.io.rest.sse/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sse/internal/listeners/SseEventSubscriber.java (100%)
 rename bundles/org.openhab.core.io.rest.sse/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/sse/internal/util/SseUtil.java (100%)
 rename bundles/org.openhab.core.io.rest.sse/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/sse/internal/util/SseUtilTest.java (100%)
 rename bundles/org.openhab.core.io.rest.voice/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/voice/internal/HLIMapper.java (100%)
 rename bundles/org.openhab.core.io.rest.voice/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/voice/internal/HumanLanguageInterpreterDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.voice/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/voice/internal/VoiceDTO.java (100%)
 rename bundles/org.openhab.core.io.rest.voice/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/voice/internal/VoiceMapper.java (100%)
 rename bundles/org.openhab.core.io.rest.voice/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/voice/internal/VoiceResource.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/DTOMapper.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/JSONResponse.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/LocaleService.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/LocaleServiceImpl.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/RESTConstants.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/RESTResource.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/Stream2JSONInputStream.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/internal/Constants.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/internal/DTOMapperImpl.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/internal/filter/CorsFilter.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/internal/filter/ProxyFilter.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/internal/filter/SatisfiableResourceFilter.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/internal/resources/RootResource.java (100%)
 rename bundles/org.openhab.core.io.rest/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/internal/resources/beans/RootBean.java (100%)
 rename bundles/org.openhab.core.io.rest/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/JSONResponseTest.java (100%)
 rename bundles/org.openhab.core.io.rest/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/Stream2JSONInputStreamTest.java (100%)
 rename bundles/org.openhab.core.io.rest/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/internal/filter/CorsFilterTest.java (100%)
 rename bundles/org.openhab.core.io.rest/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/internal/filter/ProxyFilterTest.java (100%)
 rename bundles/org.openhab.core.io.rest/src/test/java/org/{eclipse/smarthome => openhab/core}/io/rest/internal/filter/SatisfiableResourceFilterTest.java (100%)
 rename bundles/org.openhab.core.io.transport.mdns/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mdns/MDNSClient.java (100%)
 rename bundles/org.openhab.core.io.transport.mdns/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mdns/MDNSService.java (100%)
 rename bundles/org.openhab.core.io.transport.mdns/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mdns/ServiceDescription.java (100%)
 rename bundles/org.openhab.core.io.transport.mdns/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java (100%)
 rename bundles/org.openhab.core.io.transport.mdns/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mdns/internal/MDNSActivator.java (100%)
 rename bundles/org.openhab.core.io.transport.mdns/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mdns/internal/MDNSClientImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.mdns/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mdns/internal/MDNSServiceImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttActionCallback.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttBrokerConnection.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttBrokerConnectionConfig.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttConnectionObserver.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttConnectionState.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttException.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttMessageSubscriber.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttService.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttServiceObserver.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttWillAndTestament.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/internal/ClientCallback.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/internal/MqttServiceImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/internal/TopicSubscribers.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/ssl/CustomTrustManagerFactory.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/sslcontext/SSLContextProvider.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttBrokerConnectionEx.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/MqttBrokerConnectionTests.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/internal/MqttServiceTests.java (100%)
 rename bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/{eclipse/smarthome => openhab/core}/io/transport/mqtt/internal/TopicSubscriberTests.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/JavaCommPortProvider.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/SerialPortEventImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/SerialPortIdentifierImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/SerialPortImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/RxTxPortProvider.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/SerialPortEventImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/SerialPortIdentifierImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/SerialPortUtil.java (100%)
 rename bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/rxtx/RxTxSerialPort.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/PortInUseException.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/ProtocolType.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/SerialPort.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/SerialPortEvent.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/SerialPortEventListener.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/SerialPortIdentifier.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/SerialPortManager.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/SerialPortProvider.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/UnsupportedCommOperationException.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/SerialPortManagerImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/SerialPortRegistry.java (100%)
 rename bundles/org.openhab.core.io.transport.serial/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/serial/internal/console/SerialCommandExtension.java (100%)
 rename bundles/org.openhab.core.io.transport.upnp/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/upnp/UpnpIOParticipant.java (100%)
 rename bundles/org.openhab.core.io.transport.upnp/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/upnp/UpnpIOService.java (100%)
 rename bundles/org.openhab.core.io.transport.upnp/src/main/java/org/{eclipse/smarthome => openhab/core}/io/transport/upnp/internal/UpnpIOServiceImpl.java (100%)
 rename bundles/org.openhab.core.io.transport.upnp/src/test/java/org/{eclipse/smarthome => openhab/core}/io/transport/upnp/internal/UpnpIOServiceTest.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/EventType.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/ModelCoreConstants.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/ModelParser.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/ModelRepository.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/ModelRepositoryChangeListener.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/SafeEMF.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/internal/ModelCoreActivator.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/internal/ModelRepositoryImpl.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/internal/SafeEMFImpl.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/internal/folder/FolderObserver.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/internal/util/MathUtils.java (100%)
 rename bundles/org.openhab.core.model.core/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/valueconverter/ValueTypeToStringConverter.java (100%)
 rename bundles/org.openhab.core.model.item.ide/src/org/{eclipse/smarthome => openhab/core}/model/ide/ItemsIdeModule.xtend (100%)
 rename bundles/org.openhab.core.model.item.ide/src/org/{eclipse/smarthome => openhab/core}/model/ide/ItemsIdeSetup.xtend (100%)
 rename bundles/org.openhab.core.model.item.runtime/src/org/{eclipse/smarthome => openhab/core}/model/item/runtime/internal/ItemRuntimeActivator.java (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/GenerateItems.mwe2 (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/Items.xtext (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/ItemsRuntimeModule.xtend (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/ItemsStandaloneSetup.xtend (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/formatting/ItemsFormatter.xtend (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/generator/ItemsGenerator.xtend (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/internal/valueconverter/ItemValueConverters.java (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/item/BindingConfigParseException.java (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/item/BindingConfigReader.java (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/item/internal/GenericItemProvider.java (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/item/internal/GenericMetadataProvider.java (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/scoping/ItemsScopeProvider.xtend (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/serializer/ItemsSemanticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/serializer/ItemsSyntacticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.item/src/org/{eclipse/smarthome => openhab/core}/model/validation/ItemsValidator.xtend (100%)
 rename bundles/org.openhab.core.model.lazygen/src/main/java/org/{eclipse/smarthome => openhab/core}/model/lazygen/GlobalResourceSet.java (100%)
 rename bundles/org.openhab.core.model.lazygen/src/main/java/org/{eclipse/smarthome => openhab/core}/model/lazygen/LazyGenerator.java (100%)
 rename bundles/org.openhab.core.model.lazygen/src/main/java/org/{eclipse/smarthome => openhab/core}/model/lazygen/LazyLanguageConfig.java (100%)
 rename bundles/org.openhab.core.model.lazygen/src/main/java/org/{eclipse/smarthome => openhab/core}/model/lazygen/LazyStandaloneSetup.java (100%)
 rename bundles/org.openhab.core.model.lsp/src/main/java/org/{eclipse/smarthome => openhab/core}/model/lsp/internal/MappingUriExtensions.java (100%)
 rename bundles/org.openhab.core.model.lsp/src/main/java/org/{eclipse/smarthome => openhab/core}/model/lsp/internal/ModelServer.java (100%)
 rename bundles/org.openhab.core.model.lsp/src/main/java/org/{eclipse/smarthome => openhab/core}/model/lsp/internal/RegistryProvider.java (100%)
 rename bundles/org.openhab.core.model.lsp/src/main/java/org/{eclipse/smarthome => openhab/core}/model/lsp/internal/RuntimeServerModule.java (100%)
 rename bundles/org.openhab.core.model.lsp/src/test/java/org/{eclipse/smarthome => openhab/core}/model/lsp/internal/MappingUriExtensionsTest.java (100%)
 rename bundles/org.openhab.core.model.persistence.ide/src/org/{eclipse/smarthome => openhab/core}/model/persistence/ide/PersistenceIdeModule.xtend (100%)
 rename bundles/org.openhab.core.model.persistence.ide/src/org/{eclipse/smarthome => openhab/core}/model/persistence/ide/PersistenceIdeSetup.xtend (100%)
 rename bundles/org.openhab.core.model.persistence.runtime/src/org/{eclipse/smarthome => openhab/core}/model/persistence/runtime/internal/PersistenceRuntimeActivator.java (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/GeneratePersistence.mwe2 (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/Persistence.xtext (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/PersistenceRuntimeModule.xtend (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/PersistenceStandaloneSetup.xtend (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/extensions/PersistenceExtensions.java (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/formatting/PersistenceFormatter.xtend (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/generator/PersistenceGenerator.xtend (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/internal/PersistenceModelManager.java (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/scoping/GlobalStrategies.java (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/scoping/PersistenceGlobalScopeProvider.java (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/scoping/PersistenceScopeProvider.xtend (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/serializer/PersistenceSemanticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/serializer/PersistenceSyntacticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.persistence/src/org/{eclipse/smarthome => openhab/core}/model/persistence/validation/PersistenceValidator.xtend (100%)
 rename bundles/org.openhab.core.model.rule.ide/src/org/{eclipse/smarthome => openhab/core}/model/rule/ide/RulesIdeModule.xtend (100%)
 rename bundles/org.openhab.core.model.rule.ide/src/org/{eclipse/smarthome => openhab/core}/model/rule/ide/RulesIdeSetup.xtend (100%)
 rename bundles/org.openhab.core.model.rule.runtime/src/org/{eclipse/smarthome => openhab/core}/model/rule/runtime/RuleEngine.java (100%)
 rename bundles/org.openhab.core.model.rule.runtime/src/org/{eclipse/smarthome => openhab/core}/model/rule/runtime/internal/RuleRuntimeActivator.java (100%)
 rename bundles/org.openhab.core.model.rule.runtime/src/org/{eclipse/smarthome => openhab/core}/model/rule/runtime/internal/engine/ExecuteRuleJob.java (100%)
 rename bundles/org.openhab.core.model.rule.runtime/src/org/{eclipse/smarthome => openhab/core}/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java (100%)
 rename bundles/org.openhab.core.model.rule.runtime/src/org/{eclipse/smarthome => openhab/core}/model/rule/runtime/internal/engine/RuleContextHelper.java (100%)
 rename bundles/org.openhab.core.model.rule.runtime/src/org/{eclipse/smarthome => openhab/core}/model/rule/runtime/internal/engine/RuleEngineImpl.java (100%)
 rename bundles/org.openhab.core.model.rule.runtime/src/org/{eclipse/smarthome => openhab/core}/model/rule/runtime/internal/engine/RuleEvaluationContext.java (100%)
 rename bundles/org.openhab.core.model.rule.runtime/src/org/{eclipse/smarthome => openhab/core}/model/rule/runtime/internal/engine/RuleTriggerManager.java (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/GenerateRules.mwe2 (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/Rules.xtext (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/RulesRuntimeModule.xtend (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/RulesStandaloneSetup.xtend (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/formatting/RulesFormatter.xtend (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/jvmmodel/RulesItemRefresher.java (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/jvmmodel/RulesJvmModelInferrer.xtend (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/jvmmodel/RulesRefresher.java (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/jvmmodel/RulesThingRefresher.java (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/scoping/RulesImplicitlyImportedTypes.java (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/scoping/RulesScopeProvider.xtend (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/serializer/RulesSemanticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/serializer/RulesSyntacticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.rule/src/org/{eclipse/smarthome => openhab/core}/model/rule/validation/RulesValidator.xtend (100%)
 rename bundles/org.openhab.core.model.script.ide/src/org/{eclipse/smarthome => openhab/core}/model/script/ide/ScriptIdeModule.xtend (100%)
 rename bundles/org.openhab.core.model.script.ide/src/org/{eclipse/smarthome => openhab/core}/model/script/ide/ScriptIdeSetup.xtend (100%)
 rename bundles/org.openhab.core.model.script.runtime/src/org/{eclipse/smarthome => openhab/core}/model/script/runtime/ScriptRuntime.java (100%)
 rename bundles/org.openhab.core.model.script.runtime/src/org/{eclipse/smarthome => openhab/core}/model/script/runtime/internal/engine/ScriptEngineImpl.java (100%)
 rename bundles/org.openhab.core.model.script.runtime/src/org/{eclipse/smarthome => openhab/core}/model/script/runtime/internal/engine/ScriptImpl.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/GenerateScript.mwe2 (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/OptimizingFeatureScopeTrackerProvider2.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/Script.xtext (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/ScriptRuntimeModule.xtend (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/ScriptServiceUtil.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/ScriptStandaloneSetup.xtend (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/ServiceModule.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/Audio.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/BusEvent.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/Ephemeris.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/Exec.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/HTTP.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/LogAction.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/Ping.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/ScriptExecution.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/Things.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/Timer.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/actions/Voice.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/IActionServiceProvider.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/IThingActionsProvider.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/Script.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/ScriptEngine.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/ScriptError.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/ScriptException.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/ScriptExecutionException.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/ScriptParsingException.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/action/ActionDoc.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/action/ActionService.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/engine/action/ParamDoc.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/extension/ScriptEngineConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/formatting/ScriptFormatter.xtend (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/RuleHumanLanguageInterpreter.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/ScriptEncodingProvider.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/actions/TimerExecutionJob.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/actions/TimerImpl.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/engine/action/AudioActionService.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/engine/action/EphemerisActionService.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/engine/action/PersistenceActionService.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/engine/action/ThingActionService.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/engine/action/TransformationActionService.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/internal/engine/action/VoiceActionService.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/interpreter/ScriptInterpreter.xtend (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/jvmmodel/ScriptItemRefresher.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/jvmmodel/ScriptJvmModelInferrer.xtend (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/jvmmodel/ScriptTypeComputer.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/lib/NumberExtensions.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/scoping/ActionClassLoader.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/scoping/ScriptImplicitlyImportedTypes.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/scoping/ScriptScopeProvider.xtend (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/scoping/StateAndCommandProvider.java (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/serializer/ScriptSemanticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/serializer/ScriptSyntacticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.script/src/org/{eclipse/smarthome => openhab/core}/model/script/validation/ScriptValidator.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap.ide/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/ide/SitemapIdeModule.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap.ide/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/ide/SitemapIdeSetup.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap.runtime/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/runtime/internal/SitemapRuntimeActivator.java (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/GenerateSitemap.mwe2 (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/Sitemap.properties (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/Sitemap.xtext (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/SitemapProvider.java (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/SitemapRuntimeModule.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/SitemapStandaloneSetup.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/formatting/SitemapFormatter.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/generator/SitemapGenerator.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/internal/SitemapProviderImpl.java (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/scoping/SitemapScopeProvider.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/serializer/SitemapSemanticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/serializer/SitemapSyntacticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/validation/SitemapValidator.xtend (100%)
 rename bundles/org.openhab.core.model.sitemap/src/org/{eclipse/smarthome => openhab/core}/model/sitemap/valueconverter/SitemapConverters.java (100%)
 rename bundles/org.openhab.core.model.thing.ide/src/org/{eclipse/smarthome => openhab/core}/model/thing/ide/ThingIdeModule.xtend (100%)
 rename bundles/org.openhab.core.model.thing.ide/src/org/{eclipse/smarthome => openhab/core}/model/thing/ide/ThingIdeSetup.xtend (100%)
 rename bundles/org.openhab.core.model.thing.runtime/src/org/{eclipse/smarthome => openhab/core}/model/thing/runtime/internal/ThingRuntimeActivator.java (100%)
 rename bundles/org.openhab.core.model.thing/src.moved/test/java/org/{eclipse/smarthome => openhab/core}/model/thing/internal/GenericThingProviderMultipleBundlesTest.java (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/GenerateThing.mwe2 (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/Thing.xtext (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/ThingRuntimeModule.xtend (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/ThingStandaloneSetup.xtend (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/formatting/ThingFormatter.xtend (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/generator/ThingGenerator.xtend (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/internal/GenericItemChannelLinkProvider.java (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/internal/GenericThingProvider.xtend (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/scoping/ThingScopeProvider.xtend (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/serializer/ThingSemanticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/serializer/ThingSyntacticSequencer.xtend (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/serializer/ThingSyntacticSequencerExtension.java (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/validation/ThingValidator.xtend (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/valueconverter/ThingValueConverters.java (100%)
 rename bundles/org.openhab.core.model.thing/src/org/{eclipse/smarthome => openhab/core}/model/thing/valueconverter/UIDtoStringConverter.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/FilterCriteria.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/HistoricItem.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/ModifiablePersistenceService.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/PersistenceItemInfo.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/PersistenceManager.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/PersistenceService.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/PersistenceServiceConfiguration.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/PersistenceServiceRegistry.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/QueryablePersistenceService.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/SimpleFilter.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/SimpleItemConfiguration.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/config/SimpleAllConfig.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/config/SimpleConfig.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/config/SimpleGroupConfig.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/config/SimpleItemConfig.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/dto/ItemHistoryDTO.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/dto/PersistenceServiceDTO.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/internal/PersistItemsJob.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/internal/PersistenceManagerImpl.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/internal/PersistenceServiceRegistryImpl.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/strategy/SimpleCronStrategy.java (100%)
 rename bundles/org.openhab.core.persistence/src/main/java/org/{eclipse/smarthome => openhab}/core/persistence/strategy/SimpleStrategy.java (100%)
 rename bundles/org.openhab.core.scheduler/src/main/java/org/{eclipse/smarthome => openhab}/core/scheduler/internal/SchedulerActivator.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/SemanticTags.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/SemanticsPredicates.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/SemanticsService.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/internal/SemanticsMetadataProvider.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/internal/SemanticsServiceImpl.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/Equipment.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/Location.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/Point.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/Property.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/Tag.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/TagInfo.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Battery.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Blinds.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Camera.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Car.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/CleaningRobot.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Door.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Equipments.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/FrontDoor.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/GarageDoor.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/HVAC.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Inverter.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/LawnMower.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Lightbulb.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Lock.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/MotionDetector.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/NetworkAppliance.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/PowerOutlet.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Projector.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/RadiatorControl.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Receiver.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/RemoteControl.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Screen.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Siren.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/SmokeDetector.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Speaker.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Valve.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/WallSwitch.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/WebService.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/WhiteGood.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/equipment/Window.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Attic.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Basement.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Bathroom.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Bedroom.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Building.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Carport.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Corridor.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/FirstFloor.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Floor.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Garage.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Garden.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/GroundFloor.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Indoor.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Kitchen.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/LivingRoom.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Locations.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Outdoor.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Room.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/location/Terrace.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/Alarm.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/Control.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/LowBattery.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/Measurement.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/OpenLevel.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/OpenState.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/Points.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/Setpoint.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/Status.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/Switch.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/Tampered.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/point/Tilt.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/CO.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/CO2.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/ColorTemperature.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Current.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Energy.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Frequency.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Gas.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Humidity.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Light.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Noise.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Oil.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Power.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Presence.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Pressure.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Properties.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Rain.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Smoke.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/SoundVolume.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Temperature.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Voltage.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Water.java (100%)
 rename bundles/org.openhab.core.semantics/src/main/java/org/{eclipse/smarthome => openhab}/core/semantics/model/property/Wind.java (100%)
 rename bundles/org.openhab.core.semantics/src/test/java/org/{eclipse/smarthome => openhab}/core/semantics/SemanticTagsTest.java (100%)
 rename bundles/org.openhab.core.semantics/src/test/java/org/{eclipse/smarthome => openhab}/core/semantics/internal/SemanticsServiceImplTest.java (100%)
 rename bundles/org.openhab.core.storage.json/src/main/java/org/{eclipse/smarthome => openhab/core}/storage/json/internal/JsonStorage.java (100%)
 rename bundles/org.openhab.core.storage.json/src/main/java/org/{eclipse/smarthome => openhab/core}/storage/json/internal/JsonStorageService.java (100%)
 rename bundles/org.openhab.core.storage.json/src/main/java/org/{eclipse/smarthome => openhab/core}/storage/json/internal/StorageEntry.java (100%)
 rename bundles/org.openhab.core.storage.json/src/main/java/org/{eclipse/smarthome => openhab/core}/storage/json/internal/StorageEntryMapDeserializer.java (100%)
 rename bundles/org.openhab.core.storage.json/src/test/java/org/{eclipse/smarthome => openhab/core}/storage/json/internal/JsonStorageTest.java (100%)
 rename bundles/org.openhab.core.storage.mapdb/src/main/java/org/{eclipse/smarthome => openhab/core}/storage/mapdb/internal/MapDbStorage.java (100%)
 rename bundles/org.openhab.core.storage.mapdb/src/main/java/org/{eclipse/smarthome => openhab/core}/storage/mapdb/internal/MapDbStorageService.java (100%)
 rename bundles/org.openhab.core.storage.mapdb/src/main/java/org/{eclipse/smarthome => openhab/core}/storage/mapdb/internal/PropertiesTypeAdapter.java (100%)
 rename bundles/org.openhab.core.storage.mapdb/src/main/java/org/{eclipse/smarthome => openhab/core}/storage/mapdb/internal/PropertiesTypeAdapterFactory.java (100%)
 rename bundles/org.openhab.core.storage.mapdb/src/test/java/org/{eclipse/smarthome => openhab/core}/storage/mapdb/internal/MapDbStorageServiceTest.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/MagicBindingConstants.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/MagicService.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicActionModuleThingHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicBridgeHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicBridgedThingHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicChattyThingHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicColorLightHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicConfigurableThingHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicContactHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicDelayedOnlineHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicDimmableLightHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicExtensibleThingHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicFirmwareUpdateThingHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicImageHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicLocationThingHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicOnOffLightHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicOnlineOfflineHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicPlayerHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicRolllershutterHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicThermostatThingHandler.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/MagicDiscoveryService.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/MagicDynamicStateDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/MagicHandlerFactory.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/MagicServiceConfig.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/MagicServiceImpl.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/automation/modules/MagicMultiActionMarker.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/automation/modules/MagicSingleActionService.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/automation/modules/MagicThingActionsService.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/firmware/MagicFirmwareProvider.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/http/MagicHttpResource.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/internal/metadata/MagicMetadataProvider.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/internal/metadata/MagicMetadataProvider2.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/internal/metadata/MagicMetadataUsingService.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/service/MagicMultiInstanceService.java (100%)
 rename bundles/org.openhab.core.test.magic/src/main/java/org/{eclipse/smarthome => openhab/core}/magic/service/MagicMultiInstanceServiceMarker.java (100%)
 rename bundles/org.openhab.core.test.magic/src/test/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicColorLightHandlerTest.java (100%)
 rename bundles/org.openhab.core.test.magic/src/test/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicDimmableLightHandlerTest.java (100%)
 rename bundles/org.openhab.core.test.magic/src/test/java/org/{eclipse/smarthome => openhab/core}/magic/binding/handler/MagicOnOffLightHandlerTest.java (100%)
 rename bundles/org.openhab.core.test.magic/src/test/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/MagicHandlerFactoryTest.java (100%)
 rename bundles/org.openhab.core.test.magic/src/test/java/org/{eclipse/smarthome => openhab/core}/magic/binding/internal/MagicServiceImplTest.java (100%)
 rename bundles/org.openhab.core.test/src/main/java/org/{eclipse/smarthome => openhab/core}/test/AsyncResultWrapper.java (100%)
 rename bundles/org.openhab.core.test/src/main/java/org/{eclipse/smarthome => openhab/core}/test/BundleCloseable.java (100%)
 rename bundles/org.openhab.core.test/src/main/java/org/{eclipse/smarthome => openhab/core}/test/SyntheticBundleInstaller.java (100%)
 rename bundles/org.openhab.core.test/src/main/java/org/{eclipse/smarthome => openhab/core}/test/TestPortUtil.java (100%)
 rename bundles/org.openhab.core.test/src/main/java/org/{eclipse/smarthome => openhab/core}/test/TestServer.java (100%)
 rename bundles/org.openhab.core.test/src/main/java/org/{eclipse/smarthome => openhab/core}/test/internal/java/MissingServiceAnalyzer.java (100%)
 rename bundles/org.openhab.core.test/src/main/java/org/{eclipse/smarthome => openhab/core}/test/java/JavaOSGiTest.java (100%)
 rename bundles/org.openhab.core.test/src/main/java/org/{eclipse/smarthome => openhab/core}/test/java/JavaTest.java (100%)
 rename bundles/org.openhab.core.test/src/main/java/org/{eclipse/smarthome => openhab/core}/test/storage/VolatileStorage.java (100%)
 rename bundles/org.openhab.core.test/src/main/java/org/{eclipse/smarthome => openhab/core}/test/storage/VolatileStorageService.java (100%)
 rename bundles/org.openhab.core.test/src/test/java/org/{eclipse/smarthome => openhab/core}/test/java/JavaTestTest.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/AbstractDescriptionTypeConverter.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/BridgeTypeConverter.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/BridgeTypeXmlResult.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ChannelConverter.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ChannelGroupTypeConverter.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ChannelGroupTypeXmlResult.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ChannelTypeConverter.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ChannelTypeXmlResult.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ChannelXmlResult.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/CommandDescriptionConverter.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/EventDescriptionConverter.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/StateDescriptionConverter.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ThingDescriptionConverter.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ThingDescriptionList.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ThingDescriptionReader.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ThingTypeConverter.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ThingTypeXmlProvider.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ThingTypeXmlResult.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/ThingXmlConfigDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/XmlChannelGroupTypeProvider.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/XmlChannelTypeProvider.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/XmlHelper.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/XmlThingTypeProvider.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/Example.java (100%)
 rename bundles/org.openhab.core.thing.xml/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/xml/internal/XmlHelperTest.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/Bridge.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/Channel.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ChannelGroupUID.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ChannelUID.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/CommonTriggerEvents.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/DefaultSystemChannelTypeProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ManagedThingProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/Thing.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingManager.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingRegistry.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingRegistryChangeListener.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingStatus.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingStatusDetail.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingStatusInfo.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingTypeMigrationService.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingTypeUID.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingUID.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/UID.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/BaseBridgeHandler.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/BaseDynamicCommandDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/BaseDynamicStateDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/BaseThingHandler.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/BaseThingHandlerFactory.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/BridgeHandler.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ConfigStatusBridgeHandler.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ConfigStatusThingHandler.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ThingActions.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ThingActionsScope.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ThingConfigStatusSource.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ThingFactory.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ThingHandler.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ThingHandlerCallback.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ThingHandlerFactory.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ThingHandlerService.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ThingTypeProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/builder/BridgeBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/builder/ChannelBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/builder/ThingBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/builder/ThingStatusInfoBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/firmware/Firmware.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/firmware/FirmwareBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/firmware/FirmwareRestriction.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/firmware/FirmwareUpdateBackgroundTransferHandler.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/firmware/FirmwareUpdateHandler.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/firmware/ProgressCallback.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/firmware/ProgressStep.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/dto/ChannelDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/dto/ChannelDTOMapper.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/dto/ChannelDefinitionDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/dto/ChannelGroupDefinitionDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/dto/ChannelTypeDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/dto/StrippedThingTypeDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/dto/StrippedThingTypeDTOMapper.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/dto/ThingDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/dto/ThingDTOMapper.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/dto/ThingTypeDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/events/AbstractThingRegistryEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/events/ChannelTriggeredEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/events/ThingAddedEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/events/ThingEventFactory.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/events/ThingRemovedEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/events/ThingStatusInfoChangedEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/events/ThingStatusInfoEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/events/ThingUpdatedEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareEventFactory.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareRegistry.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareStatus.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareStatusInfo.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareStatusInfoEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareUpdateProgressInfo.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareUpdateProgressInfoEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareUpdateResult.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareUpdateResultInfo.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareUpdateResultInfoEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareUpdateService.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/dto/FirmwareDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/dto/FirmwareStatusDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/i18n/ChannelGroupTypeI18nLocalizationService.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/i18n/ChannelTypeI18nLocalizationService.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/i18n/ThingStatusInfoI18nLocalizationService.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/i18n/ThingTypeI18nLocalizationService.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/AutoUpdateConfigDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/AutoUpdateManager.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/BridgeImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ChannelCommandDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ChannelItemProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ChannelStateDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/CommunicationManager.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ProfileContextImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingConfigDescriptionAliasProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingFactoryHelper.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingManagerImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingRegistryImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingTracker.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/console/FirmwareUpdateConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/console/LinkConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/console/ThingConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/firmware/FirmwareImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/firmware/FirmwareRegistryImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/firmware/ParameterChecks.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/firmware/ProgressCallbackImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/i18n/ChannelGroupI18nUtil.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/i18n/ChannelI18nUtil.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/i18n/ThingTypeI18nUtil.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/link/ItemChannelLinkConfigDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/ProfileCallbackImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/ProfileTypeRegistryImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawButtonOnOffSwitchProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawButtonTogglePlayerProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawButtonToggleRollershutterProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawButtonToggleSwitchProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawRockerDimmerProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawRockerNextPreviousProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawRockerOnOffProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawRockerPlayPauseProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawRockerRewindFastforwardProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawRockerStopMoveProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawRockerUpDownProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/StateProfileTypeImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/SystemDefaultProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/SystemFollowProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/SystemOffsetProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/SystemProfileFactory.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/TimestampChangeProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/TimestampUpdateProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/TriggerProfileTypeImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/i18n/ProfileI18nUtil.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/type/AbstractChannelTypeBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/type/StateChannelTypeBuilderImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/type/TriggerChannelTypeBuilderImpl.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/AbstractLink.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/AbstractLinkRegistry.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/ItemChannelLink.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/ItemChannelLinkProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/ItemChannelLinkRegistry.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/ManagedItemChannelLinkProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/ThingLinkManager.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/dto/AbstractLinkDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/dto/ItemChannelLinkDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/events/AbstractItemChannelLinkRegistryEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/events/ItemChannelLinkAddedEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/events/ItemChannelLinkRemovedEvent.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/events/LinkEventFactory.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/Profile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/ProfileAdvisor.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/ProfileCallback.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/ProfileContext.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/ProfileFactory.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/ProfileType.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/ProfileTypeBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/ProfileTypeProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/ProfileTypeRegistry.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/ProfileTypeUID.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/StateProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/StateProfileType.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/SystemProfiles.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/TriggerProfile.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/TriggerProfileType.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/dto/ProfileTypeDTO.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/dto/ProfileTypeDTOMapper.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/i18n/ProfileTypeI18nLocalizationService.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/AbstractDescriptionType.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/AutoUpdatePolicy.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/BridgeType.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelDefinition.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelDefinitionBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelGroupDefinition.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelGroupType.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelGroupTypeBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelGroupTypeProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelGroupTypeRegistry.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelGroupTypeUID.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelKind.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelType.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelTypeBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelTypeProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelTypeRegistry.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelTypeUID.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/DynamicCommandDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/DynamicStateDescriptionProvider.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/StateChannelTypeBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ThingType.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ThingTypeBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ThingTypeRegistry.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/TriggerChannelTypeBuilder.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/util/ThingHandlerHelper.java (100%)
 rename bundles/org.openhab.core.thing/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/util/ThingHelper.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/ChannelGroupUIDTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/ChannelTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/ChannelUIDTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/ThingUIDTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/UIDTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/binding/builder/ChannelBuilderTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/binding/builder/ThingBuilderTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/binding/builder/ThingStatusInfoBuilderTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareEventFactoryTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/AutoUpdateManagerTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ChannelItemProviderTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingImplTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingManagerImplTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/firmware/ProgressCallbackTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawButtonOnOffSwitchProfileTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/SystemDefaultProfileTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/SystemFollowProfileTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/SystemOffsetProfileTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/TimestampProfileTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelGroupTypeBuilderTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelTypeBuilderTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/type/ThingTypeBuilderTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/util/ThingHandlerHelperTest.java (100%)
 rename bundles/org.openhab.core.thing/src/test/java/org/{eclipse/smarthome => openhab}/core/thing/util/ThingHelperTest.java (100%)
 rename bundles/org.openhab.core.transform/src/main/java/org/{eclipse/smarthome => openhab}/core/transform/AbstractFileTransformationService.java (100%)
 rename bundles/org.openhab.core.transform/src/main/java/org/{eclipse/smarthome => openhab}/core/transform/TransformationException.java (100%)
 rename bundles/org.openhab.core.transform/src/main/java/org/{eclipse/smarthome => openhab}/core/transform/TransformationHelper.java (100%)
 rename bundles/org.openhab.core.transform/src/main/java/org/{eclipse/smarthome => openhab}/core/transform/TransformationService.java (100%)
 rename bundles/org.openhab.core.transform/src/main/java/org/{eclipse/smarthome => openhab}/core/transform/actions/Transformation.java (100%)
 rename bundles/org.openhab.core.transform/src/main/java/org/{eclipse/smarthome => openhab}/core/transform/internal/TransformationActivator.java (100%)
 rename bundles/org.openhab.core.transform/src/test/java/org/{eclipse/smarthome => openhab}/core/transform/actions/TransformationTest.java (100%)
 rename bundles/org.openhab.core.ui.icon/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/icon/AbstractResourceIconProvider.java (100%)
 rename bundles/org.openhab.core.ui.icon/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/icon/IconProvider.java (100%)
 rename bundles/org.openhab.core.ui.icon/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/icon/IconSet.java (100%)
 rename bundles/org.openhab.core.ui.icon/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/icon/internal/CustomIconProvider.java (100%)
 rename bundles/org.openhab.core.ui.icon/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/icon/internal/IconServlet.java (100%)
 rename bundles/org.openhab.core.ui.icon/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/icon/internal/IconSetResource.java (100%)
 rename bundles/org.openhab.core.ui.icon/src/test/java/org/{eclipse/smarthome => openhab/core}/ui/icon/AbstractResourceIconProviderTest.java (100%)
 rename bundles/org.openhab.core.ui.icon/src/test/java/org/{eclipse/smarthome => openhab/core}/ui/icon/internal/IconServletTest.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/chart/ChartProvider.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/UIActivator.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/chart/ChartServlet.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/chart/defaultchartprovider/ChartTheme.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/chart/defaultchartprovider/ChartThemeBlack.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/chart/defaultchartprovider/ChartThemeBright.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/chart/defaultchartprovider/ChartThemeDark.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/chart/defaultchartprovider/ChartThemeWhite.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/items/ItemUIRegistryImpl.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/proxy/AsyncProxyServlet.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/proxy/BlockingProxyServlet.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/internal/proxy/ProxyServletService.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/items/ItemUIProvider.java (100%)
 rename bundles/org.openhab.core.ui/src/main/java/org/{eclipse/smarthome => openhab/core}/ui/items/ItemUIRegistry.java (100%)
 rename bundles/org.openhab.core.ui/src/test/java/org/{eclipse/smarthome => openhab/core}/ui/internal/items/ItemUIRegistryImplTest.java (100%)
 rename bundles/org.openhab.core.ui/src/test/java/org/{eclipse/smarthome => openhab/core}/ui/internal/proxy/ProxyServletServiceTest.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/AudioStartEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/AudioStopEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/KSErrorEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/KSEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/KSException.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/KSListener.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/KSService.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/KSServiceHandle.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/KSpottedEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/RecognitionStartEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/RecognitionStopEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/STTEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/STTException.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/STTListener.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/STTService.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/STTServiceHandle.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/SpeechRecognitionErrorEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/SpeechRecognitionEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/SpeechStartEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/SpeechStopEvent.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/TTSException.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/TTSService.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/Voice.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/VoiceManager.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/DialogProcessor.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/VoiceConsoleCommandExtension.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/VoiceManagerImpl.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/text/StandardInterpreter.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/ASTNode.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/AbstractRuleBasedInterpreter.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/Expression.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/ExpressionAlternatives.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/ExpressionCardinality.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/ExpressionIdentifier.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/ExpressionLet.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/ExpressionMatch.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/ExpressionSequence.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/HumanLanguageInterpreter.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/InterpretationException.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/InterpretationResult.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/Rule.java (100%)
 rename bundles/org.openhab.core.voice/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/text/TokenList.java (100%)
 rename bundles/org.openhab.core.voice/src/test/java/org/{eclipse/smarthome => openhab}/core/voice/STTExceptionTest.java (100%)
 rename bundles/org.openhab.core.voice/src/test/java/org/{eclipse/smarthome => openhab}/core/voice/SpeechRecognitionErrorEventTest.java (100%)
 rename bundles/org.openhab.core.voice/src/test/java/org/{eclipse/smarthome => openhab}/core/voice/SpeechRecognitionEventTest.java (100%)
 rename bundles/org.openhab.core.voice/src/test/java/org/{eclipse/smarthome => openhab}/core/voice/TTSExceptionTest.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/Authentication.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/AuthenticationException.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/AuthenticationManager.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/AuthenticationProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/Credentials.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/Role.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/SecurityException.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/UnsupportedCredentialsException.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/UsernamePasswordCredentials.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/client/oauth2/AccessTokenRefreshListener.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/client/oauth2/AccessTokenResponse.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/client/oauth2/OAuthClientService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/client/oauth2/OAuthException.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/client/oauth2/OAuthFactory.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/client/oauth2/OAuthResponseException.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/auth/client/oauth2/StorageCipher.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/BindingInfo.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/BindingInfoProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/BindingInfoRegistry.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/dto/BindingInfoDTO.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/i18n/BindingI18nLocalizationService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/internal/i18n/BindingI18nUtil.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/cache/ExpiringCache.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/cache/ExpiringCacheAsync.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/cache/ExpiringCacheMap.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/AbstractUID.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/NamedThreadFactory.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/QueueingThreadPoolExecutor.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/SafeCaller.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/SafeCallerBuilder.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/ThreadFactoryBuilder.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/ThreadPoolManager.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/osgi/ResourceBundleClassLoader.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/registry/AbstractManagedProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/registry/AbstractProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/registry/AbstractRegistry.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/registry/DefaultAbstractManagedProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/registry/Identifiable.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/registry/ManagedProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/registry/Provider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/registry/ProviderChangeListener.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/registry/Registry.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/common/registry/RegistryChangeListener.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/events/AbstractEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/events/AbstractEventFactory.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/events/AbstractTypedEventSubscriber.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/events/Event.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/events/EventFactory.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/events/EventFilter.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/events/EventPublisher.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/events/EventSubscriber.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/events/TopicEventFilter.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/extension/Extension.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/extension/ExtensionEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/extension/ExtensionEventFactory.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/extension/ExtensionService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/extension/ExtensionType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/i18n/I18nUtil.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/i18n/LocaleProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/i18n/LocalizedKey.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/i18n/LocationProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/i18n/TimeZoneProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/i18n/TranslationProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/i18n/UnitProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/auth/AuthenticationManagerImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/AbstractInvocationHandler.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/CombinedClassLoader.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/DuplicateExecutionException.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/Invocation.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/InvocationHandlerAsync.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/InvocationHandlerSync.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/SafeCallManager.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/SafeCallManagerImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/SafeCallerBuilderImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/SafeCallerImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/WrappedScheduledExecutorService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/events/EventHandler.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/events/OSGiEventManager.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/events/OSGiEventPublisher.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/events/ThreadedEventHandler.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/i18n/I18nProviderImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/i18n/LanguageResourceBundleManager.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/i18n/ResourceBundleTracker.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/items/GroupFunctionHelper.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/items/ItemBuilderFactoryImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/items/ItemBuilderImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/items/ItemRegistryImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/items/ItemStateConverterImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/items/ItemUpdater.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/items/ManagedMetadataProviderImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/items/MetadataRegistryImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/library/unit/UnitInitializer.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/CronAdjuster.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/CronSchedulerImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/DelegatedSchedulerImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/PeriodicAdjuster.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/PeriodicSchedulerImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/SchedulerImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/service/BundleResolverImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/service/CommandDescriptionServiceImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/service/ReadyServiceImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/service/StateDescriptionServiceImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/types/CommandDescriptionImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/types/StateDescriptionFragmentImpl.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ActiveItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/GenericItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/GroupFunction.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/GroupItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/Item.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemBuilder.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemBuilderFactory.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemFactory.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemLookupException.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemNotFoundException.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemNotUniqueException.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemPredicates.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemRegistry.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemRegistryChangeListener.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemStateConverter.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemUtil.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ManagedItemProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ManagedMetadataProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/Metadata.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/MetadataKey.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/MetadataPredicates.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/MetadataProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/MetadataRegistry.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/RegistryHook.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/StateChangeListener.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/dto/GroupFunctionDTO.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/dto/GroupItemDTO.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/dto/ItemDTO.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/dto/ItemDTOMapper.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/dto/MetadataDTO.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/AbstractItemEventSubscriber.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/AbstractItemRegistryEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/GroupItemStateChangedEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/ItemAddedEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/ItemCommandEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/ItemEventFactory.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/ItemRemovedEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/ItemStateChangedEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/ItemStateEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/ItemStatePredictedEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/ItemUpdatedEvent.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/CoreItemFactory.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/dimension/ArealDensity.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/dimension/DataAmount.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/dimension/DataTransferRate.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/dimension/Density.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/dimension/Intensity.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/dimension/VolumetricFlowRate.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/CallItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/ColorItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/ContactItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/DateTimeItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/DimmerItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/ImageItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/LocationItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/NumberItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/PlayerItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/RollershutterItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/StringItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/items/SwitchItem.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/ArithmeticGroupFunction.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/DateTimeGroupFunction.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/DateTimeType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/DecimalType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/HSBType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/IncreaseDecreaseType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/NextPreviousType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/OnOffType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/OpenClosedType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/PercentType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/PlayPauseType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/PointType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/QuantityType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/QuantityTypeArithmeticGroupFunction.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/RawType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/RewindFastforwardType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/StopMoveType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/StringListType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/StringType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/types/UpDownType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/unit/BinaryPrefix.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/unit/CustomUnits.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/unit/ImperialUnits.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/unit/MetricPrefix.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/unit/SIUnits.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/library/unit/SmartHomeUnits.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/net/CidrAddress.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/net/HttpServiceUtil.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/net/NetUtil.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/net/NetworkAddressChangeListener.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/net/NetworkAddressService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/scheduler/CronJob.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/scheduler/CronScheduler.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/scheduler/PeriodicScheduler.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/scheduler/ScheduledCompletableFuture.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/scheduler/Scheduler.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/scheduler/SchedulerRunnable.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/scheduler/SchedulerTemporalAdjuster.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/service/AbstractWatchService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/service/CommandDescriptionService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/service/ReadyMarker.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/service/ReadyMarkerFilter.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/service/ReadyMarkerUtils.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/service/ReadyService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/service/StateDescriptionService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/service/WatchQueueReader.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/storage/DeletableStorage.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/storage/DeletableStorageService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/storage/Storage.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/storage/StorageService.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/Command.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/CommandDescription.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/CommandDescriptionBuilder.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/CommandDescriptionProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/CommandOption.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/ComplexType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/EventDescription.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/EventOption.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/EventType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/PrimitiveType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/RefreshType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/State.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/StateDescription.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/StateDescriptionFragment.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/StateDescriptionFragmentBuilder.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/StateDescriptionFragmentProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/StateDescriptionProvider.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/StateOption.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/Type.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/TypeParser.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/UnDefType.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/types/util/UnitUtils.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/util/BundleResolver.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/util/HexUtils.java (100%)
 rename bundles/org.openhab.core/src/main/java/org/{eclipse/smarthome => openhab}/core/util/UIDUtils.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/auth/client/oauth2/AccessTokenResponseTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/cache/ExpiringCacheMapTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/cache/ExpiringCacheTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/common/QueueingThreadPoolExecutorTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/common/ThreadFactoryBuilderTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/common/ThreadPoolManagerTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/common/osgi/ResourceBundleClassLoaderTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/i18n/I18nProviderImplTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/items/ItemBuilderTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/items/ItemStateConverterImplTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/items/ItemTagTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/items/MetadataRegistryImplTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/CronAdjusterMiscTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/CronAdjusterTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/CronSchedulerImplTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/DelegatedSchedulerTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/PeriodicSchedulerImplTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/scheduler/SchedulerImplTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/service/ReadyServiceImplTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/service/StateDescriptionServiceImplTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/internal/types/StateDescriptionFragmentImplTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/items/GenericItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/items/MetadataKeyTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/items/TestItem.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/items/dto/ItemDTOMapperTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/items/events/AbstractEventFactoryTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/items/events/ItemEventFactoryTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/CoreItemFactoryTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/dimension/VolumetricFlowRateTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/CallItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/ColorItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/ContactItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/DateTimeItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/DimmerItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/ImageItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/LocationItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/NumberItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/PlayerItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/RollershutterItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/StateUtil.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/StringItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/items/SwitchItemTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/ArithmeticGroupFunctionTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/DateTimeGroupFunctionTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/DateTimeTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/DecimalTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/HSBTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/OnOffTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/OpenClosedTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/PercentTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/PointTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/QuantityTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/StringListTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/StringTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/types/UpDownTypeTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/library/unit/SmartHomeUnitsTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/net/HttpServiceUtilTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/net/NetUtilTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/types/CommandDescriptionBuilderTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/types/StateDescriptionFragmentBuilderTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/types/util/UnitUtilsTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/util/HexUtilsTest.java (100%)
 rename bundles/org.openhab.core/src/test/java/org/{eclipse/smarthome => openhab}/core/util/UIDUtilsTest.java (100%)
 rename itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/test/internal/AbstractTestAgent.java (100%)
 rename itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java (100%)
 rename itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java (100%)
 rename itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/test/internal/TestAgent.java (100%)
 rename itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/test/internal/cipher/CipherTest.java (100%)
 rename itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java (100%)
 rename itests/org.openhab.core.binding.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/xml/test/BindingInfoI18nTest.java (100%)
 rename itests/org.openhab.core.binding.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/xml/test/BindingInfoTest.java (100%)
 rename itests/org.openhab.core.binding.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/binding/xml/test/BindingInstaller.java (100%)
 rename itests/org.openhab.core.config.core.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/core/ConfigOptionRegistryOSGiTest.java (100%)
 rename itests/org.openhab.core.config.discovery.mdns.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java (100%)
 rename itests/org.openhab.core.config.discovery.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/DiscoveryServiceMock.java (100%)
 rename itests/org.openhab.core.config.discovery.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/DiscoveryServiceMockOfBridge.java (100%)
 rename itests/org.openhab.core.config.discovery.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/DiscoveryServiceRegistryOSGiTest.java (100%)
 rename itests/org.openhab.core.config.discovery.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/inbox/DynamicThingUpdateOSGiTest.java (100%)
 rename itests/org.openhab.core.config.discovery.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/internal/InboxOSGiTest.java (100%)
 rename itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java (100%)
 rename itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java (100%)
 rename itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java (100%)
 rename itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/linuxsysfs/testutil/UsbSerialDeviceInformationGenerator.java (100%)
 rename itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java (100%)
 rename itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java (100%)
 rename itests/org.openhab.core.config.dispatch.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/dispatch/internal/ConfigDispatcherOSGiTest.java (100%)
 rename itests/org.openhab.core.config.xml.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/test/BindingInstaller.java (100%)
 rename itests/org.openhab.core.config.xml.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/test/ConfigDescriptionI18nTest.java (100%)
 rename itests/org.openhab.core.config.xml.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/config/xml/test/ConfigDescriptionsTest.java (100%)
 rename itests/org.openhab.core.ephemeris.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java (100%)
 rename itests/org.openhab.core.io.rest.core.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/discovery/InboxResourceOSGITest.java (100%)
 rename itests/org.openhab.core.io.rest.core.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/item/ItemResourceOSGiTest.java (100%)
 rename itests/org.openhab.core.io.rest.core.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/persistence/PersistenceResourceTest.java (100%)
 rename itests/org.openhab.core.io.rest.core.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/profile/ProfileTypeResourceTest.java (100%)
 rename itests/org.openhab.core.io.rest.core.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/internal/service/ConfigurableServiceResourceOSGiTest.java (100%)
 rename itests/org.openhab.core.io.rest.core.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/io/rest/core/item/EnrichedItemDTOMapperWithTransformOSGiTest.java (100%)
 rename itests/org.openhab.core.model.core.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/core/internal/folder/FolderObserverTest.java (100%)
 rename itests/org.openhab.core.model.item.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/item/internal/GenericItemProviderTest.java (100%)
 rename itests/org.openhab.core.model.item.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/item/internal/GenericMetadataProviderTest.java (100%)
 rename itests/org.openhab.core.model.persistence.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/persistence/extensions/PersistenceExtensionsTest.java (100%)
 rename itests/org.openhab.core.model.persistence.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/persistence/tests/TestPersistenceService.java (100%)
 rename itests/org.openhab.core.model.rule.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/rule/runtime/internal/engine/RuleExecutionTest.java (100%)
 rename itests/org.openhab.core.model.rule.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/rule/runtime/internal/engine/RuleTriggerTest.java (100%)
 rename itests/org.openhab.core.model.script.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/script/actions/ScriptExecutionTest.java (100%)
 rename itests/org.openhab.core.model.script.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/script/engine/ScriptEngineOSGiTest.java (100%)
 rename itests/org.openhab.core.model.script.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/script/lib/NumberExtensionsTest.java (100%)
 rename itests/org.openhab.core.model.script.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/script/scheduler/test/AbstractScheduler.java (100%)
 rename itests/org.openhab.core.model.script.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/script/scheduler/test/MockClosure.java (100%)
 rename itests/org.openhab.core.model.script.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/script/scheduler/test/MockScheduler.java (100%)
 rename itests/org.openhab.core.model.script.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/script/tests/lib/NumberExtensionsTest.java (100%)
 rename itests/org.openhab.core.model.thing.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/test/GenericItemChannelLinkProviderJavaTest.java (100%)
 rename itests/org.openhab.core.model.thing.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/test/hue/GenericItemChannelLinkProviderTest.java (100%)
 rename itests/org.openhab.core.model.thing.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/test/hue/GenericThingProviderTest.java (100%)
 rename itests/org.openhab.core.model.thing.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/test/hue/GenericThingProviderTest2.java (100%)
 rename itests/org.openhab.core.model.thing.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/test/hue/GenericThingProviderTest3.java (100%)
 rename itests/org.openhab.core.model.thing.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/test/hue/GenericThingProviderTest4.java (100%)
 rename itests/org.openhab.core.model.thing.testsupport/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/testsupport/hue/DumbThingHandlerFactory.java (100%)
 rename itests/org.openhab.core.model.thing.testsupport/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/testsupport/hue/DumbThingTypeProvider.java (100%)
 rename itests/org.openhab.core.model.thing.testsupport/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/testsupport/hue/TestHueChannelTypeProvider.java (100%)
 rename itests/org.openhab.core.model.thing.testsupport/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/testsupport/hue/TestHueConfigDescriptionProvider.java (100%)
 rename itests/org.openhab.core.model.thing.testsupport/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/testsupport/hue/TestHueThingHandlerFactory.java (100%)
 rename itests/org.openhab.core.model.thing.testsupport/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/testsupport/hue/TestHueThingHandlerFactoryX.java (100%)
 rename itests/org.openhab.core.model.thing.testsupport/src/main/java/org/{eclipse/smarthome => openhab/core}/model/thing/testsupport/hue/TestHueThingTypeProvider.java (100%)
 rename itests/org.openhab.core.storage.json.tests/src/main/java/org/{eclipse/smarthome => openhab/core}/storage/json/internal/JsonStorageServiceOSGiTest.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/cache/ExpiringCacheAsyncTest.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/common/SafeCallerImplTest.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/events/OSGiEventManagerOSGiTest.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/i18n/TranslationProviderOSGiTest.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/internal/items/ItemUpdaterOSGiTest.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/items/GroupItemOSGiTest.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ItemRegistryImplTest.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/items/ManagedItemProviderOSGiTest.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/items/TestItem.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/items/events/AbstractItemEventSubscriberOSGiTest.java (100%)
 rename itests/org.openhab.core.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/service/AbstractWatchServiceTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/SystemWideChannelTypesTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/ThingPropertiesTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/BindingBaseClassesOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ChangeThingTypeOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/ThingFactoryTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/binding/firmware/FirmwareTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/events/ThingEventFactoryTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/factory/ManagedThingProviderOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/Constants.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/CommunicationManagerOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/SimpleThingTypeProvider.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingLinkManagerOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingManagerOSGiJavaTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingManagerOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/ThingRegistryOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/firmware/FirmwareUpdateServiceTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/internal/profiles/SystemProfileFactoryOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/ItemChannelLinkOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/link/LinkEventOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/profiles/i18n/SystemProfileI18nOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/testutil/i18n/DefaultLocaleSetter.java (100%)
 rename itests/org.openhab.core.thing.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/type/ChannelStateDescriptionProviderOSGiTest.java (100%)
 rename itests/org.openhab.core.thing.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/test/ChannelTypesI18nTest.java (100%)
 rename itests/org.openhab.core.thing.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/test/ChannelTypesTest.java (100%)
 rename itests/org.openhab.core.thing.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/test/ConfigDescriptionsTest.java (100%)
 rename itests/org.openhab.core.thing.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/test/LoadedTestBundle.java (100%)
 rename itests/org.openhab.core.thing.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java (100%)
 rename itests/org.openhab.core.thing.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/test/SystemWideChannelTypesTest.java (100%)
 rename itests/org.openhab.core.thing.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/test/ThingTypeI18nTest.java (100%)
 rename itests/org.openhab.core.thing.xml.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/thing/xml/test/ThingTypesTest.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/AudioManagerStub.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/AudioSourceStub.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/ConsoleStub.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/HumanLanguageInterpreterStub.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/KSServiceStub.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/STTServiceStub.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/SinkStub.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/TTSServiceStub.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/internal/VoiceStub.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/javavoicemanager/VoiceManagerTest.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/voiceconsolecommandextension/InterpretCommandTest.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/voiceconsolecommandextension/SayCommandTest.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java (100%)
 rename itests/org.openhab.core.voice.tests/src/main/java/org/{eclipse/smarthome => openhab}/core/voice/voiceconsolecommandextension/VoicesCommandTest.java (100%)

diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioException.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioException.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioException.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioException.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioFormat.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioFormat.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioHTTPServer.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioHTTPServer.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioHTTPServer.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioHTTPServer.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioManager.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioManager.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioManager.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioManager.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioSink.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSink.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioSink.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSink.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioSource.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSource.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioSource.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSource.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioStream.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/AudioStream.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioStream.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/ByteArrayAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/ByteArrayAudioStream.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/ByteArrayAudioStream.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/ByteArrayAudioStream.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/FileAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FileAudioStream.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/FileAudioStream.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FileAudioStream.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/FixedLengthAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FixedLengthAudioStream.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/FixedLengthAudioStream.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FixedLengthAudioStream.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/URLAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/URLAudioStream.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/UnsupportedAudioFormatException.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioFormatException.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/UnsupportedAudioFormatException.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioFormatException.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/UnsupportedAudioStreamException.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioStreamException.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/UnsupportedAudioStreamException.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioStreamException.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/internal/AudioConsoleCommandExtension.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/internal/AudioConsoleCommandExtension.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/internal/AudioManagerImpl.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/internal/AudioManagerImpl.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/internal/AudioServlet.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioServlet.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/internal/AudioServlet.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioServlet.java
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/utils/AudioStreamUtils.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/utils/AudioStreamUtils.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/main/java/org/eclipse/smarthome/core/audio/utils/AudioStreamUtils.java
rename to bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/utils/AudioStreamUtils.java
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AbstractAudioServletTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AbstractAudioServletTest.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AbstractAudioServletTest.java
rename to bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AbstractAudioServletTest.java
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioConsoleTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioConsoleTest.java
rename to bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioFormatTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioFormatTest.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioFormatTest.java
rename to bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioFormatTest.java
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerServletTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerServletTest.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerServletTest.java
rename to bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerServletTest.java
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerTest.java
rename to bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioServletTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioServletTest.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioServletTest.java
rename to bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioServletTest.java
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/fake/AudioSinkFake.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/fake/AudioSinkFake.java
rename to bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/utils/BundledSoundFileHandler.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/utils/BundledSoundFileHandler.java
similarity index 100%
rename from bundles/org.openhab.core.audio/src/test/java/org/eclipse/smarthome/core/audio/internal/utils/BundledSoundFileHandler.java
rename to bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/utils/BundledSoundFileHandler.java
diff --git a/bundles/org.openhab.core.auth.jaas/src/main/java/org/eclipse/smarthome/auth/jaas/internal/JaasAuthenticationProvider.java b/bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java
similarity index 100%
rename from bundles/org.openhab.core.auth.jaas/src/main/java/org/eclipse/smarthome/auth/jaas/internal/JaasAuthenticationProvider.java
rename to bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/Keyword.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/Keyword.java
similarity index 100%
rename from bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/Keyword.java
rename to bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/Keyword.java
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/OAuthClientServiceImpl.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/OAuthClientServiceImpl.java
rename to bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/OAuthConnector.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java
similarity index 100%
rename from bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/OAuthConnector.java
rename to bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/OAuthFactoryImpl.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthFactoryImpl.java
similarity index 100%
rename from bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/OAuthFactoryImpl.java
rename to bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthFactoryImpl.java
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/OAuthStoreHandler.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandler.java
similarity index 100%
rename from bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/OAuthStoreHandler.java
rename to bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandler.java
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/OAuthStoreHandlerImpl.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandlerImpl.java
similarity index 100%
rename from bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/OAuthStoreHandlerImpl.java
rename to bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandlerImpl.java
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/PersistedParams.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/PersistedParams.java
similarity index 100%
rename from bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/PersistedParams.java
rename to bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/PersistedParams.java
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/StorageRecordType.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/StorageRecordType.java
similarity index 100%
rename from bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/StorageRecordType.java
rename to bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/StorageRecordType.java
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java
similarity index 100%
rename from bundles/org.openhab.core.auth.oauth2client/src/main/java/org/eclipse/smarthome/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java
rename to bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/BindingInfoConverter.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoConverter.java
similarity index 100%
rename from bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/BindingInfoConverter.java
rename to bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoConverter.java
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/BindingInfoReader.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoReader.java
similarity index 100%
rename from bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/BindingInfoReader.java
rename to bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoReader.java
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/BindingInfoXmlProvider.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlProvider.java
similarity index 100%
rename from bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/BindingInfoXmlProvider.java
rename to bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlProvider.java
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/BindingInfoXmlResult.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlResult.java
similarity index 100%
rename from bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/BindingInfoXmlResult.java
rename to bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlResult.java
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/BindingXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingXmlConfigDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/BindingXmlConfigDescriptionProvider.java
rename to bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingXmlConfigDescriptionProvider.java
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/XmlBindingInfoProvider.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/XmlBindingInfoProvider.java
similarity index 100%
rename from bundles/org.openhab.core.binding.xml/src/main/java/org/eclipse/smarthome/core/binding/xml/internal/XmlBindingInfoProvider.java
rename to bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/XmlBindingInfoProvider.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigConstants.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigConstants.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigConstants.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigConstants.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescription.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescription.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescription.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescription.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionAliasProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionAliasProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionAliasProvider.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionAliasProvider.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionBuilder.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionBuilder.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionBuilder.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameter.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameter.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameter.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameter.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilder.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilder.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilder.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterGroup.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroup.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterGroup.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroup.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionProvider.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionProvider.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistry.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistry.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionRegistry.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigOptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigOptionProvider.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigUtil.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigUtil.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigurableService.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableService.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigurableService.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableService.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/Configuration.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/Configuration.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/Configuration.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/Configuration.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigurationDeserializer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationDeserializer.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigurationDeserializer.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationDeserializer.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigurationSerializer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationSerializer.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ConfigurationSerializer.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationSerializer.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/FilterCriteria.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/FilterCriteria.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/FilterCriteria.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/FilterCriteria.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ParameterOption.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ParameterOption.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/ParameterOption.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ParameterOption.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/ConfigDescriptionDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTO.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/ConfigDescriptionDTO.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTO.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/ConfigDescriptionDTOMapper.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/ConfigDescriptionDTOMapper.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTOMapper.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/ConfigDescriptionParameterDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterDTO.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/ConfigDescriptionParameterDTO.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterDTO.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/ConfigDescriptionParameterGroupDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterGroupDTO.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/ConfigDescriptionParameterGroupDTO.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterGroupDTO.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/FilterCriteriaDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/FilterCriteriaDTO.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/FilterCriteriaDTO.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/FilterCriteriaDTO.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/ParameterOptionDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ParameterOptionDTO.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/dto/ParameterOptionDTO.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ParameterOptionDTO.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/i18n/ConfigI18nLocalizationService.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/i18n/ConfigI18nLocalizationService.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/i18n/ConfigI18nLocalizationService.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/i18n/ConfigI18nLocalizationService.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/ConfigMapper.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/ConfigMapper.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/i18n/ConfigDescriptionI18nUtil.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionI18nUtil.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/i18n/ConfigDescriptionI18nUtil.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionI18nUtil.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProvider.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProvider.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/net/NetworkConfigOptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/net/NetworkConfigOptionProvider.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/AbstractNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/AbstractNormalizer.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/AbstractNormalizer.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/AbstractNormalizer.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/BooleanNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/BooleanNormalizer.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/BooleanNormalizer.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/BooleanNormalizer.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/DecimalNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/DecimalNormalizer.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/DecimalNormalizer.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/DecimalNormalizer.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/IntNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/IntNormalizer.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/IntNormalizer.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/IntNormalizer.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/ListNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/ListNormalizer.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/ListNormalizer.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/ListNormalizer.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/Normalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/Normalizer.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/Normalizer.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/Normalizer.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerFactory.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/TextNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/TextNormalizer.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/normalization/TextNormalizer.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/TextNormalizer.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionParameterValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidator.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionParameterValidator.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidator.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorImpl.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorImpl.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorImpl.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorImpl.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/MessageKey.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MessageKey.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/MessageKey.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MessageKey.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/MinMaxValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MinMaxValidator.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/MinMaxValidator.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MinMaxValidator.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/PatternValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/PatternValidator.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/PatternValidator.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/PatternValidator.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/RequiredValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/RequiredValidator.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/RequiredValidator.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/RequiredValidator.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/TypeIntrospections.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/TypeIntrospections.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/TypeValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeValidator.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/internal/validation/TypeValidator.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeValidator.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/metadata/MetadataConfigDescriptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/metadata/MetadataConfigDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/metadata/MetadataConfigDescriptionProvider.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/metadata/MetadataConfigDescriptionProvider.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusCallback.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusCallback.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusCallback.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusCallback.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfo.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusInfo.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfo.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusInfo.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusMessage.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusMessage.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusMessage.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusMessage.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusProvider.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusProvider.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusService.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusService.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusService.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusService.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusSource.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusSource.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusSource.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusSource.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/events/ConfigStatusEventFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/events/ConfigStatusEventFactory.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/events/ConfigStatusInfoEvent.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusInfoEvent.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/status/events/ConfigStatusInfoEvent.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusInfoEvent.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/validation/ConfigDescriptionValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigDescriptionValidator.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/validation/ConfigDescriptionValidator.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigDescriptionValidator.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/validation/ConfigValidationException.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationException.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/validation/ConfigValidationException.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationException.java
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/validation/ConfigValidationMessage.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationMessage.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/main/java/org/eclipse/smarthome/config/core/validation/ConfigValidationMessage.java
rename to bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationMessage.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionBuilderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionBuilderTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/normalization/NormalizerTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/normalization/NormalizerTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java
diff --git a/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/eclipse/smarthome/config/discovery/mdns/MDNSDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/MDNSDiscoveryParticipant.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/eclipse/smarthome/config/discovery/mdns/MDNSDiscoveryParticipant.java
rename to bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/MDNSDiscoveryParticipant.java
diff --git a/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/eclipse/smarthome/config/discovery/mdns/internal/MDNSDiscoveryService.java b/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryService.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/eclipse/smarthome/config/discovery/mdns/internal/MDNSDiscoveryService.java
rename to bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryService.java
diff --git a/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/eclipse/smarthome/config/discovery/upnp/UpnpDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/UpnpDiscoveryParticipant.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/eclipse/smarthome/config/discovery/upnp/UpnpDiscoveryParticipant.java
rename to bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/UpnpDiscoveryParticipant.java
diff --git a/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/eclipse/smarthome/config/discovery/upnp/internal/UpnpDiscoveryService.java b/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/eclipse/smarthome/config/discovery/upnp/internal/UpnpDiscoveryService.java
rename to bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java
diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java
rename to bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java
diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java
rename to bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java
diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java
rename to bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java
diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java
rename to bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/UsbSerialDeviceInformation.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDeviceInformation.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/UsbSerialDeviceInformation.java
rename to bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDeviceInformation.java
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/UsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscovery.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/UsbSerialDiscovery.java
rename to bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscovery.java
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/UsbSerialDiscoveryListener.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryListener.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/UsbSerialDiscoveryListener.java
rename to bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryListener.java
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java
rename to bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java
rename to bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/AbstractDiscoveryService.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/AbstractDiscoveryService.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryListener.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryListener.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryResult.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResult.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryResult.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResult.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryResultBuilder.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryResultBuilder.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryResultFlag.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultFlag.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryResultFlag.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultFlag.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryService.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryService.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryService.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryService.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceCallback.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceCallback.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceCallback.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceCallback.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceRegistry.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceRegistry.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistry.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/ExtendedDiscoveryService.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ExtendedDiscoveryService.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/ExtendedDiscoveryService.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ExtendedDiscoveryService.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/ScanListener.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ScanListener.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/ScanListener.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ScanListener.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/UpnpDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/UpnpDiscoveryParticipant.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/UpnpDiscoveryParticipant.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/UpnpDiscoveryParticipant.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/dto/DiscoveryResultDTO.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTO.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/dto/DiscoveryResultDTO.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTO.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/dto/DiscoveryResultDTOMapper.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/dto/DiscoveryResultDTOMapper.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTOMapper.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/Inbox.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/Inbox.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/Inbox.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/Inbox.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/InboxAutoApprovePredicate.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxAutoApprovePredicate.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/InboxAutoApprovePredicate.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxAutoApprovePredicate.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/InboxFilterCriteria.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxFilterCriteria.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/InboxFilterCriteria.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxFilterCriteria.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/InboxListener.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxListener.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/InboxListener.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxListener.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/InboxPredicates.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxPredicates.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/InboxPredicates.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxPredicates.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/events/AbstractInboxEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/AbstractInboxEvent.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/events/AbstractInboxEvent.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/AbstractInboxEvent.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxAddedEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxAddedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxAddedEvent.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxAddedEvent.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxEventFactory.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactory.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxEventFactory.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactory.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxRemovedEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxRemovedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxRemovedEvent.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxRemovedEvent.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxUpdatedEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxUpdatedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxUpdatedEvent.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxUpdatedEvent.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/AutomaticInboxProcessor.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/AutomaticInboxProcessor.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/DiscoveryResultImpl.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryResultImpl.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/DiscoveryResultImpl.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryResultImpl.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/DiscoveryServiceRegistryImpl.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/DiscoveryServiceRegistryImpl.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/PersistentInbox.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/PersistentInbox.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/console/InboxConsoleCommandExtension.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/main/java/org/eclipse/smarthome/config/discovery/internal/console/InboxConsoleCommandExtension.java
rename to bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/eclipse/smarthome/config/discovery/inbox/InboxPredicatesTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/test/java/org/eclipse/smarthome/config/discovery/inbox/InboxPredicatesTest.java
rename to bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxEventFactoryTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/test/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxEventFactoryTest.java
rename to bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/eclipse/smarthome/config/discovery/internal/AutomaticInboxProcessorTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/test/java/org/eclipse/smarthome/config/discovery/internal/AutomaticInboxProcessorTest.java
rename to bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/eclipse/smarthome/config/discovery/internal/DiscoveryResultImplTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/DiscoveryResultImplTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/test/java/org/eclipse/smarthome/config/discovery/internal/DiscoveryResultImplTest.java
rename to bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/DiscoveryResultImplTest.java
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/eclipse/smarthome/config/discovery/internal/PersistentInboxTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.discovery/src/test/java/org/eclipse/smarthome/config/discovery/internal/PersistentInboxTest.java
rename to bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java
diff --git a/bundles/org.openhab.core.config.dispatch/src/main/java/org/eclipse/smarthome/config/dispatch/internal/ConfigDispatcher.java b/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java
similarity index 100%
rename from bundles/org.openhab.core.config.dispatch/src/main/java/org/eclipse/smarthome/config/dispatch/internal/ConfigDispatcher.java
rename to bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java
diff --git a/bundles/org.openhab.core.config.dispatch/src/main/java/org/eclipse/smarthome/config/dispatch/internal/ConfigDispatcherFileWatcher.java b/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcher.java
similarity index 100%
rename from bundles/org.openhab.core.config.dispatch/src/main/java/org/eclipse/smarthome/config/dispatch/internal/ConfigDispatcherFileWatcher.java
rename to bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcher.java
diff --git a/bundles/org.openhab.core.config.dispatch/src/test/java/org/eclipse/smarthome/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java b/bundles/org.openhab.core.config.dispatch/src/test/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java
similarity index 100%
rename from bundles/org.openhab.core.config.dispatch/src/test/java/org/eclipse/smarthome/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java
rename to bundles/org.openhab.core.config.dispatch/src/test/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java
diff --git a/bundles/org.openhab.core.config.serial/src/main/java/org/eclipse/smarthome/config/serial/internal/SerialConfigOptionProvider.java b/bundles/org.openhab.core.config.serial/src/main/java/org/openhab/core/config/serial/internal/SerialConfigOptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.serial/src/main/java/org/eclipse/smarthome/config/serial/internal/SerialConfigOptionProvider.java
rename to bundles/org.openhab.core.config.serial/src/main/java/org/openhab/core/config/serial/internal/SerialConfigOptionProvider.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/AbstractXmlBasedProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/AbstractXmlBasedProvider.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/AbstractXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlConfigDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/AbstractXmlConfigDescriptionProvider.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlConfigDescriptionProvider.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/ConfigDescriptionConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionConverter.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/ConfigDescriptionConverter.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionConverter.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/ConfigDescriptionParameterConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterConverter.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/ConfigDescriptionParameterConverter.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterConverter.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/ConfigDescriptionParameterGroupConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterGroupConverter.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/ConfigDescriptionParameterGroupConverter.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterGroupConverter.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/ConfigXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/ConfigXmlConfigDescriptionProvider.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/FilterCriteriaConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/FilterCriteriaConverter.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/FilterCriteriaConverter.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/FilterCriteriaConverter.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/internal/ConfigDescriptionReader.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/internal/ConfigDescriptionReader.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/internal/ConfigDescriptionXmlProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionXmlProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/internal/ConfigDescriptionXmlProvider.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionXmlProvider.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/osgi/XmlDocumentBundleTracker.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentBundleTracker.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/osgi/XmlDocumentBundleTracker.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentBundleTracker.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/osgi/XmlDocumentProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProvider.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/osgi/XmlDocumentProvider.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProvider.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/osgi/XmlDocumentProviderFactory.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProviderFactory.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/osgi/XmlDocumentProviderFactory.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProviderFactory.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/ConverterAssertion.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAssertion.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/ConverterAssertion.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAssertion.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/ConverterAttributeMapValidator.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAttributeMapValidator.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/ConverterAttributeMapValidator.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAttributeMapValidator.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/ConverterValueMap.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterValueMap.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/ConverterValueMap.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterValueMap.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/GenericUnmarshaller.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/GenericUnmarshaller.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/GenericUnmarshaller.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/GenericUnmarshaller.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeAttributes.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributes.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeAttributes.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributes.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeAttributesConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributesConverter.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeAttributesConverter.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributesConverter.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeIterator.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeIterator.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeIterator.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeIterator.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeList.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeList.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeList.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeList.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeListConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeListConverter.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeListConverter.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeListConverter.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeName.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeName.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeName.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeName.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeValue.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValue.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeValue.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValue.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeValueConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValueConverter.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/NodeValueConverter.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValueConverter.java
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/XmlDocumentReader.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/XmlDocumentReader.java
similarity index 100%
rename from bundles/org.openhab.core.config.xml/src/main/java/org/eclipse/smarthome/config/xml/util/XmlDocumentReader.java
rename to bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/XmlDocumentReader.java
diff --git a/bundles/org.openhab.core.ephemeris/src/main/java/org/eclipse/smarthome/core/ephemeris/EphemerisManager.java b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/EphemerisManager.java
similarity index 100%
rename from bundles/org.openhab.core.ephemeris/src/main/java/org/eclipse/smarthome/core/ephemeris/EphemerisManager.java
rename to bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/EphemerisManager.java
diff --git a/bundles/org.openhab.core.ephemeris/src/main/java/org/eclipse/smarthome/core/ephemeris/internal/EphemerisManagerImpl.java b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java
similarity index 100%
rename from bundles/org.openhab.core.ephemeris/src/main/java/org/eclipse/smarthome/core/ephemeris/internal/EphemerisManagerImpl.java
rename to bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java
diff --git a/bundles/org.openhab.core.extension.sample/src/main/java/org/eclipse/smarthome/core/extension/sample/internal/SampleExtensionService.java b/bundles/org.openhab.core.extension.sample/src/main/java/org/openhab/core/extension/sample/internal/SampleExtensionService.java
similarity index 100%
rename from bundles/org.openhab.core.extension.sample/src/main/java/org/eclipse/smarthome/core/extension/sample/internal/SampleExtensionService.java
rename to bundles/org.openhab.core.extension.sample/src/main/java/org/openhab/core/extension/sample/internal/SampleExtensionService.java
diff --git a/bundles/org.openhab.core.id/src/main/java/org/eclipse/smarthome/core/id/InstanceUUID.java b/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java
similarity index 100%
rename from bundles/org.openhab.core.id/src/main/java/org/eclipse/smarthome/core/id/InstanceUUID.java
rename to bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java
diff --git a/bundles/org.openhab.core.id/src/main/java/org/eclipse/smarthome/core/id/internal/UUIDResource.java b/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/internal/UUIDResource.java
similarity index 100%
rename from bundles/org.openhab.core.id/src/main/java/org/eclipse/smarthome/core/id/internal/UUIDResource.java
rename to bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/internal/UUIDResource.java
diff --git a/bundles/org.openhab.core.id/src/test/java/org/eclipse/smarthome/core/id/UUIDTest.java b/bundles/org.openhab.core.id/src/test/java/org/openhab/core/id/UUIDTest.java
similarity index 100%
rename from bundles/org.openhab.core.id/src/test/java/org/eclipse/smarthome/core/id/UUIDTest.java
rename to bundles/org.openhab.core.id/src/test/java/org/openhab/core/id/UUIDTest.java
diff --git a/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/eclipse/smarthome/io/console/eclipse/internal/ConsoleSupportEclipse.java b/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/ConsoleSupportEclipse.java
similarity index 100%
rename from bundles/org.openhab.core.io.console.eclipse/src/main/java/org/eclipse/smarthome/io/console/eclipse/internal/ConsoleSupportEclipse.java
rename to bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/ConsoleSupportEclipse.java
diff --git a/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/eclipse/smarthome/io/console/eclipse/internal/OSGiConsole.java b/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/OSGiConsole.java
similarity index 100%
rename from bundles/org.openhab.core.io.console.eclipse/src/main/java/org/eclipse/smarthome/io/console/eclipse/internal/OSGiConsole.java
rename to bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/OSGiConsole.java
diff --git a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/eclipse/smarthome/io/console/karaf/internal/CommandWrapper.java b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.console.karaf/src/main/java/org/eclipse/smarthome/io/console/karaf/internal/CommandWrapper.java
rename to bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java
diff --git a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/eclipse/smarthome/io/console/karaf/internal/ConsoleSupportKaraf.java b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/ConsoleSupportKaraf.java
similarity index 100%
rename from bundles/org.openhab.core.io.console.karaf/src/main/java/org/eclipse/smarthome/io/console/karaf/internal/ConsoleSupportKaraf.java
rename to bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/ConsoleSupportKaraf.java
diff --git a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/eclipse/smarthome/io/console/karaf/internal/OSGiConsole.java b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/OSGiConsole.java
similarity index 100%
rename from bundles/org.openhab.core.io.console.karaf/src/main/java/org/eclipse/smarthome/io/console/karaf/internal/OSGiConsole.java
rename to bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/OSGiConsole.java
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/eclipse/smarthome/io/console/rfc147/internal/CommandWrapper.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/CommandWrapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.console.rfc147/src/main/java/org/eclipse/smarthome/io/console/rfc147/internal/CommandWrapper.java
rename to bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/CommandWrapper.java
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/eclipse/smarthome/io/console/rfc147/internal/ConsoleCommandsContainer.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleCommandsContainer.java
similarity index 100%
rename from bundles/org.openhab.core.io.console.rfc147/src/main/java/org/eclipse/smarthome/io/console/rfc147/internal/ConsoleCommandsContainer.java
rename to bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleCommandsContainer.java
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/eclipse/smarthome/io/console/rfc147/internal/ConsoleSupportRfc147.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleSupportRfc147.java
similarity index 100%
rename from bundles/org.openhab.core.io.console.rfc147/src/main/java/org/eclipse/smarthome/io/console/rfc147/internal/ConsoleSupportRfc147.java
rename to bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleSupportRfc147.java
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/eclipse/smarthome/io/console/rfc147/internal/OSGiConsole.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/OSGiConsole.java
similarity index 100%
rename from bundles/org.openhab.core.io.console.rfc147/src/main/java/org/eclipse/smarthome/io/console/rfc147/internal/OSGiConsole.java
rename to bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/OSGiConsole.java
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/eclipse/smarthome/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.io.console.rfc147/src/main/java/org/eclipse/smarthome/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java
rename to bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/Console.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java
similarity index 100%
rename from bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/Console.java
rename to bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/ConsoleInterpreter.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/ConsoleInterpreter.java
similarity index 100%
rename from bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/ConsoleInterpreter.java
rename to bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/ConsoleInterpreter.java
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/extensions/AbstractConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/extensions/AbstractConsoleCommandExtension.java
rename to bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/extensions/ConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/ConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/extensions/ConsoleCommandExtension.java
rename to bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/ConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/internal/extension/ItemConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/internal/extension/ItemConsoleCommandExtension.java
rename to bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/internal/extension/MetadataConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/MetadataConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/internal/extension/MetadataConsoleCommandExtension.java
rename to bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/MetadataConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/internal/extension/SendConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/internal/extension/SendConsoleCommandExtension.java
rename to bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/internal/extension/StatusConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/internal/extension/StatusConsoleCommandExtension.java
rename to bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/internal/extension/UpdateConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.io.console/src/main/java/org/eclipse/smarthome/io/console/internal/extension/UpdateConsoleCommandExtension.java
rename to bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/eclipse/smarthome/io/http/auth/basic/internal/BasicChallengeHandler.java b/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicChallengeHandler.java
similarity index 100%
rename from bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/eclipse/smarthome/io/http/auth/basic/internal/BasicChallengeHandler.java
rename to bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicChallengeHandler.java
diff --git a/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/eclipse/smarthome/io/http/auth/basic/internal/BasicCredentialsExtractor.java b/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicCredentialsExtractor.java
similarity index 100%
rename from bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/eclipse/smarthome/io/http/auth/basic/internal/BasicCredentialsExtractor.java
rename to bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicCredentialsExtractor.java
diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/eclipse/smarthome/io/http/auth/CredentialsExtractor.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/CredentialsExtractor.java
similarity index 100%
rename from bundles/org.openhab.core.io.http.auth/src/main/java/org/eclipse/smarthome/io/http/auth/CredentialsExtractor.java
rename to bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/CredentialsExtractor.java
diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/eclipse/smarthome/io/http/auth/internal/AuthenticationHandler.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java
similarity index 100%
rename from bundles/org.openhab.core.io.http.auth/src/main/java/org/eclipse/smarthome/io/http/auth/internal/AuthenticationHandler.java
rename to bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java
diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/eclipse/smarthome/io/http/auth/internal/RedirectHandler.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/RedirectHandler.java
similarity index 100%
rename from bundles/org.openhab.core.io.http.auth/src/main/java/org/eclipse/smarthome/io/http/auth/internal/RedirectHandler.java
rename to bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/RedirectHandler.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/Handler.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/Handler.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/Handler.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/Handler.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/HandlerContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerContext.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/HandlerContext.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerContext.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/HandlerPriorities.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerPriorities.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/HandlerPriorities.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerPriorities.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/HttpContextFactoryService.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HttpContextFactoryService.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/HttpContextFactoryService.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HttpContextFactoryService.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/WrappingHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/WrappingHttpContext.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/WrappingHttpContext.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/WrappingHttpContext.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/BundleHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/BundleHttpContext.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/BundleHttpContext.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/BundleHttpContext.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/CatchHandler.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/CatchHandler.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/CatchHandler.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/CatchHandler.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/DefaultHandlerContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DefaultHandlerContext.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/DefaultHandlerContext.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DefaultHandlerContext.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/DelegatingHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DelegatingHttpContext.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/DelegatingHttpContext.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DelegatingHttpContext.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/HttpContextFactoryServiceImpl.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/HttpContextFactoryServiceImpl.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImpl.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/SmartHomeHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/SmartHomeHttpContext.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/internal/SmartHomeHttpContext.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/SmartHomeHttpContext.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/servlet/BaseSmartHomeServlet.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/BaseSmartHomeServlet.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/servlet/BaseSmartHomeServlet.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/BaseSmartHomeServlet.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/servlet/SmartHomeBundleServlet.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeBundleServlet.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/servlet/SmartHomeBundleServlet.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeBundleServlet.java
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/servlet/SmartHomeServlet.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeServlet.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/main/java/org/eclipse/smarthome/io/http/servlet/SmartHomeServlet.java
rename to bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeServlet.java
diff --git a/bundles/org.openhab.core.io.http/src/test/java/org/eclipse/smarthome/io/http/internal/HttpContextFactoryServiceImplTest.java b/bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.http/src/test/java/org/eclipse/smarthome/io/http/internal/HttpContextFactoryServiceImplTest.java
rename to bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java
diff --git a/bundles/org.openhab.core.io.monitor/src/main/java/org/eclipse/smarthome/io/monitor/internal/EventLogger.java b/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java
similarity index 100%
rename from bundles/org.openhab.core.io.monitor/src/main/java/org/eclipse/smarthome/io/monitor/internal/EventLogger.java
rename to bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/exec/ExecUtil.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/exec/ExecUtil.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/exec/ExecUtil.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/exec/ExecUtil.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/ExtensibleTrustManager.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/ExtensibleTrustManager.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/ExtensibleTrustManager.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/ExtensibleTrustManager.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/HttpClientFactory.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientFactory.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/HttpClientFactory.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientFactory.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/HttpClientInitializationException.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientInitializationException.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/HttpClientInitializationException.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientInitializationException.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/HttpRequestBuilder.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpRequestBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/HttpRequestBuilder.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpRequestBuilder.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/HttpUtil.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpUtil.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/HttpUtil.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpUtil.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/TlsCertificateProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsCertificateProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/TlsCertificateProvider.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsCertificateProvider.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/TlsProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/TlsProvider.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsProvider.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/TlsTrustManagerProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsTrustManagerProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/TlsTrustManagerProvider.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsTrustManagerProvider.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/TrustAllTrustMananger.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustAllTrustMananger.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/TrustAllTrustMananger.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustAllTrustMananger.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/TrustManagerProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustManagerProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/TrustManagerProvider.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustManagerProvider.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/WebSocketFactory.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/WebSocketFactory.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/WebSocketFactory.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/WebSocketFactory.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImpl.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImpl.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImpl.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/TlsCertificateTrustManagerAdapter.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TlsCertificateTrustManagerAdapter.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/TlsCertificateTrustManagerAdapter.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TlsCertificateTrustManagerAdapter.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/TrustManagerUtil.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TrustManagerUtil.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/TrustManagerUtil.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TrustManagerUtil.java
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/WebClientFactoryImpl.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/WebClientFactoryImpl.java
rename to bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java
diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/eclipse/smarthome/io/net/http/BaseHttpUtilTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/test/java/org/eclipse/smarthome/io/net/http/BaseHttpUtilTest.java
rename to bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java
diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/eclipse/smarthome/io/net/http/HttpRequestBuilderTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpRequestBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/test/java/org/eclipse/smarthome/io/net/http/HttpRequestBuilderTest.java
rename to bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpRequestBuilderTest.java
diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/eclipse/smarthome/io/net/http/HttpUtilTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/test/java/org/eclipse/smarthome/io/net/http/HttpUtilTest.java
rename to bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java
diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImplTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImplTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/test/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImplTest.java
rename to bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImplTest.java
diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/eclipse/smarthome/io/net/http/internal/WebClientFactoryImplTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/WebClientFactoryImplTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.net/src/test/java/org/eclipse/smarthome/io/net/http/internal/WebClientFactoryImplTest.java
rename to bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/WebClientFactoryImplTest.java
diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/eclipse/smarthome/io/rest/audio/internal/AudioMapper.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioMapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.audio/src/main/java/org/eclipse/smarthome/io/rest/audio/internal/AudioMapper.java
rename to bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioMapper.java
diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/eclipse/smarthome/io/rest/audio/internal/AudioResource.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.audio/src/main/java/org/eclipse/smarthome/io/rest/audio/internal/AudioResource.java
rename to bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioResource.java
diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/eclipse/smarthome/io/rest/audio/internal/AudioSinkDTO.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSinkDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.audio/src/main/java/org/eclipse/smarthome/io/rest/audio/internal/AudioSinkDTO.java
rename to bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSinkDTO.java
diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/eclipse/smarthome/io/rest/audio/internal/AudioSourceDTO.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSourceDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.audio/src/main/java/org/eclipse/smarthome/io/rest/audio/internal/AudioSourceDTO.java
rename to bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSourceDTO.java
diff --git a/bundles/org.openhab.core.io.rest.auth/src/main/java/org/eclipse/smarthome/io/rest/auth/internal/SmartHomeRestServletConfig.java b/bundles/org.openhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/SmartHomeRestServletConfig.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.auth/src/main/java/org/eclipse/smarthome/io/rest/auth/internal/SmartHomeRestServletConfig.java
rename to bundles/org.openhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/SmartHomeRestServletConfig.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/config/ConfigurationService.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/ConfigurationService.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/config/ConfigurationService.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/ConfigurationService.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/GsonProvider.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/GsonProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/GsonProvider.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/GsonProvider.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/RESTCoreActivator.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/RESTCoreActivator.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/RESTCoreActivator.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/RESTCoreActivator.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/binding/BindingResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/binding/BindingResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/channel/ChannelTypeResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/channel/ChannelTypeResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/config/ConfigDescriptionResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/config/ConfigDescriptionResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/discovery/DiscoveryResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/DiscoveryResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/discovery/DiscoveryResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/DiscoveryResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/discovery/InboxResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/discovery/InboxResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/extensions/ExtensionResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/extensions/ExtensionResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/extensions/ExtensionResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/extensions/ExtensionResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/item/ItemResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/item/ItemResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/item/MetadataSelectorMatcher.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/item/MetadataSelectorMatcher.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/link/ItemChannelLinkResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/link/ItemChannelLinkResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/persistence/PersistenceResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/persistence/PersistenceResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/profile/ProfileTypeResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/profile/ProfileTypeResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/service/ConfigurableServiceResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/service/ConfigurableServiceResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/thing/ThingResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/thing/ThingResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/thing/ThingTypeResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingTypeResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/internal/thing/ThingTypeResource.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingTypeResource.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/item/EnrichedGroupItemDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedGroupItemDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/item/EnrichedGroupItemDTO.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedGroupItemDTO.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/item/EnrichedItemDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/item/EnrichedItemDTO.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTO.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/item/EnrichedItemDTOMapper.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/item/EnrichedItemDTOMapper.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapper.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/persistence/ItemHistoryListDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/ItemHistoryListDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/persistence/ItemHistoryListDTO.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/ItemHistoryListDTO.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/service/ConfigurableServiceDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/service/ConfigurableServiceDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/service/ConfigurableServiceDTO.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/service/ConfigurableServiceDTO.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedChannelDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedChannelDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedChannelDTO.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedChannelDTO.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTO.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTO.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTOMapper.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTOMapper.java
rename to bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapper.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/eclipse/smarthome/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/test/java/org/eclipse/smarthome/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java
rename to bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/eclipse/smarthome/io/rest/core/internal/channel/ChannelTypeResourceTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/test/java/org/eclipse/smarthome/io/rest/core/internal/channel/ChannelTypeResourceTest.java
rename to bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/MetadataSelectorMatcherTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcherTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/MetadataSelectorMatcherTest.java
rename to bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcherTest.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/eclipse/smarthome/io/rest/core/item/EnrichedItemDTOMapperTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/test/java/org/eclipse/smarthome/io/rest/core/item/EnrichedItemDTOMapperTest.java
rename to bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperTest.java
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTOMapperTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapperTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.core/src/test/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTOMapperTest.java
rename to bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapperTest.java
diff --git a/bundles/org.openhab.core.io.rest.log/src/main/java/org/eclipse/smarthome/io/rest/log/internal/LogConstants.java b/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogConstants.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.log/src/main/java/org/eclipse/smarthome/io/rest/log/internal/LogConstants.java
rename to bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogConstants.java
diff --git a/bundles/org.openhab.core.io.rest.log/src/main/java/org/eclipse/smarthome/io/rest/log/internal/LogHandler.java b/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogHandler.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.log/src/main/java/org/eclipse/smarthome/io/rest/log/internal/LogHandler.java
rename to bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogHandler.java
diff --git a/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/eclipse/smarthome/io/rest/mdns/internal/MDNSAnnouncer.java b/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.mdns/src/main/java/org/eclipse/smarthome/io/rest/mdns/internal/MDNSAnnouncer.java
rename to bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java
diff --git a/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/eclipse/smarthome/io/rest/optimize/internal/Activator.java b/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/Activator.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.optimize/src/main/java/org/eclipse/smarthome/io/rest/optimize/internal/Activator.java
rename to bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/Activator.java
diff --git a/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/eclipse/smarthome/io/rest/optimize/internal/ResourceFilterImpl.java b/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/ResourceFilterImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.optimize/src/main/java/org/eclipse/smarthome/io/rest/optimize/internal/ResourceFilterImpl.java
rename to bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/ResourceFilterImpl.java
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/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/SitemapSubscriptionService.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/MappingDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/MappingDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/MappingDTO.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/MappingDTO.java
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/openhab/core/io/rest/sitemap/internal/PageChangeListener.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageChangeListener.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageChangeListener.java
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/PageDTO.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageDTO.java
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/ServerAliveEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/ServerAliveEvent.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/ServerAliveEvent.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/ServerAliveEvent.java
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapChangedEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapChangedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapChangedEvent.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapChangedEvent.java
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapDTO.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapDTO.java
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEvent.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapEvent.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEvent.java
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapEventOutput.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEventOutput.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapEventOutput.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEventOutput.java
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/openhab/core/io/rest/sitemap/internal/SitemapResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResource.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapWidgetEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapWidgetEvent.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapWidgetEvent.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapWidgetEvent.java
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/WidgetDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/eclipse/smarthome/io/rest/sitemap/internal/WidgetDTO.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java
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/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java
rename to bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/SseResource.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/SseResource.java
rename to bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/beans/EventBean.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/beans/EventBean.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/beans/EventBean.java
rename to bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/beans/EventBean.java
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/internal/SseActivator.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseActivator.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/internal/SseActivator.java
rename to bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseActivator.java
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/internal/SseEventOutput.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseEventOutput.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/internal/SseEventOutput.java
rename to bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseEventOutput.java
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/internal/listeners/SseEventSubscriber.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/internal/listeners/SseEventSubscriber.java
rename to bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/internal/util/SseUtil.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/util/SseUtil.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sse/src/main/java/org/eclipse/smarthome/io/rest/sse/internal/util/SseUtil.java
rename to bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/util/SseUtil.java
diff --git a/bundles/org.openhab.core.io.rest.sse/src/test/java/org/eclipse/smarthome/io/rest/sse/internal/util/SseUtilTest.java b/bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/util/SseUtilTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.sse/src/test/java/org/eclipse/smarthome/io/rest/sse/internal/util/SseUtilTest.java
rename to bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/util/SseUtilTest.java
diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/eclipse/smarthome/io/rest/voice/internal/HLIMapper.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HLIMapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.voice/src/main/java/org/eclipse/smarthome/io/rest/voice/internal/HLIMapper.java
rename to bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HLIMapper.java
diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/eclipse/smarthome/io/rest/voice/internal/HumanLanguageInterpreterDTO.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HumanLanguageInterpreterDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.voice/src/main/java/org/eclipse/smarthome/io/rest/voice/internal/HumanLanguageInterpreterDTO.java
rename to bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HumanLanguageInterpreterDTO.java
diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/eclipse/smarthome/io/rest/voice/internal/VoiceDTO.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceDTO.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.voice/src/main/java/org/eclipse/smarthome/io/rest/voice/internal/VoiceDTO.java
rename to bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceDTO.java
diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/eclipse/smarthome/io/rest/voice/internal/VoiceMapper.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceMapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.voice/src/main/java/org/eclipse/smarthome/io/rest/voice/internal/VoiceMapper.java
rename to bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceMapper.java
diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/eclipse/smarthome/io/rest/voice/internal/VoiceResource.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest.voice/src/main/java/org/eclipse/smarthome/io/rest/voice/internal/VoiceResource.java
rename to bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceResource.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/DTOMapper.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/DTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/DTOMapper.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/DTOMapper.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/JSONResponse.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/JSONResponse.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/JSONResponse.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/JSONResponse.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/LocaleService.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleService.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/LocaleService.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleService.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/LocaleServiceImpl.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/LocaleServiceImpl.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleServiceImpl.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/RESTConstants.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTConstants.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/RESTConstants.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTConstants.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/RESTResource.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/RESTResource.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTResource.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/Stream2JSONInputStream.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/Stream2JSONInputStream.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/Stream2JSONInputStream.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/Stream2JSONInputStream.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/Constants.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/Constants.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/Constants.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/Constants.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/DTOMapperImpl.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/DTOMapperImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/DTOMapperImpl.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/DTOMapperImpl.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/filter/CorsFilter.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/filter/CorsFilter.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/filter/ProxyFilter.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/filter/ProxyFilter.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/filter/SatisfiableResourceFilter.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilter.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/filter/SatisfiableResourceFilter.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilter.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/resources/RootResource.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/resources/RootResource.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/resources/beans/RootBean.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/RootBean.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/main/java/org/eclipse/smarthome/io/rest/internal/resources/beans/RootBean.java
rename to bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/RootBean.java
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/eclipse/smarthome/io/rest/JSONResponseTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/JSONResponseTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/test/java/org/eclipse/smarthome/io/rest/JSONResponseTest.java
rename to bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/JSONResponseTest.java
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/eclipse/smarthome/io/rest/Stream2JSONInputStreamTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/test/java/org/eclipse/smarthome/io/rest/Stream2JSONInputStreamTest.java
rename to bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/CorsFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/CorsFilterTest.java
rename to bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/ProxyFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/ProxyFilterTest.java
rename to bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/SatisfiableResourceFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilterTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.rest/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/SatisfiableResourceFilterTest.java
rename to bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilterTest.java
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/MDNSClient.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSClient.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/MDNSClient.java
rename to bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSClient.java
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/MDNSService.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSService.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/MDNSService.java
rename to bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSService.java
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/ServiceDescription.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/ServiceDescription.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/ServiceDescription.java
rename to bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/ServiceDescription.java
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java
rename to bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/internal/MDNSActivator.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSActivator.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/internal/MDNSActivator.java
rename to bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSActivator.java
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/internal/MDNSClientImpl.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/internal/MDNSClientImpl.java
rename to bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/internal/MDNSServiceImpl.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mdns/src/main/java/org/eclipse/smarthome/io/transport/mdns/internal/MDNSServiceImpl.java
rename to bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSServiceImpl.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttActionCallback.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttActionCallback.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttActionCallback.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttActionCallback.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnection.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnection.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnection.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnection.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionConfig.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionConfig.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttConnectionObserver.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionObserver.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttConnectionObserver.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionObserver.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttConnectionState.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttConnectionState.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttException.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttException.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttMessageSubscriber.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttMessageSubscriber.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttMessageSubscriber.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttMessageSubscriber.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttService.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttService.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttServiceObserver.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttServiceObserver.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttWillAndTestament.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/MqttWillAndTestament.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/ClientCallback.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/ClientCallback.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/ClientCallback.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/ClientCallback.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttServiceImpl.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttServiceImpl.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/TopicSubscribers.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscribers.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/TopicSubscribers.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscribers.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/ssl/CustomTrustManagerFactory.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/ssl/CustomTrustManagerFactory.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/ssl/CustomTrustManagerFactory.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/ssl/CustomTrustManagerFactory.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/sslcontext/SSLContextProvider.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/SSLContextProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/eclipse/smarthome/io/transport/mqtt/sslcontext/SSLContextProvider.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/SSLContextProvider.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionEx.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionEx.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionTests.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionTests.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttServiceTests.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceTests.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttServiceTests.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceTests.java
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/eclipse/smarthome/io/transport/mqtt/internal/TopicSubscriberTests.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscriberTests.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/eclipse/smarthome/io/transport/mqtt/internal/TopicSubscriberTests.java
rename to bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscriberTests.java
diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/JavaCommPortProvider.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/JavaCommPortProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/JavaCommPortProvider.java
rename to bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/JavaCommPortProvider.java
diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortEventImpl.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortEventImpl.java
rename to bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java
diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortIdentifierImpl.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortIdentifierImpl.java
rename to bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortImpl.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortImpl.java
rename to bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortImpl.java
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/eclipse/smarthome/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/eclipse/smarthome/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java
rename to bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/eclipse/smarthome/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/eclipse/smarthome/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java
rename to bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/RxTxPortProvider.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/RxTxPortProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/RxTxPortProvider.java
rename to bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/RxTxPortProvider.java
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortEventImpl.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortEventImpl.java
rename to bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortIdentifierImpl.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortIdentifierImpl.java
rename to bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortUtil.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortUtil.java
rename to bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/eclipse/smarthome/io/transport/serial/rxtx/RxTxSerialPort.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/rxtx/RxTxSerialPort.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/eclipse/smarthome/io/transport/serial/rxtx/RxTxSerialPort.java
rename to bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/rxtx/RxTxSerialPort.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/PortInUseException.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/PortInUseException.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/ProtocolType.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/ProtocolType.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/ProtocolType.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/ProtocolType.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPort.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPort.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPort.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPort.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPortEvent.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEvent.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPortEvent.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEvent.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPortEventListener.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEventListener.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPortEventListener.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEventListener.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPortIdentifier.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortIdentifier.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPortIdentifier.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortIdentifier.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPortManager.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortManager.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPortManager.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortManager.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPortProvider.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortProvider.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/SerialPortProvider.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortProvider.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/UnsupportedCommOperationException.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/UnsupportedCommOperationException.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/UnsupportedCommOperationException.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/UnsupportedCommOperationException.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortManagerImpl.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortManagerImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortManagerImpl.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortManagerImpl.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortRegistry.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/SerialPortRegistry.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortRegistry.java
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/console/SerialCommandExtension.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/console/SerialCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.serial/src/main/java/org/eclipse/smarthome/io/transport/serial/internal/console/SerialCommandExtension.java
rename to bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/console/SerialCommandExtension.java
diff --git a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/eclipse/smarthome/io/transport/upnp/UpnpIOParticipant.java b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOParticipant.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.upnp/src/main/java/org/eclipse/smarthome/io/transport/upnp/UpnpIOParticipant.java
rename to bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOParticipant.java
diff --git a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/eclipse/smarthome/io/transport/upnp/UpnpIOService.java b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOService.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.upnp/src/main/java/org/eclipse/smarthome/io/transport/upnp/UpnpIOService.java
rename to bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOService.java
diff --git a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceImpl.java b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.upnp/src/main/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceImpl.java
rename to bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java
diff --git a/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java b/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java
similarity index 100%
rename from bundles/org.openhab.core.io.transport.upnp/src/test/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java
rename to bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/EventType.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/EventType.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/EventType.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/EventType.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/ModelCoreConstants.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelCoreConstants.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/ModelCoreConstants.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelCoreConstants.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/ModelParser.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelParser.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/ModelParser.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelParser.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/ModelRepository.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepository.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/ModelRepository.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepository.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/ModelRepositoryChangeListener.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepositoryChangeListener.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/ModelRepositoryChangeListener.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepositoryChangeListener.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/SafeEMF.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/SafeEMF.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/SafeEMF.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/SafeEMF.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/ModelCoreActivator.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelCoreActivator.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/ModelCoreActivator.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelCoreActivator.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/ModelRepositoryImpl.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/ModelRepositoryImpl.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/SafeEMFImpl.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/SafeEMFImpl.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/SafeEMFImpl.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/SafeEMFImpl.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/folder/FolderObserver.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/folder/FolderObserver.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/util/MathUtils.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/util/MathUtils.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/util/MathUtils.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/util/MathUtils.java
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/valueconverter/ValueTypeToStringConverter.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/valueconverter/ValueTypeToStringConverter.java
similarity index 100%
rename from bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/valueconverter/ValueTypeToStringConverter.java
rename to bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/valueconverter/ValueTypeToStringConverter.java
diff --git a/bundles/org.openhab.core.model.item.ide/src/org/eclipse/smarthome/model/ide/ItemsIdeModule.xtend b/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.item.ide/src/org/eclipse/smarthome/model/ide/ItemsIdeModule.xtend
rename to bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeModule.xtend
diff --git a/bundles/org.openhab.core.model.item.ide/src/org/eclipse/smarthome/model/ide/ItemsIdeSetup.xtend b/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.item.ide/src/org/eclipse/smarthome/model/ide/ItemsIdeSetup.xtend
rename to bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeSetup.xtend
diff --git a/bundles/org.openhab.core.model.item.runtime/src/org/eclipse/smarthome/model/item/runtime/internal/ItemRuntimeActivator.java b/bundles/org.openhab.core.model.item.runtime/src/org/openhab/core/model/item/runtime/internal/ItemRuntimeActivator.java
similarity index 100%
rename from bundles/org.openhab.core.model.item.runtime/src/org/eclipse/smarthome/model/item/runtime/internal/ItemRuntimeActivator.java
rename to bundles/org.openhab.core.model.item.runtime/src/org/openhab/core/model/item/runtime/internal/ItemRuntimeActivator.java
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/GenerateItems.mwe2 b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/GenerateItems.mwe2
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/Items.xtext b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/Items.xtext
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/ItemsRuntimeModule.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsRuntimeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/ItemsRuntimeModule.xtend
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsRuntimeModule.xtend
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/ItemsStandaloneSetup.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsStandaloneSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/ItemsStandaloneSetup.xtend
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsStandaloneSetup.xtend
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/formatting/ItemsFormatter.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/formatting/ItemsFormatter.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/formatting/ItemsFormatter.xtend
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/formatting/ItemsFormatter.xtend
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/generator/ItemsGenerator.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/generator/ItemsGenerator.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/generator/ItemsGenerator.xtend
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/generator/ItemsGenerator.xtend
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/internal/valueconverter/ItemValueConverters.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/internal/valueconverter/ItemValueConverters.java
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/internal/valueconverter/ItemValueConverters.java
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/internal/valueconverter/ItemValueConverters.java
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/item/BindingConfigParseException.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigParseException.java
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/item/BindingConfigParseException.java
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigParseException.java
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/item/BindingConfigReader.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigReader.java
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/item/BindingConfigReader.java
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigReader.java
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/item/internal/GenericItemProvider.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/item/internal/GenericItemProvider.java
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/item/internal/GenericMetadataProvider.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericMetadataProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/item/internal/GenericMetadataProvider.java
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericMetadataProvider.java
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/scoping/ItemsScopeProvider.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/scoping/ItemsScopeProvider.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/scoping/ItemsScopeProvider.xtend
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/scoping/ItemsScopeProvider.xtend
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/serializer/ItemsSemanticSequencer.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSemanticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/serializer/ItemsSemanticSequencer.xtend
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSemanticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/serializer/ItemsSyntacticSequencer.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSyntacticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/serializer/ItemsSyntacticSequencer.xtend
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSyntacticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/validation/ItemsValidator.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/validation/ItemsValidator.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.item/src/org/eclipse/smarthome/model/validation/ItemsValidator.xtend
rename to bundles/org.openhab.core.model.item/src/org/openhab/core/model/validation/ItemsValidator.xtend
diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/eclipse/smarthome/model/lazygen/GlobalResourceSet.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java
similarity index 100%
rename from bundles/org.openhab.core.model.lazygen/src/main/java/org/eclipse/smarthome/model/lazygen/GlobalResourceSet.java
rename to bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java
diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/eclipse/smarthome/model/lazygen/LazyGenerator.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java
similarity index 100%
rename from bundles/org.openhab.core.model.lazygen/src/main/java/org/eclipse/smarthome/model/lazygen/LazyGenerator.java
rename to bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java
diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/eclipse/smarthome/model/lazygen/LazyLanguageConfig.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java
similarity index 100%
rename from bundles/org.openhab.core.model.lazygen/src/main/java/org/eclipse/smarthome/model/lazygen/LazyLanguageConfig.java
rename to bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java
diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/eclipse/smarthome/model/lazygen/LazyStandaloneSetup.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java
similarity index 100%
rename from bundles/org.openhab.core.model.lazygen/src/main/java/org/eclipse/smarthome/model/lazygen/LazyStandaloneSetup.java
rename to bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java
diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensions.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java
similarity index 100%
rename from bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensions.java
rename to bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java
diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/ModelServer.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java
similarity index 100%
rename from bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/ModelServer.java
rename to bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java
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/openhab/core/model/lsp/internal/RegistryProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RegistryProvider.java
rename to bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RegistryProvider.java
diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RuntimeServerModule.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java
similarity index 100%
rename from bundles/org.openhab.core.model.lsp/src/main/java/org/eclipse/smarthome/model/lsp/internal/RuntimeServerModule.java
rename to bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java
diff --git a/bundles/org.openhab.core.model.lsp/src/test/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensionsTest.java b/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java
similarity index 100%
rename from bundles/org.openhab.core.model.lsp/src/test/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensionsTest.java
rename to bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java
diff --git a/bundles/org.openhab.core.model.persistence.ide/src/org/eclipse/smarthome/model/persistence/ide/PersistenceIdeModule.xtend b/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.persistence.ide/src/org/eclipse/smarthome/model/persistence/ide/PersistenceIdeModule.xtend
rename to bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeModule.xtend
diff --git a/bundles/org.openhab.core.model.persistence.ide/src/org/eclipse/smarthome/model/persistence/ide/PersistenceIdeSetup.xtend b/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.persistence.ide/src/org/eclipse/smarthome/model/persistence/ide/PersistenceIdeSetup.xtend
rename to bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeSetup.xtend
diff --git a/bundles/org.openhab.core.model.persistence.runtime/src/org/eclipse/smarthome/model/persistence/runtime/internal/PersistenceRuntimeActivator.java b/bundles/org.openhab.core.model.persistence.runtime/src/org/openhab/core/model/persistence/runtime/internal/PersistenceRuntimeActivator.java
similarity index 100%
rename from bundles/org.openhab.core.model.persistence.runtime/src/org/eclipse/smarthome/model/persistence/runtime/internal/PersistenceRuntimeActivator.java
rename to bundles/org.openhab.core.model.persistence.runtime/src/org/openhab/core/model/persistence/runtime/internal/PersistenceRuntimeActivator.java
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/GeneratePersistence.mwe2 b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/GeneratePersistence.mwe2
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/Persistence.xtext b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/Persistence.xtext
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/PersistenceRuntimeModule.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceRuntimeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/PersistenceRuntimeModule.xtend
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceRuntimeModule.xtend
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/PersistenceStandaloneSetup.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceStandaloneSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/PersistenceStandaloneSetup.xtend
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceStandaloneSetup.xtend
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/extensions/PersistenceExtensions.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/extensions/PersistenceExtensions.java
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/extensions/PersistenceExtensions.java
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/extensions/PersistenceExtensions.java
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/formatting/PersistenceFormatter.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/formatting/PersistenceFormatter.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/formatting/PersistenceFormatter.xtend
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/formatting/PersistenceFormatter.xtend
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/generator/PersistenceGenerator.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/generator/PersistenceGenerator.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/generator/PersistenceGenerator.xtend
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/generator/PersistenceGenerator.xtend
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/internal/PersistenceModelManager.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/internal/PersistenceModelManager.java
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/internal/PersistenceModelManager.java
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/internal/PersistenceModelManager.java
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/scoping/GlobalStrategies.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/scoping/GlobalStrategies.java
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/scoping/PersistenceGlobalScopeProvider.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceGlobalScopeProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/scoping/PersistenceGlobalScopeProvider.java
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceGlobalScopeProvider.java
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/scoping/PersistenceScopeProvider.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceScopeProvider.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/scoping/PersistenceScopeProvider.xtend
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceScopeProvider.xtend
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/serializer/PersistenceSemanticSequencer.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSemanticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/serializer/PersistenceSemanticSequencer.xtend
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSemanticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/serializer/PersistenceSyntacticSequencer.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSyntacticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/serializer/PersistenceSyntacticSequencer.xtend
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSyntacticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/validation/PersistenceValidator.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/validation/PersistenceValidator.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.persistence/src/org/eclipse/smarthome/model/persistence/validation/PersistenceValidator.xtend
rename to bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/validation/PersistenceValidator.xtend
diff --git a/bundles/org.openhab.core.model.rule.ide/src/org/eclipse/smarthome/model/rule/ide/RulesIdeModule.xtend b/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.rule.ide/src/org/eclipse/smarthome/model/rule/ide/RulesIdeModule.xtend
rename to bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeModule.xtend
diff --git a/bundles/org.openhab.core.model.rule.ide/src/org/eclipse/smarthome/model/rule/ide/RulesIdeSetup.xtend b/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.rule.ide/src/org/eclipse/smarthome/model/rule/ide/RulesIdeSetup.xtend
rename to bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeSetup.xtend
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/RuleEngine.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/RuleEngine.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/RuleEngine.java
rename to bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/RuleEngine.java
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/RuleRuntimeActivator.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleRuntimeActivator.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/RuleRuntimeActivator.java
rename to bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleRuntimeActivator.java
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/ExecuteRuleJob.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/ExecuteRuleJob.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/ExecuteRuleJob.java
rename to bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/ExecuteRuleJob.java
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java
rename to bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleContextHelper.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleContextHelper.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleContextHelper.java
rename to bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleContextHelper.java
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleEngineImpl.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEngineImpl.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleEngineImpl.java
rename to bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEngineImpl.java
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleEvaluationContext.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEvaluationContext.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleEvaluationContext.java
rename to bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEvaluationContext.java
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleTriggerManager.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerManager.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule.runtime/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleTriggerManager.java
rename to bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerManager.java
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/GenerateRules.mwe2 b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/GenerateRules.mwe2
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/Rules.xtext b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/Rules.xtext
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/Rules.xtext
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/Rules.xtext
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/RulesRuntimeModule.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/RulesRuntimeModule.xtend
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/RulesStandaloneSetup.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesStandaloneSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/RulesStandaloneSetup.xtend
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesStandaloneSetup.xtend
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/formatting/RulesFormatter.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/formatting/RulesFormatter.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/formatting/RulesFormatter.xtend
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/formatting/RulesFormatter.xtend
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/jvmmodel/RulesItemRefresher.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesItemRefresher.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/jvmmodel/RulesItemRefresher.java
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesItemRefresher.java
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/jvmmodel/RulesJvmModelInferrer.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/jvmmodel/RulesJvmModelInferrer.xtend
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/jvmmodel/RulesRefresher.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesRefresher.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/jvmmodel/RulesRefresher.java
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesRefresher.java
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/jvmmodel/RulesThingRefresher.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesThingRefresher.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/jvmmodel/RulesThingRefresher.java
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesThingRefresher.java
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/scoping/RulesImplicitlyImportedTypes.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesImplicitlyImportedTypes.java
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/scoping/RulesImplicitlyImportedTypes.java
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesImplicitlyImportedTypes.java
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/scoping/RulesScopeProvider.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesScopeProvider.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/scoping/RulesScopeProvider.xtend
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesScopeProvider.xtend
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/serializer/RulesSemanticSequencer.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSemanticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/serializer/RulesSemanticSequencer.xtend
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSemanticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/serializer/RulesSyntacticSequencer.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSyntacticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/serializer/RulesSyntacticSequencer.xtend
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSyntacticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/validation/RulesValidator.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/validation/RulesValidator.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.rule/src/org/eclipse/smarthome/model/rule/validation/RulesValidator.xtend
rename to bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/validation/RulesValidator.xtend
diff --git a/bundles/org.openhab.core.model.script.ide/src/org/eclipse/smarthome/model/script/ide/ScriptIdeModule.xtend b/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script.ide/src/org/eclipse/smarthome/model/script/ide/ScriptIdeModule.xtend
rename to bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeModule.xtend
diff --git a/bundles/org.openhab.core.model.script.ide/src/org/eclipse/smarthome/model/script/ide/ScriptIdeSetup.xtend b/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script.ide/src/org/eclipse/smarthome/model/script/ide/ScriptIdeSetup.xtend
rename to bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeSetup.xtend
diff --git a/bundles/org.openhab.core.model.script.runtime/src/org/eclipse/smarthome/model/script/runtime/ScriptRuntime.java b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/ScriptRuntime.java
similarity index 100%
rename from bundles/org.openhab.core.model.script.runtime/src/org/eclipse/smarthome/model/script/runtime/ScriptRuntime.java
rename to bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/ScriptRuntime.java
diff --git a/bundles/org.openhab.core.model.script.runtime/src/org/eclipse/smarthome/model/script/runtime/internal/engine/ScriptEngineImpl.java b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptEngineImpl.java
similarity index 100%
rename from bundles/org.openhab.core.model.script.runtime/src/org/eclipse/smarthome/model/script/runtime/internal/engine/ScriptEngineImpl.java
rename to bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptEngineImpl.java
diff --git a/bundles/org.openhab.core.model.script.runtime/src/org/eclipse/smarthome/model/script/runtime/internal/engine/ScriptImpl.java b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptImpl.java
similarity index 100%
rename from bundles/org.openhab.core.model.script.runtime/src/org/eclipse/smarthome/model/script/runtime/internal/engine/ScriptImpl.java
rename to bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptImpl.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/GenerateScript.mwe2 b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/GenerateScript.mwe2
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/OptimizingFeatureScopeTrackerProvider2.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/OptimizingFeatureScopeTrackerProvider2.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/OptimizingFeatureScopeTrackerProvider2.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/OptimizingFeatureScopeTrackerProvider2.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/Script.xtext b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/Script.xtext
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/Script.xtext
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/Script.xtext
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/ScriptRuntimeModule.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptRuntimeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/ScriptRuntimeModule.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptRuntimeModule.xtend
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/ScriptServiceUtil.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptServiceUtil.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/ScriptServiceUtil.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptServiceUtil.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/ScriptStandaloneSetup.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptStandaloneSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/ScriptStandaloneSetup.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptStandaloneSetup.xtend
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/ServiceModule.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ServiceModule.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/ServiceModule.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ServiceModule.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Audio.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Audio.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Audio.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Audio.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/BusEvent.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/BusEvent.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/BusEvent.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/BusEvent.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Ephemeris.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ephemeris.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Ephemeris.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ephemeris.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Exec.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Exec.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Exec.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Exec.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/HTTP.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/HTTP.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/LogAction.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/LogAction.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/LogAction.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/LogAction.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Ping.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ping.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Ping.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ping.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/ScriptExecution.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/ScriptExecution.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/ScriptExecution.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/ScriptExecution.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Things.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Things.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Things.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Things.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Timer.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Timer.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Timer.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Timer.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Voice.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Voice.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/actions/Voice.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Voice.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/IActionServiceProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IActionServiceProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/IActionServiceProvider.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IActionServiceProvider.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/IThingActionsProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IThingActionsProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/IThingActionsProvider.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IThingActionsProvider.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/Script.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/Script.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/Script.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/Script.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptEngine.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptEngine.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptEngine.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptEngine.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptError.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptError.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptException.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptException.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptException.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptException.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptExecutionException.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptExecutionException.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptExecutionException.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptExecutionException.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptParsingException.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptParsingException.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/ScriptParsingException.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptParsingException.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/action/ActionDoc.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionDoc.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/action/ActionDoc.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionDoc.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/action/ActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionService.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/action/ActionService.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionService.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/action/ParamDoc.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ParamDoc.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/engine/action/ParamDoc.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ParamDoc.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/extension/ScriptEngineConsoleCommandExtension.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/extension/ScriptEngineConsoleCommandExtension.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/formatting/ScriptFormatter.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/formatting/ScriptFormatter.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/formatting/ScriptFormatter.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/formatting/ScriptFormatter.xtend
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/RuleHumanLanguageInterpreter.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/RuleHumanLanguageInterpreter.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/ScriptEncodingProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/ScriptEncodingProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/ScriptEncodingProvider.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/ScriptEncodingProvider.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/actions/TimerExecutionJob.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerExecutionJob.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/actions/TimerExecutionJob.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerExecutionJob.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/actions/TimerImpl.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerImpl.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/actions/TimerImpl.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerImpl.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/AudioActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/AudioActionService.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/AudioActionService.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/AudioActionService.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/EphemerisActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/EphemerisActionService.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/EphemerisActionService.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/EphemerisActionService.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/PersistenceActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/PersistenceActionService.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/PersistenceActionService.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/PersistenceActionService.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/ThingActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/ThingActionService.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/ThingActionService.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/ThingActionService.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/TransformationActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/TransformationActionService.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/TransformationActionService.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/TransformationActionService.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/VoiceActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/VoiceActionService.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/internal/engine/action/VoiceActionService.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/VoiceActionService.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/interpreter/ScriptInterpreter.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/interpreter/ScriptInterpreter.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/jvmmodel/ScriptItemRefresher.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptItemRefresher.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/jvmmodel/ScriptItemRefresher.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptItemRefresher.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/jvmmodel/ScriptJvmModelInferrer.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/jvmmodel/ScriptJvmModelInferrer.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/jvmmodel/ScriptTypeComputer.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptTypeComputer.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/jvmmodel/ScriptTypeComputer.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptTypeComputer.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/lib/NumberExtensions.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/lib/NumberExtensions.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/scoping/ActionClassLoader.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ActionClassLoader.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/scoping/ActionClassLoader.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ActionClassLoader.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/scoping/ScriptImplicitlyImportedTypes.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImplicitlyImportedTypes.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/scoping/ScriptImplicitlyImportedTypes.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImplicitlyImportedTypes.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/scoping/ScriptScopeProvider.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptScopeProvider.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/scoping/ScriptScopeProvider.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptScopeProvider.xtend
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/scoping/StateAndCommandProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/scoping/StateAndCommandProvider.java
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/serializer/ScriptSemanticSequencer.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSemanticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/serializer/ScriptSemanticSequencer.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSemanticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/serializer/ScriptSyntacticSequencer.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSyntacticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/serializer/ScriptSyntacticSequencer.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSyntacticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/validation/ScriptValidator.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/validation/ScriptValidator.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/validation/ScriptValidator.xtend
rename to bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/validation/ScriptValidator.xtend
diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeModule.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeModule.xtend
rename to bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeModule.xtend
diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeSetup.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap.ide/src/org/eclipse/smarthome/model/sitemap/ide/SitemapIdeSetup.xtend
rename to bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeSetup.xtend
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/openhab/core/model/sitemap/runtime/internal/SitemapRuntimeActivator.java
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap.runtime/src/org/eclipse/smarthome/model/sitemap/runtime/internal/SitemapRuntimeActivator.java
rename to bundles/org.openhab.core.model.sitemap.runtime/src/org/openhab/core/model/sitemap/runtime/internal/SitemapRuntimeActivator.java
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2 b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/GenerateSitemap.mwe2
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/GenerateSitemap.mwe2
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.properties b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.properties
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.properties
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.properties
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.xtext b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/Sitemap.xtext
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext
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/openhab/core/model/sitemap/SitemapProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapProvider.java
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapProvider.java
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapRuntimeModule.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapRuntimeModule.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapStandaloneSetup.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapStandaloneSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/SitemapStandaloneSetup.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapStandaloneSetup.xtend
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/formatting/SitemapFormatter.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/formatting/SitemapFormatter.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/generator/SitemapGenerator.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/generator/SitemapGenerator.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/generator/SitemapGenerator.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/generator/SitemapGenerator.xtend
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/openhab/core/model/sitemap/internal/SitemapProviderImpl.java
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/internal/SitemapProviderImpl.java
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/internal/SitemapProviderImpl.java
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/scoping/SitemapScopeProvider.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/scoping/SitemapScopeProvider.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/scoping/SitemapScopeProvider.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/scoping/SitemapScopeProvider.xtend
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSemanticSequencer.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSemanticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSemanticSequencer.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSemanticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSyntacticSequencer.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSyntacticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/serializer/SitemapSyntacticSequencer.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSyntacticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/validation/SitemapValidator.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/validation/SitemapValidator.xtend
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/valueconverter/SitemapConverters.java b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java
similarity index 100%
rename from bundles/org.openhab.core.model.sitemap/src/org/eclipse/smarthome/model/sitemap/valueconverter/SitemapConverters.java
rename to bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java
diff --git a/bundles/org.openhab.core.model.thing.ide/src/org/eclipse/smarthome/model/thing/ide/ThingIdeModule.xtend b/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing.ide/src/org/eclipse/smarthome/model/thing/ide/ThingIdeModule.xtend
rename to bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeModule.xtend
diff --git a/bundles/org.openhab.core.model.thing.ide/src/org/eclipse/smarthome/model/thing/ide/ThingIdeSetup.xtend b/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing.ide/src/org/eclipse/smarthome/model/thing/ide/ThingIdeSetup.xtend
rename to bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeSetup.xtend
diff --git a/bundles/org.openhab.core.model.thing.runtime/src/org/eclipse/smarthome/model/thing/runtime/internal/ThingRuntimeActivator.java b/bundles/org.openhab.core.model.thing.runtime/src/org/openhab/core/model/thing/runtime/internal/ThingRuntimeActivator.java
similarity index 100%
rename from bundles/org.openhab.core.model.thing.runtime/src/org/eclipse/smarthome/model/thing/runtime/internal/ThingRuntimeActivator.java
rename to bundles/org.openhab.core.model.thing.runtime/src/org/openhab/core/model/thing/runtime/internal/ThingRuntimeActivator.java
diff --git a/bundles/org.openhab.core.model.thing/src.moved/test/java/org/eclipse/smarthome/model/thing/internal/GenericThingProviderMultipleBundlesTest.java b/bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src.moved/test/java/org/eclipse/smarthome/model/thing/internal/GenericThingProviderMultipleBundlesTest.java
rename to bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/GenerateThing.mwe2 b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/GenerateThing.mwe2
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/Thing.xtext b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/Thing.xtext
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/ThingRuntimeModule.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingRuntimeModule.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/ThingRuntimeModule.xtend
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingRuntimeModule.xtend
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/ThingStandaloneSetup.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingStandaloneSetup.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/ThingStandaloneSetup.xtend
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingStandaloneSetup.xtend
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/formatting/ThingFormatter.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/formatting/ThingFormatter.xtend
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/generator/ThingGenerator.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/generator/ThingGenerator.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/generator/ThingGenerator.xtend
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/generator/ThingGenerator.xtend
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/internal/GenericItemChannelLinkProvider.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/internal/GenericItemChannelLinkProvider.java
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/internal/GenericThingProvider.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericThingProvider.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/internal/GenericThingProvider.xtend
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericThingProvider.xtend
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/scoping/ThingScopeProvider.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/scoping/ThingScopeProvider.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/scoping/ThingScopeProvider.xtend
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/scoping/ThingScopeProvider.xtend
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/serializer/ThingSemanticSequencer.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSemanticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/serializer/ThingSemanticSequencer.xtend
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSemanticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/serializer/ThingSyntacticSequencer.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencer.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/serializer/ThingSyntacticSequencer.xtend
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencer.xtend
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/serializer/ThingSyntacticSequencerExtension.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencerExtension.java
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/serializer/ThingSyntacticSequencerExtension.java
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencerExtension.java
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/validation/ThingValidator.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/validation/ThingValidator.xtend
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/validation/ThingValidator.xtend
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/validation/ThingValidator.xtend
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/valueconverter/ThingValueConverters.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/ThingValueConverters.java
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/valueconverter/ThingValueConverters.java
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/ThingValueConverters.java
diff --git a/bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/valueconverter/UIDtoStringConverter.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java
similarity index 100%
rename from bundles/org.openhab.core.model.thing/src/org/eclipse/smarthome/model/thing/valueconverter/UIDtoStringConverter.java
rename to bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/FilterCriteria.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/FilterCriteria.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/HistoricItem.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/HistoricItem.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/HistoricItem.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/HistoricItem.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/ModifiablePersistenceService.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/ModifiablePersistenceService.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/ModifiablePersistenceService.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/ModifiablePersistenceService.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceItemInfo.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemInfo.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceItemInfo.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemInfo.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceManager.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceManager.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceManager.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceManager.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceService.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceService.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceService.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceService.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceServiceConfiguration.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceConfiguration.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceServiceConfiguration.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceConfiguration.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceServiceRegistry.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/PersistenceServiceRegistry.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceRegistry.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/QueryablePersistenceService.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/QueryablePersistenceService.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/SimpleFilter.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleFilter.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/SimpleFilter.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleFilter.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/SimpleItemConfiguration.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleItemConfiguration.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/SimpleItemConfiguration.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleItemConfiguration.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/config/SimpleAllConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleAllConfig.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/config/SimpleAllConfig.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleAllConfig.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/config/SimpleConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleConfig.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/config/SimpleConfig.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleConfig.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/config/SimpleGroupConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleGroupConfig.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/config/SimpleGroupConfig.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleGroupConfig.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/config/SimpleItemConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleItemConfig.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/config/SimpleItemConfig.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleItemConfig.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/dto/ItemHistoryDTO.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/ItemHistoryDTO.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/dto/ItemHistoryDTO.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/ItemHistoryDTO.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/dto/PersistenceServiceDTO.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/PersistenceServiceDTO.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/dto/PersistenceServiceDTO.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/PersistenceServiceDTO.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/internal/PersistItemsJob.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/internal/PersistItemsJob.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/internal/PersistenceManagerImpl.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/internal/PersistenceManagerImpl.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/internal/PersistenceServiceRegistryImpl.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/internal/PersistenceServiceRegistryImpl.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/strategy/SimpleCronStrategy.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleCronStrategy.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/strategy/SimpleCronStrategy.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleCronStrategy.java
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/strategy/SimpleStrategy.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleStrategy.java
similarity index 100%
rename from bundles/org.openhab.core.persistence/src/main/java/org/eclipse/smarthome/core/persistence/strategy/SimpleStrategy.java
rename to bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleStrategy.java
diff --git a/bundles/org.openhab.core.scheduler/src/main/java/org/eclipse/smarthome/core/scheduler/internal/SchedulerActivator.java b/bundles/org.openhab.core.scheduler/src/main/java/org/openhab/core/scheduler/internal/SchedulerActivator.java
similarity index 100%
rename from bundles/org.openhab.core.scheduler/src/main/java/org/eclipse/smarthome/core/scheduler/internal/SchedulerActivator.java
rename to bundles/org.openhab.core.scheduler/src/main/java/org/openhab/core/scheduler/internal/SchedulerActivator.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/SemanticTags.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/SemanticTags.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/SemanticsPredicates.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/SemanticsPredicates.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/SemanticsService.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/SemanticsService.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/internal/SemanticsMetadataProvider.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/internal/SemanticsMetadataProvider.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/internal/SemanticsServiceImpl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/internal/SemanticsServiceImpl.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/Equipment.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/Equipment.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/Location.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/Location.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/Point.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/Point.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/Property.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/Property.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/Tag.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/Tag.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/TagInfo.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/TagInfo.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Battery.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Battery.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Blinds.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Blinds.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Camera.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Camera.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Car.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Car.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/CleaningRobot.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/CleaningRobot.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Door.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Door.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Equipments.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Equipments.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/FrontDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/FrontDoor.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/GarageDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/GarageDoor.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/HVAC.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/HVAC.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Inverter.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Inverter.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/LawnMower.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/LawnMower.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Lightbulb.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Lightbulb.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Lock.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Lock.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/MotionDetector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/MotionDetector.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/NetworkAppliance.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/NetworkAppliance.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/PowerOutlet.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/PowerOutlet.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Projector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Projector.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/RadiatorControl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/RadiatorControl.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Receiver.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Receiver.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/RemoteControl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/RemoteControl.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Screen.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Screen.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Siren.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Siren.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/SmokeDetector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/SmokeDetector.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Speaker.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Speaker.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Valve.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Valve.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/WallSwitch.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/WallSwitch.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/WebService.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/WebService.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/WhiteGood.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/WhiteGood.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Window.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Window.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Attic.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Attic.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Basement.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Basement.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Bathroom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Bathroom.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Bedroom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Bedroom.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Building.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Building.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Carport.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Carport.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Corridor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Corridor.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/FirstFloor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/FirstFloor.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Floor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Floor.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Garage.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Garage.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Garden.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Garden.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/GroundFloor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/GroundFloor.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Indoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Indoor.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Kitchen.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Kitchen.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/LivingRoom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/LivingRoom.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Locations.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Locations.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Outdoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Outdoor.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Room.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Room.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Terrace.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/location/Terrace.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Alarm.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Alarm.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Control.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Control.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/LowBattery.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/LowBattery.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Measurement.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Measurement.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/OpenLevel.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/OpenLevel.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/OpenState.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/OpenState.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Points.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Points.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Setpoint.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Setpoint.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Status.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Status.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Switch.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Switch.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Tampered.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Tampered.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Tilt.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/point/Tilt.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/CO.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/CO.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/CO2.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/CO2.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/ColorTemperature.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/ColorTemperature.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Current.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Current.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Energy.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Energy.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Frequency.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Frequency.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Gas.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Gas.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Humidity.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Humidity.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Light.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Light.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Noise.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Noise.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Oil.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Oil.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Power.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Power.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Presence.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Presence.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Pressure.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Pressure.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Properties.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Properties.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Rain.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Rain.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Smoke.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Smoke.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/SoundVolume.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/SoundVolume.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Temperature.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Temperature.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Voltage.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Voltage.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Water.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Water.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Wind.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/main/java/org/eclipse/smarthome/core/semantics/model/property/Wind.java
rename to bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java
diff --git a/bundles/org.openhab.core.semantics/src/test/java/org/eclipse/smarthome/core/semantics/SemanticTagsTest.java b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/test/java/org/eclipse/smarthome/core/semantics/SemanticTagsTest.java
rename to bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java
diff --git a/bundles/org.openhab.core.semantics/src/test/java/org/eclipse/smarthome/core/semantics/internal/SemanticsServiceImplTest.java b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsServiceImplTest.java
similarity index 100%
rename from bundles/org.openhab.core.semantics/src/test/java/org/eclipse/smarthome/core/semantics/internal/SemanticsServiceImplTest.java
rename to bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsServiceImplTest.java
diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/eclipse/smarthome/storage/json/internal/JsonStorage.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java
similarity index 100%
rename from bundles/org.openhab.core.storage.json/src/main/java/org/eclipse/smarthome/storage/json/internal/JsonStorage.java
rename to bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java
diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/eclipse/smarthome/storage/json/internal/JsonStorageService.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java
similarity index 100%
rename from bundles/org.openhab.core.storage.json/src/main/java/org/eclipse/smarthome/storage/json/internal/JsonStorageService.java
rename to bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java
diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/eclipse/smarthome/storage/json/internal/StorageEntry.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntry.java
similarity index 100%
rename from bundles/org.openhab.core.storage.json/src/main/java/org/eclipse/smarthome/storage/json/internal/StorageEntry.java
rename to bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntry.java
diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/eclipse/smarthome/storage/json/internal/StorageEntryMapDeserializer.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntryMapDeserializer.java
similarity index 100%
rename from bundles/org.openhab.core.storage.json/src/main/java/org/eclipse/smarthome/storage/json/internal/StorageEntryMapDeserializer.java
rename to bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntryMapDeserializer.java
diff --git a/bundles/org.openhab.core.storage.json/src/test/java/org/eclipse/smarthome/storage/json/internal/JsonStorageTest.java b/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java
similarity index 100%
rename from bundles/org.openhab.core.storage.json/src/test/java/org/eclipse/smarthome/storage/json/internal/JsonStorageTest.java
rename to bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java
diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/eclipse/smarthome/storage/mapdb/internal/MapDbStorage.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorage.java
similarity index 100%
rename from bundles/org.openhab.core.storage.mapdb/src/main/java/org/eclipse/smarthome/storage/mapdb/internal/MapDbStorage.java
rename to bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorage.java
diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/eclipse/smarthome/storage/mapdb/internal/MapDbStorageService.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorageService.java
similarity index 100%
rename from bundles/org.openhab.core.storage.mapdb/src/main/java/org/eclipse/smarthome/storage/mapdb/internal/MapDbStorageService.java
rename to bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorageService.java
diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/eclipse/smarthome/storage/mapdb/internal/PropertiesTypeAdapter.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapter.java
similarity index 100%
rename from bundles/org.openhab.core.storage.mapdb/src/main/java/org/eclipse/smarthome/storage/mapdb/internal/PropertiesTypeAdapter.java
rename to bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapter.java
diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/eclipse/smarthome/storage/mapdb/internal/PropertiesTypeAdapterFactory.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapterFactory.java
similarity index 100%
rename from bundles/org.openhab.core.storage.mapdb/src/main/java/org/eclipse/smarthome/storage/mapdb/internal/PropertiesTypeAdapterFactory.java
rename to bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapterFactory.java
diff --git a/bundles/org.openhab.core.storage.mapdb/src/test/java/org/eclipse/smarthome/storage/mapdb/internal/MapDbStorageServiceTest.java b/bundles/org.openhab.core.storage.mapdb/src/test/java/org/openhab/core/storage/mapdb/internal/MapDbStorageServiceTest.java
similarity index 100%
rename from bundles/org.openhab.core.storage.mapdb/src/test/java/org/eclipse/smarthome/storage/mapdb/internal/MapDbStorageServiceTest.java
rename to bundles/org.openhab.core.storage.mapdb/src/test/java/org/openhab/core/storage/mapdb/internal/MapDbStorageServiceTest.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/MagicBindingConstants.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicBindingConstants.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/MagicBindingConstants.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicBindingConstants.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/MagicService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicService.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/MagicService.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicService.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicActionModuleThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicActionModuleThingHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicBridgeHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgeHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicBridgeHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgeHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicBridgedThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgedThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicBridgedThingHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgedThingHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicChattyThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicChattyThingHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicColorLightHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicColorLightHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicColorLightHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicColorLightHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicConfigurableThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicConfigurableThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicConfigurableThingHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicConfigurableThingHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicContactHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicContactHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicContactHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicContactHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicDelayedOnlineHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDelayedOnlineHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicDelayedOnlineHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDelayedOnlineHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicDimmableLightHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicDimmableLightHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicExtensibleThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicExtensibleThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicExtensibleThingHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicExtensibleThingHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicFirmwareUpdateThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicFirmwareUpdateThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicFirmwareUpdateThingHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicFirmwareUpdateThingHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicImageHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicImageHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicImageHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicImageHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicLocationThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicLocationThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicLocationThingHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicLocationThingHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicOnOffLightHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicOnOffLightHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicOnlineOfflineHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnlineOfflineHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicOnlineOfflineHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnlineOfflineHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicPlayerHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicPlayerHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicPlayerHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicPlayerHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicRolllershutterHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicRolllershutterHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicRolllershutterHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicRolllershutterHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicThermostatThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicThermostatThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/handler/MagicThermostatThingHandler.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicThermostatThingHandler.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/MagicDiscoveryService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/MagicDiscoveryService.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/MagicDynamicStateDescriptionProvider.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDynamicStateDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/MagicDynamicStateDescriptionProvider.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDynamicStateDescriptionProvider.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/MagicHandlerFactory.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/MagicHandlerFactory.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/MagicServiceConfig.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceConfig.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/MagicServiceConfig.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceConfig.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/MagicServiceImpl.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/MagicServiceImpl.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/automation/modules/MagicMultiActionMarker.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/automation/modules/MagicMultiActionMarker.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/automation/modules/MagicSingleActionService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/automation/modules/MagicSingleActionService.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/automation/modules/MagicThingActionsService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicThingActionsService.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/automation/modules/MagicThingActionsService.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicThingActionsService.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/firmware/MagicFirmwareProvider.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/firmware/MagicFirmwareProvider.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/firmware/MagicFirmwareProvider.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/firmware/MagicFirmwareProvider.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/http/MagicHttpResource.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/http/MagicHttpResource.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/binding/internal/http/MagicHttpResource.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/http/MagicHttpResource.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/internal/metadata/MagicMetadataProvider.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/internal/metadata/MagicMetadataProvider.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/internal/metadata/MagicMetadataProvider2.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider2.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/internal/metadata/MagicMetadataProvider2.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider2.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/internal/metadata/MagicMetadataUsingService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataUsingService.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/internal/metadata/MagicMetadataUsingService.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataUsingService.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/service/MagicMultiInstanceService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/service/MagicMultiInstanceService.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/service/MagicMultiInstanceServiceMarker.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/main/java/org/eclipse/smarthome/magic/service/MagicMultiInstanceServiceMarker.java
rename to bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java
diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/eclipse/smarthome/magic/binding/handler/MagicColorLightHandlerTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicColorLightHandlerTest.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/test/java/org/eclipse/smarthome/magic/binding/handler/MagicColorLightHandlerTest.java
rename to bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicColorLightHandlerTest.java
diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/eclipse/smarthome/magic/binding/handler/MagicDimmableLightHandlerTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandlerTest.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/test/java/org/eclipse/smarthome/magic/binding/handler/MagicDimmableLightHandlerTest.java
rename to bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandlerTest.java
diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/eclipse/smarthome/magic/binding/handler/MagicOnOffLightHandlerTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandlerTest.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/test/java/org/eclipse/smarthome/magic/binding/handler/MagicOnOffLightHandlerTest.java
rename to bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandlerTest.java
diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicHandlerFactoryTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicHandlerFactoryTest.java
rename to bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java
diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicServiceImplTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicServiceImplTest.java
similarity index 100%
rename from bundles/org.openhab.core.test.magic/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicServiceImplTest.java
rename to bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicServiceImplTest.java
diff --git a/bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/AsyncResultWrapper.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/AsyncResultWrapper.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/AsyncResultWrapper.java
rename to bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/AsyncResultWrapper.java
diff --git a/bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/BundleCloseable.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/BundleCloseable.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/BundleCloseable.java
rename to bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/BundleCloseable.java
diff --git a/bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/SyntheticBundleInstaller.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/SyntheticBundleInstaller.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/SyntheticBundleInstaller.java
rename to bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/SyntheticBundleInstaller.java
diff --git a/bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/TestPortUtil.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestPortUtil.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/TestPortUtil.java
rename to bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestPortUtil.java
diff --git a/bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/TestServer.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestServer.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/TestServer.java
rename to bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestServer.java
diff --git a/bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/internal/java/MissingServiceAnalyzer.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/internal/java/MissingServiceAnalyzer.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/internal/java/MissingServiceAnalyzer.java
rename to bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/internal/java/MissingServiceAnalyzer.java
diff --git a/bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/java/JavaOSGiTest.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaOSGiTest.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/java/JavaOSGiTest.java
rename to bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaOSGiTest.java
diff --git a/bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/java/JavaTest.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaTest.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/java/JavaTest.java
rename to bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaTest.java
diff --git a/bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/storage/VolatileStorage.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorage.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/storage/VolatileStorage.java
rename to bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorage.java
diff --git a/bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/storage/VolatileStorageService.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorageService.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/main/java/org/eclipse/smarthome/test/storage/VolatileStorageService.java
rename to bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorageService.java
diff --git a/bundles/org.openhab.core.test/src/test/java/org/eclipse/smarthome/test/java/JavaTestTest.java b/bundles/org.openhab.core.test/src/test/java/org/openhab/core/test/java/JavaTestTest.java
similarity index 100%
rename from bundles/org.openhab.core.test/src/test/java/org/eclipse/smarthome/test/java/JavaTestTest.java
rename to bundles/org.openhab.core.test/src/test/java/org/openhab/core/test/java/JavaTestTest.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/AbstractDescriptionTypeConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/AbstractDescriptionTypeConverter.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/AbstractDescriptionTypeConverter.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/AbstractDescriptionTypeConverter.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/BridgeTypeConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeConverter.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/BridgeTypeConverter.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeConverter.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/BridgeTypeXmlResult.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeXmlResult.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/BridgeTypeXmlResult.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeXmlResult.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelConverter.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelConverter.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelConverter.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelGroupTypeConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeConverter.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelGroupTypeConverter.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeConverter.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelGroupTypeXmlResult.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeXmlResult.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelGroupTypeXmlResult.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeXmlResult.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelTypeConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeConverter.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelTypeConverter.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeConverter.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelTypeXmlResult.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeXmlResult.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelTypeXmlResult.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeXmlResult.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelXmlResult.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelXmlResult.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ChannelXmlResult.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelXmlResult.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/CommandDescriptionConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/CommandDescriptionConverter.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/CommandDescriptionConverter.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/CommandDescriptionConverter.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/EventDescriptionConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/EventDescriptionConverter.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/EventDescriptionConverter.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/EventDescriptionConverter.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/StateDescriptionConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/StateDescriptionConverter.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/StateDescriptionConverter.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/StateDescriptionConverter.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingDescriptionConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionConverter.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingDescriptionConverter.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionConverter.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingDescriptionList.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionList.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingDescriptionList.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionList.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingDescriptionReader.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionReader.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingDescriptionReader.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionReader.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingTypeConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeConverter.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingTypeConverter.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeConverter.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingTypeXmlProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingTypeXmlProvider.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlProvider.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingTypeXmlResult.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlResult.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingTypeXmlResult.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlResult.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingXmlConfigDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/ThingXmlConfigDescriptionProvider.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingXmlConfigDescriptionProvider.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/XmlChannelGroupTypeProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelGroupTypeProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/XmlChannelGroupTypeProvider.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelGroupTypeProvider.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/XmlChannelTypeProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelTypeProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/XmlChannelTypeProvider.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelTypeProvider.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/XmlHelper.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlHelper.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/XmlHelper.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlHelper.java
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/XmlThingTypeProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlThingTypeProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/main/java/org/eclipse/smarthome/core/thing/xml/internal/XmlThingTypeProvider.java
rename to bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlThingTypeProvider.java
diff --git a/bundles/org.openhab.core.thing.xml/src/test/java/org/eclipse/smarthome/core/thing/xml/internal/Example.java b/bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/Example.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/test/java/org/eclipse/smarthome/core/thing/xml/internal/Example.java
rename to bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/Example.java
diff --git a/bundles/org.openhab.core.thing.xml/src/test/java/org/eclipse/smarthome/core/thing/xml/internal/XmlHelperTest.java b/bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/XmlHelperTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing.xml/src/test/java/org/eclipse/smarthome/core/thing/xml/internal/XmlHelperTest.java
rename to bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/XmlHelperTest.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/Bridge.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Bridge.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/Bridge.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Bridge.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/Channel.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Channel.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/Channel.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Channel.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ChannelGroupUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelGroupUID.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ChannelGroupUID.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelGroupUID.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ChannelUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelUID.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ChannelUID.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelUID.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/CommonTriggerEvents.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/CommonTriggerEvents.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/CommonTriggerEvents.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/CommonTriggerEvents.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/DefaultSystemChannelTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/DefaultSystemChannelTypeProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ManagedThingProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ManagedThingProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ManagedThingProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ManagedThingProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/Thing.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Thing.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/Thing.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Thing.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingManager.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingManager.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingManager.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingManager.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingRegistry.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistry.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingRegistryChangeListener.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistryChangeListener.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingRegistryChangeListener.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistryChangeListener.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingStatus.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatus.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingStatus.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatus.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingStatusDetail.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusDetail.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingStatusDetail.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusDetail.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingStatusInfo.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusInfo.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingStatusInfo.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusInfo.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingTypeMigrationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeMigrationService.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingTypeMigrationService.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeMigrationService.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingTypeUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeUID.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingTypeUID.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeUID.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingUID.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingUID.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingUID.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/UID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/UID.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/UID.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/UID.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseBridgeHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseBridgeHandler.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseBridgeHandler.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseBridgeHandler.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseDynamicCommandDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseDynamicCommandDescriptionProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseDynamicStateDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseDynamicStateDescriptionProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseThingHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseThingHandler.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandler.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseThingHandlerFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandlerFactory.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseThingHandlerFactory.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandlerFactory.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BridgeHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BridgeHandler.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BridgeHandler.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BridgeHandler.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ConfigStatusBridgeHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusBridgeHandler.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ConfigStatusBridgeHandler.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusBridgeHandler.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ConfigStatusThingHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ConfigStatusThingHandler.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusThingHandler.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingActions.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActions.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingActions.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActions.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingActionsScope.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActionsScope.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingActionsScope.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActionsScope.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingConfigStatusSource.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingConfigStatusSource.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingConfigStatusSource.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingConfigStatusSource.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingFactory.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingFactory.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingFactory.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandler.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingHandler.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandler.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingHandlerCallback.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerCallback.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingHandlerCallback.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerCallback.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingHandlerFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerFactory.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingHandlerFactory.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerFactory.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingHandlerService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerService.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingHandlerService.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerService.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingTypeProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingTypeProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingTypeProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/BridgeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/BridgeBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/BridgeBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/BridgeBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ChannelBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ChannelBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/ThingStatusInfoBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/ThingStatusInfoBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/Firmware.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/Firmware.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/Firmware.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/Firmware.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareRestriction.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareRestriction.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareRestriction.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareRestriction.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareUpdateBackgroundTransferHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateBackgroundTransferHandler.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareUpdateBackgroundTransferHandler.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateBackgroundTransferHandler.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareUpdateHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateHandler.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareUpdateHandler.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateHandler.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/ProgressCallback.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressCallback.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/ProgressCallback.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressCallback.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/ProgressStep.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressStep.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/ProgressStep.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressStep.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ChannelDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ChannelDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ChannelDTOMapper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ChannelDTOMapper.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTOMapper.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ChannelDefinitionDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDefinitionDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ChannelDefinitionDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDefinitionDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ChannelGroupDefinitionDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelGroupDefinitionDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ChannelGroupDefinitionDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelGroupDefinitionDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ChannelTypeDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelTypeDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ChannelTypeDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelTypeDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/StrippedThingTypeDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/StrippedThingTypeDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/StrippedThingTypeDTOMapper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/StrippedThingTypeDTOMapper.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTOMapper.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ThingDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ThingDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ThingDTOMapper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ThingDTOMapper.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTOMapper.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ThingTypeDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingTypeDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/dto/ThingTypeDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingTypeDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/AbstractThingRegistryEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/AbstractThingRegistryEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/AbstractThingRegistryEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/AbstractThingRegistryEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ChannelTriggeredEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ChannelTriggeredEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ChannelTriggeredEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ChannelTriggeredEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingAddedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingAddedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingAddedEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingAddedEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingEventFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingEventFactory.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingEventFactory.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingEventFactory.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingRemovedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingRemovedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingRemovedEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingRemovedEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingStatusInfoChangedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoChangedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingStatusInfoChangedEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoChangedEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingStatusInfoEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingStatusInfoEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingUpdatedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingUpdatedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/events/ThingUpdatedEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingUpdatedEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareEventFactory.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactory.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareEventFactory.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareRegistry.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareRegistry.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareStatus.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatus.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareStatus.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatus.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareStatusInfo.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfo.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareStatusInfo.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfo.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareStatusInfoEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfoEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareStatusInfoEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfoEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateProgressInfo.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfo.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateProgressInfo.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfo.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateProgressInfoEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfoEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateProgressInfoEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfoEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateResult.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResult.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateResult.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResult.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateResultInfo.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfo.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateResultInfo.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfo.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateResultInfoEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfoEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateResultInfoEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfoEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateService.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateService.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateService.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/dto/FirmwareDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/dto/FirmwareDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/dto/FirmwareStatusDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareStatusDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/firmware/dto/FirmwareStatusDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareStatusDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/i18n/ChannelGroupTypeI18nLocalizationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelGroupTypeI18nLocalizationService.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/i18n/ChannelGroupTypeI18nLocalizationService.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelGroupTypeI18nLocalizationService.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/i18n/ChannelTypeI18nLocalizationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelTypeI18nLocalizationService.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/i18n/ChannelTypeI18nLocalizationService.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelTypeI18nLocalizationService.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationService.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationService.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationService.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/i18n/ThingTypeI18nLocalizationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingTypeI18nLocalizationService.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/i18n/ThingTypeI18nLocalizationService.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingTypeI18nLocalizationService.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateConfigDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateConfigDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateConfigDescriptionProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateConfigDescriptionProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManager.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateManager.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManager.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateManager.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/BridgeImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/BridgeImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/BridgeImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/BridgeImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelCommandDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelCommandDescriptionProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelItemProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelItemProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/CommunicationManager.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/CommunicationManager.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ProfileContextImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ProfileContextImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ProfileContextImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ProfileContextImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingConfigDescriptionAliasProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingConfigDescriptionAliasProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingConfigDescriptionAliasProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingConfigDescriptionAliasProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingFactoryHelper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingFactoryHelper.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingFactoryHelper.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingFactoryHelper.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingManagerImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingManagerImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingRegistryImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingRegistryImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingTracker.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingTracker.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingTracker.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingTracker.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/console/FirmwareUpdateConsoleCommandExtension.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/FirmwareUpdateConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/console/FirmwareUpdateConsoleCommandExtension.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/FirmwareUpdateConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/console/LinkConsoleCommandExtension.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/LinkConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/console/LinkConsoleCommandExtension.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/LinkConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/console/ThingConsoleCommandExtension.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/ThingConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/console/ThingConsoleCommandExtension.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/ThingConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/ParameterChecks.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ParameterChecks.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/ParameterChecks.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ParameterChecks.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ProgressCallbackImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ProgressCallbackImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/i18n/ChannelGroupI18nUtil.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelGroupI18nUtil.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/i18n/ChannelGroupI18nUtil.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelGroupI18nUtil.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/i18n/ChannelI18nUtil.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelI18nUtil.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/i18n/ChannelI18nUtil.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelI18nUtil.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/i18n/ThingTypeI18nUtil.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ThingTypeI18nUtil.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/i18n/ThingTypeI18nUtil.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ThingTypeI18nUtil.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/link/ItemChannelLinkConfigDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/link/ItemChannelLinkConfigDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/link/ItemChannelLinkConfigDescriptionProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/link/ItemChannelLinkConfigDescriptionProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/ProfileCallbackImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileCallbackImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/ProfileCallbackImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileCallbackImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/ProfileTypeRegistryImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileTypeRegistryImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/ProfileTypeRegistryImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileTypeRegistryImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonOnOffSwitchProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonOnOffSwitchProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonTogglePlayerProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonTogglePlayerProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonTogglePlayerProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonTogglePlayerProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleRollershutterProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleRollershutterProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleRollershutterProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleRollershutterProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerDimmerProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerDimmerProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerDimmerProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerDimmerProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerNextPreviousProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerNextPreviousProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerNextPreviousProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerNextPreviousProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerOnOffProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerOnOffProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerOnOffProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerOnOffProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerPlayPauseProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerPlayPauseProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerPlayPauseProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerPlayPauseProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerRewindFastforwardProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerRewindFastforwardProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerRewindFastforwardProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerRewindFastforwardProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerStopMoveProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerStopMoveProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerStopMoveProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerStopMoveProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerUpDownProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerUpDownProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawRockerUpDownProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerUpDownProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/StateProfileTypeImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/StateProfileTypeImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/StateProfileTypeImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/StateProfileTypeImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemFollowProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemFollowProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactory.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactory.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactory.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/TimestampChangeProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampChangeProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/TimestampChangeProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampChangeProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/TimestampUpdateProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampUpdateProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/TimestampUpdateProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampUpdateProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/TriggerProfileTypeImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TriggerProfileTypeImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/TriggerProfileTypeImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TriggerProfileTypeImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/i18n/ProfileI18nUtil.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/i18n/ProfileI18nUtil.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/i18n/ProfileI18nUtil.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/i18n/ProfileI18nUtil.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/type/AbstractChannelTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/AbstractChannelTypeBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/type/AbstractChannelTypeBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/AbstractChannelTypeBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/type/StateChannelTypeBuilderImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/StateChannelTypeBuilderImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/type/StateChannelTypeBuilderImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/StateChannelTypeBuilderImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/type/TriggerChannelTypeBuilderImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/TriggerChannelTypeBuilderImpl.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/type/TriggerChannelTypeBuilderImpl.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/TriggerChannelTypeBuilderImpl.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/AbstractLink.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLink.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/AbstractLink.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLink.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/AbstractLinkRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLinkRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/AbstractLinkRegistry.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLinkRegistry.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/ItemChannelLink.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLink.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/ItemChannelLink.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLink.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkRegistry.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkRegistry.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/ManagedItemChannelLinkProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ManagedItemChannelLinkProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/ManagedItemChannelLinkProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ManagedItemChannelLinkProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/ThingLinkManager.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ThingLinkManager.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/ThingLinkManager.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ThingLinkManager.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/dto/AbstractLinkDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/AbstractLinkDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/dto/AbstractLinkDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/AbstractLinkDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/dto/ItemChannelLinkDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/ItemChannelLinkDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/dto/ItemChannelLinkDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/ItemChannelLinkDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/events/AbstractItemChannelLinkRegistryEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/AbstractItemChannelLinkRegistryEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/events/AbstractItemChannelLinkRegistryEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/AbstractItemChannelLinkRegistryEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/events/ItemChannelLinkAddedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkAddedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/events/ItemChannelLinkAddedEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkAddedEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/events/ItemChannelLinkRemovedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkRemovedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/events/ItemChannelLinkRemovedEvent.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkRemovedEvent.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/events/LinkEventFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/LinkEventFactory.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/link/events/LinkEventFactory.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/LinkEventFactory.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/Profile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/Profile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/Profile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/Profile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileAdvisor.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileAdvisor.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileAdvisor.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileAdvisor.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileCallback.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileCallback.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileCallback.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileCallback.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileContext.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileContext.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileContext.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileContext.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileFactory.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileFactory.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileFactory.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileType.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileType.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileType.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileTypeBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileTypeProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileTypeRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileTypeRegistry.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeRegistry.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileTypeUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeUID.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/ProfileTypeUID.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeUID.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/StateProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/StateProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/StateProfileType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfileType.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/StateProfileType.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfileType.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/SystemProfiles.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/SystemProfiles.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/SystemProfiles.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/SystemProfiles.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/TriggerProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfile.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/TriggerProfile.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfile.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/TriggerProfileType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfileType.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/TriggerProfileType.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfileType.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/dto/ProfileTypeDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTO.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/dto/ProfileTypeDTO.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTO.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/dto/ProfileTypeDTOMapper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/dto/ProfileTypeDTOMapper.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTOMapper.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/i18n/ProfileTypeI18nLocalizationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/i18n/ProfileTypeI18nLocalizationService.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/profiles/i18n/ProfileTypeI18nLocalizationService.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/i18n/ProfileTypeI18nLocalizationService.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/AbstractDescriptionType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AbstractDescriptionType.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/AbstractDescriptionType.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AbstractDescriptionType.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/AutoUpdatePolicy.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AutoUpdatePolicy.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/AutoUpdatePolicy.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AutoUpdatePolicy.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/BridgeType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/BridgeType.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/BridgeType.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/BridgeType.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelDefinition.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinition.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelDefinition.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinition.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelDefinitionBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinitionBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelDefinitionBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinitionBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupDefinition.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupDefinition.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupDefinition.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupDefinition.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupType.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupType.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupType.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeRegistry.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeRegistry.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeUID.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeUID.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeUID.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelKind.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelKind.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelKind.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelKind.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelType.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelType.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelType.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeRegistry.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeRegistry.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeUID.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeUID.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeUID.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/DynamicCommandDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicCommandDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/DynamicCommandDescriptionProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicCommandDescriptionProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/DynamicStateDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicStateDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/DynamicStateDescriptionProvider.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicStateDescriptionProvider.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/StateChannelTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/StateChannelTypeBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/StateChannelTypeBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/StateChannelTypeBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ThingType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingType.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ThingType.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingType.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ThingTypeRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/ThingTypeRegistry.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeRegistry.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/TriggerChannelTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/TriggerChannelTypeBuilder.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/type/TriggerChannelTypeBuilder.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/TriggerChannelTypeBuilder.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHandlerHelper.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelper.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHandlerHelper.java
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/util/ThingHelper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHelper.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/util/ThingHelper.java
rename to bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHelper.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelGroupUIDTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelGroupUIDTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/ChannelTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/ChannelTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelUIDTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelUIDTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ThingUIDTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ThingUIDTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/UIDTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/UIDTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/UIDTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/UIDTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ChannelBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ChannelBuilderTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingBuilderTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ThingStatusInfoBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ThingStatusInfoBuilderTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilderTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/firmware/FirmwareEventFactoryTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/firmware/FirmwareEventFactoryTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/AutoUpdateManagerTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/AutoUpdateManagerTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ChannelItemProviderTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ChannelItemProviderTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingImplTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingImplTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingImplTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingImplTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerImplTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingManagerImplTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerImplTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingManagerImplTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/firmware/ProgressCallbackTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/firmware/ProgressCallbackTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonOnOffSwitchProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfileTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonOnOffSwitchProfileTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfileTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfileTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfileTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemFollowProfileTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemFollowProfileTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfileTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfileTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/TimestampProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/TimestampProfileTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/TimestampProfileTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/TimestampProfileTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelGroupTypeBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelGroupTypeBuilderTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelTypeBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelTypeBuilderTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ThingTypeBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ThingTypeBuilderTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHandlerHelperTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHandlerHelperTest.java
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHelperTest.java
similarity index 100%
rename from bundles/org.openhab.core.thing/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java
rename to bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHelperTest.java
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/AbstractFileTransformationService.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
similarity index 100%
rename from bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/AbstractFileTransformationService.java
rename to bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/TransformationException.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationException.java
similarity index 100%
rename from bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/TransformationException.java
rename to bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationException.java
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/TransformationHelper.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationHelper.java
similarity index 100%
rename from bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/TransformationHelper.java
rename to bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationHelper.java
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/TransformationService.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationService.java
similarity index 100%
rename from bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/TransformationService.java
rename to bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationService.java
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/actions/Transformation.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/actions/Transformation.java
similarity index 100%
rename from bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/actions/Transformation.java
rename to bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/actions/Transformation.java
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/internal/TransformationActivator.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/internal/TransformationActivator.java
similarity index 100%
rename from bundles/org.openhab.core.transform/src/main/java/org/eclipse/smarthome/core/transform/internal/TransformationActivator.java
rename to bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/internal/TransformationActivator.java
diff --git a/bundles/org.openhab.core.transform/src/test/java/org/eclipse/smarthome/core/transform/actions/TransformationTest.java b/bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/actions/TransformationTest.java
similarity index 100%
rename from bundles/org.openhab.core.transform/src/test/java/org/eclipse/smarthome/core/transform/actions/TransformationTest.java
rename to bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/actions/TransformationTest.java
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/AbstractResourceIconProvider.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/AbstractResourceIconProvider.java
similarity index 100%
rename from bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/AbstractResourceIconProvider.java
rename to bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/AbstractResourceIconProvider.java
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/IconProvider.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconProvider.java
similarity index 100%
rename from bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/IconProvider.java
rename to bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconProvider.java
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/IconSet.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconSet.java
similarity index 100%
rename from bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/IconSet.java
rename to bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconSet.java
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/internal/CustomIconProvider.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/CustomIconProvider.java
similarity index 100%
rename from bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/internal/CustomIconProvider.java
rename to bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/CustomIconProvider.java
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/internal/IconServlet.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconServlet.java
similarity index 100%
rename from bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/internal/IconServlet.java
rename to bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconServlet.java
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/internal/IconSetResource.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconSetResource.java
similarity index 100%
rename from bundles/org.openhab.core.ui.icon/src/main/java/org/eclipse/smarthome/ui/icon/internal/IconSetResource.java
rename to bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconSetResource.java
diff --git a/bundles/org.openhab.core.ui.icon/src/test/java/org/eclipse/smarthome/ui/icon/AbstractResourceIconProviderTest.java b/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/AbstractResourceIconProviderTest.java
similarity index 100%
rename from bundles/org.openhab.core.ui.icon/src/test/java/org/eclipse/smarthome/ui/icon/AbstractResourceIconProviderTest.java
rename to bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/AbstractResourceIconProviderTest.java
diff --git a/bundles/org.openhab.core.ui.icon/src/test/java/org/eclipse/smarthome/ui/icon/internal/IconServletTest.java b/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/internal/IconServletTest.java
similarity index 100%
rename from bundles/org.openhab.core.ui.icon/src/test/java/org/eclipse/smarthome/ui/icon/internal/IconServletTest.java
rename to bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/internal/IconServletTest.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/chart/ChartProvider.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/chart/ChartProvider.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/chart/ChartProvider.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/chart/ChartProvider.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/UIActivator.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/UIActivator.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/UIActivator.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/UIActivator.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/ChartServlet.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/ChartServlet.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/ChartTheme.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartTheme.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/ChartTheme.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartTheme.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/ChartThemeBlack.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBlack.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/ChartThemeBlack.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBlack.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/ChartThemeBright.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBright.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/ChartThemeBright.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBright.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/ChartThemeDark.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeDark.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/ChartThemeDark.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeDark.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/ChartThemeWhite.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeWhite.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/ChartThemeWhite.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeWhite.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java
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/openhab/core/ui/internal/items/ItemUIRegistryImpl.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/items/ItemUIRegistryImpl.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/AsyncProxyServlet.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/AsyncProxyServlet.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/AsyncProxyServlet.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/AsyncProxyServlet.java
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/BlockingProxyServlet.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/BlockingProxyServlet.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/BlockingProxyServlet.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/BlockingProxyServlet.java
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/openhab/core/ui/internal/proxy/ProxyServletService.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletService.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/ProxyServletService.java
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/openhab/core/ui/items/ItemUIProvider.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIProvider.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIProvider.java
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/openhab/core/ui/items/ItemUIRegistry.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/main/java/org/eclipse/smarthome/ui/items/ItemUIRegistry.java
rename to bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIRegistry.java
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/openhab/core/ui/internal/items/ItemUIRegistryImplTest.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java
rename to bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/items/ItemUIRegistryImplTest.java
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/openhab/core/ui/internal/proxy/ProxyServletServiceTest.java
similarity index 100%
rename from bundles/org.openhab.core.ui/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java
rename to bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/proxy/ProxyServletServiceTest.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/AudioStartEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStartEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/AudioStartEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStartEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/AudioStopEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStopEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/AudioStopEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStopEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSErrorEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSErrorEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSErrorEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSErrorEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSException.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSException.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSException.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSException.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSListener.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSListener.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSListener.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSListener.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSService.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSService.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSService.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSService.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSServiceHandle.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSServiceHandle.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSServiceHandle.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSServiceHandle.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSpottedEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSpottedEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/KSpottedEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSpottedEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/RecognitionStartEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStartEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/RecognitionStartEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStartEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/RecognitionStopEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStopEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/RecognitionStopEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStopEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/STTEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/STTEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/STTException.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTException.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/STTException.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTException.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/STTListener.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTListener.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/STTListener.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTListener.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/STTService.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTService.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/STTService.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTService.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/STTServiceHandle.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTServiceHandle.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/STTServiceHandle.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTServiceHandle.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/SpeechRecognitionErrorEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionErrorEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/SpeechRecognitionErrorEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionErrorEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/SpeechRecognitionEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/SpeechRecognitionEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/SpeechStartEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStartEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/SpeechStartEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStartEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/SpeechStopEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStopEvent.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/SpeechStopEvent.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStopEvent.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/TTSException.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSException.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/TTSException.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSException.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/TTSService.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSService.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/TTSService.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSService.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/Voice.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/Voice.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/Voice.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/Voice.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/VoiceManager.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/VoiceManager.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/VoiceManager.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/VoiceManager.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/DialogProcessor.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/DialogProcessor.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/DialogProcessor.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/DialogProcessor.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/VoiceConsoleCommandExtension.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceConsoleCommandExtension.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/VoiceConsoleCommandExtension.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceConsoleCommandExtension.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/VoiceManagerImpl.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/VoiceManagerImpl.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/text/StandardInterpreter.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/text/StandardInterpreter.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/internal/text/StandardInterpreter.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/text/StandardInterpreter.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ASTNode.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ASTNode.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ASTNode.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ASTNode.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/AbstractRuleBasedInterpreter.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/AbstractRuleBasedInterpreter.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/AbstractRuleBasedInterpreter.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/AbstractRuleBasedInterpreter.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/Expression.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Expression.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/Expression.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Expression.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionAlternatives.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionAlternatives.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionAlternatives.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionAlternatives.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionCardinality.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionCardinality.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionCardinality.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionCardinality.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionIdentifier.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionIdentifier.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionIdentifier.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionIdentifier.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionLet.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionLet.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionLet.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionLet.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionMatch.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionMatch.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionMatch.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionMatch.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionSequence.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionSequence.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/ExpressionSequence.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionSequence.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/HumanLanguageInterpreter.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/HumanLanguageInterpreter.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/HumanLanguageInterpreter.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/HumanLanguageInterpreter.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/InterpretationException.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationException.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/InterpretationException.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationException.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/InterpretationResult.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationResult.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/InterpretationResult.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationResult.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/Rule.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Rule.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/Rule.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Rule.java
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/TokenList.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/TokenList.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/TokenList.java
rename to bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/TokenList.java
diff --git a/bundles/org.openhab.core.voice/src/test/java/org/eclipse/smarthome/core/voice/STTExceptionTest.java b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/STTExceptionTest.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/test/java/org/eclipse/smarthome/core/voice/STTExceptionTest.java
rename to bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/STTExceptionTest.java
diff --git a/bundles/org.openhab.core.voice/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionErrorEventTest.java b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionErrorEventTest.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionErrorEventTest.java
rename to bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionErrorEventTest.java
diff --git a/bundles/org.openhab.core.voice/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionEventTest.java b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionEventTest.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionEventTest.java
rename to bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionEventTest.java
diff --git a/bundles/org.openhab.core.voice/src/test/java/org/eclipse/smarthome/core/voice/TTSExceptionTest.java b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/TTSExceptionTest.java
similarity index 100%
rename from bundles/org.openhab.core.voice/src/test/java/org/eclipse/smarthome/core/voice/TTSExceptionTest.java
rename to bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/TTSExceptionTest.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/Authentication.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Authentication.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/Authentication.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Authentication.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/AuthenticationException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationException.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/AuthenticationException.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationException.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/AuthenticationManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationManager.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/AuthenticationManager.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationManager.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/AuthenticationProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/AuthenticationProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/Credentials.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Credentials.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/Credentials.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Credentials.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/Role.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Role.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/Role.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Role.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/SecurityException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/SecurityException.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/SecurityException.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/SecurityException.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/UnsupportedCredentialsException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UnsupportedCredentialsException.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/UnsupportedCredentialsException.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UnsupportedCredentialsException.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/UsernamePasswordCredentials.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UsernamePasswordCredentials.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/UsernamePasswordCredentials.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UsernamePasswordCredentials.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/AccessTokenRefreshListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenRefreshListener.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/AccessTokenRefreshListener.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenRefreshListener.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/AccessTokenResponse.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenResponse.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/AccessTokenResponse.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenResponse.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/OAuthClientService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthClientService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/OAuthClientService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthClientService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/OAuthException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthException.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/OAuthException.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthException.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/OAuthFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthFactory.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/OAuthFactory.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthFactory.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/OAuthResponseException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthResponseException.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/OAuthResponseException.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthResponseException.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/StorageCipher.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/StorageCipher.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/StorageCipher.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/StorageCipher.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/BindingInfo.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfo.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/BindingInfo.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfo.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/BindingInfoProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/BindingInfoProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/BindingInfoRegistry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoRegistry.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/BindingInfoRegistry.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoRegistry.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/dto/BindingInfoDTO.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/dto/BindingInfoDTO.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/dto/BindingInfoDTO.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/binding/dto/BindingInfoDTO.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/i18n/BindingI18nLocalizationService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/i18n/BindingI18nLocalizationService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/i18n/BindingI18nLocalizationService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/binding/i18n/BindingI18nLocalizationService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/internal/i18n/BindingI18nUtil.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/internal/i18n/BindingI18nUtil.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/binding/internal/i18n/BindingI18nUtil.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/binding/internal/i18n/BindingI18nUtil.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCache.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCache.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCache.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCache.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheAsync.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheAsync.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheAsync.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheAsync.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheMap.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheMap.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheMap.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheMap.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/AbstractUID.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/AbstractUID.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/AbstractUID.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/AbstractUID.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/NamedThreadFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/NamedThreadFactory.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/NamedThreadFactory.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/NamedThreadFactory.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/QueueingThreadPoolExecutor.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/QueueingThreadPoolExecutor.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/SafeCaller.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCaller.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/SafeCaller.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCaller.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/SafeCallerBuilder.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCallerBuilder.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/SafeCallerBuilder.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCallerBuilder.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/ThreadFactoryBuilder.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadFactoryBuilder.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/ThreadFactoryBuilder.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadFactoryBuilder.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/ThreadPoolManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadPoolManager.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/ThreadPoolManager.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadPoolManager.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/osgi/ResourceBundleClassLoader.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/osgi/ResourceBundleClassLoader.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/osgi/ResourceBundleClassLoader.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/osgi/ResourceBundleClassLoader.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/AbstractManagedProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractManagedProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/AbstractManagedProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractManagedProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/AbstractProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/AbstractProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/AbstractRegistry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/AbstractRegistry.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/DefaultAbstractManagedProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/DefaultAbstractManagedProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/DefaultAbstractManagedProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/DefaultAbstractManagedProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/Identifiable.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Identifiable.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/Identifiable.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Identifiable.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/ManagedProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ManagedProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/ManagedProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ManagedProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/Provider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Provider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/Provider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Provider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/ProviderChangeListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ProviderChangeListener.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/ProviderChangeListener.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ProviderChangeListener.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/Registry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Registry.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/Registry.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Registry.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/RegistryChangeListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/RegistryChangeListener.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/common/registry/RegistryChangeListener.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/RegistryChangeListener.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/AbstractEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/AbstractEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/AbstractEventFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEventFactory.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/AbstractEventFactory.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEventFactory.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/AbstractTypedEventSubscriber.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractTypedEventSubscriber.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/AbstractTypedEventSubscriber.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractTypedEventSubscriber.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/Event.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/Event.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/Event.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/events/Event.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/EventFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFactory.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/EventFactory.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFactory.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/EventFilter.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFilter.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/EventFilter.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFilter.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/EventPublisher.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventPublisher.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/EventPublisher.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventPublisher.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/EventSubscriber.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventSubscriber.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/EventSubscriber.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventSubscriber.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/TopicEventFilter.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicEventFilter.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/events/TopicEventFilter.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicEventFilter.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/extension/Extension.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/Extension.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/extension/Extension.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/extension/Extension.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/extension/ExtensionEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/extension/ExtensionEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/extension/ExtensionEventFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEventFactory.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/extension/ExtensionEventFactory.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEventFactory.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/extension/ExtensionService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/extension/ExtensionService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/extension/ExtensionType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/extension/ExtensionType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/I18nUtil.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/I18nUtil.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/I18nUtil.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/I18nUtil.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/LocaleProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocaleProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/LocaleProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocaleProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/LocalizedKey.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocalizedKey.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/LocalizedKey.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocalizedKey.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/LocationProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocationProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/LocationProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocationProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/TimeZoneProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TimeZoneProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/TimeZoneProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TimeZoneProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/TranslationProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TranslationProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/TranslationProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TranslationProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/UnitProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/UnitProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/i18n/UnitProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/UnitProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/auth/AuthenticationManagerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/auth/AuthenticationManagerImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/auth/AuthenticationManagerImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/auth/AuthenticationManagerImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/AbstractInvocationHandler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/AbstractInvocationHandler.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/AbstractInvocationHandler.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/AbstractInvocationHandler.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/CombinedClassLoader.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/CombinedClassLoader.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/CombinedClassLoader.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/CombinedClassLoader.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/DuplicateExecutionException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/DuplicateExecutionException.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/DuplicateExecutionException.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/DuplicateExecutionException.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/Invocation.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/Invocation.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/Invocation.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/Invocation.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/InvocationHandlerAsync.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerAsync.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/InvocationHandlerAsync.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerAsync.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/InvocationHandlerSync.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerSync.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/InvocationHandlerSync.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerSync.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManager.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallManager.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManager.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallManagerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManagerImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallManagerImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManagerImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerBuilderImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerBuilderImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerBuilderImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerBuilderImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/WrappedScheduledExecutorService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/WrappedScheduledExecutorService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/common/WrappedScheduledExecutorService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/WrappedScheduledExecutorService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/events/EventHandler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/EventHandler.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/events/EventHandler.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/EventHandler.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/events/OSGiEventManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventManager.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/events/OSGiEventManager.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventManager.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/events/OSGiEventPublisher.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventPublisher.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/events/OSGiEventPublisher.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventPublisher.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/events/ThreadedEventHandler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/ThreadedEventHandler.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/events/ThreadedEventHandler.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/ThreadedEventHandler.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/i18n/I18nProviderImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/i18n/I18nProviderImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/i18n/LanguageResourceBundleManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/LanguageResourceBundleManager.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/i18n/LanguageResourceBundleManager.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/LanguageResourceBundleManager.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/i18n/ResourceBundleTracker.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/ResourceBundleTracker.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/i18n/ResourceBundleTracker.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/ResourceBundleTracker.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/GroupFunctionHelper.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/GroupFunctionHelper.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/GroupFunctionHelper.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/GroupFunctionHelper.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ItemBuilderFactoryImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderFactoryImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ItemBuilderFactoryImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderFactoryImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ItemBuilderImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ItemBuilderImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ItemRegistryImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemRegistryImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ItemRegistryImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemRegistryImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ItemStateConverterImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemStateConverterImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ItemStateConverterImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemStateConverterImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ItemUpdater.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemUpdater.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ItemUpdater.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemUpdater.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ManagedMetadataProviderImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ManagedMetadataProviderImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/ManagedMetadataProviderImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ManagedMetadataProviderImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/MetadataRegistryImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/MetadataRegistryImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/items/MetadataRegistryImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/MetadataRegistryImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/library/unit/UnitInitializer.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/library/unit/UnitInitializer.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/library/unit/UnitInitializer.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/library/unit/UnitInitializer.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjuster.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronAdjuster.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjuster.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronAdjuster.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronSchedulerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronSchedulerImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronSchedulerImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronSchedulerImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/DelegatedSchedulerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/DelegatedSchedulerImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/DelegatedSchedulerImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/DelegatedSchedulerImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/PeriodicAdjuster.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicAdjuster.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/PeriodicAdjuster.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicAdjuster.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/PeriodicSchedulerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/PeriodicSchedulerImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/SchedulerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/SchedulerImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/scheduler/SchedulerImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/SchedulerImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/BundleResolverImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/BundleResolverImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/BundleResolverImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/BundleResolverImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/CommandDescriptionServiceImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/CommandDescriptionServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/CommandDescriptionServiceImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/CommandDescriptionServiceImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/ReadyServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/ReadyServiceImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/StateDescriptionServiceImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/StateDescriptionServiceImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/StateDescriptionServiceImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/StateDescriptionServiceImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/types/CommandDescriptionImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/CommandDescriptionImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/types/CommandDescriptionImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/CommandDescriptionImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/types/StateDescriptionFragmentImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/StateDescriptionFragmentImpl.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/types/StateDescriptionFragmentImpl.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/StateDescriptionFragmentImpl.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ActiveItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ActiveItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ActiveItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ActiveItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/GenericItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/GenericItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/GroupFunction.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupFunction.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/GroupFunction.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupFunction.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/GroupItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/GroupItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/Item.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/Item.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/Item.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/Item.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemBuilder.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilder.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemBuilder.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilder.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemBuilderFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilderFactory.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemBuilderFactory.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilderFactory.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemFactory.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemFactory.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemFactory.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemLookupException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemLookupException.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemLookupException.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemLookupException.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemNotFoundException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotFoundException.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemNotFoundException.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotFoundException.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemNotUniqueException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotUniqueException.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemNotUniqueException.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotUniqueException.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemPredicates.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemPredicates.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemPredicates.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemPredicates.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemRegistry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistry.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemRegistry.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistry.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemRegistryChangeListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistryChangeListener.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemRegistryChangeListener.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistryChangeListener.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemStateConverter.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemStateConverter.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemStateConverter.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemStateConverter.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemUtil.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemUtil.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ItemUtil.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemUtil.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ManagedItemProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedItemProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ManagedItemProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedItemProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ManagedMetadataProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedMetadataProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/ManagedMetadataProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedMetadataProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/Metadata.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/Metadata.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/Metadata.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/Metadata.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/MetadataKey.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataKey.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/MetadataKey.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataKey.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/MetadataPredicates.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataPredicates.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/MetadataPredicates.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataPredicates.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/MetadataProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/MetadataProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/MetadataRegistry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataRegistry.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/MetadataRegistry.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataRegistry.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/RegistryHook.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/RegistryHook.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/RegistryHook.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/RegistryHook.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/StateChangeListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/StateChangeListener.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/StateChangeListener.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/StateChangeListener.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/dto/GroupFunctionDTO.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupFunctionDTO.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/dto/GroupFunctionDTO.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupFunctionDTO.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/dto/GroupItemDTO.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupItemDTO.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/dto/GroupItemDTO.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupItemDTO.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/dto/ItemDTO.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTO.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/dto/ItemDTO.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTO.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/dto/ItemDTOMapper.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTOMapper.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/dto/ItemDTOMapper.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTOMapper.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/dto/MetadataDTO.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/MetadataDTO.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/dto/MetadataDTO.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/MetadataDTO.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/AbstractItemEventSubscriber.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriber.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/AbstractItemEventSubscriber.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriber.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/AbstractItemRegistryEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemRegistryEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/AbstractItemRegistryEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemRegistryEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/GroupItemStateChangedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/GroupItemStateChangedEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/GroupItemStateChangedEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/GroupItemStateChangedEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemAddedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemAddedEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemAddedEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemAddedEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemCommandEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemCommandEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemCommandEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemCommandEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemEventFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemEventFactory.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemEventFactory.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemEventFactory.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemRemovedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemRemovedEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemRemovedEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemRemovedEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemStateChangedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateChangedEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemStateChangedEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateChangedEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemStateEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemStateEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemStatePredictedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStatePredictedEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemStatePredictedEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStatePredictedEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemUpdatedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemUpdatedEvent.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/items/events/ItemUpdatedEvent.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemUpdatedEvent.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/CoreItemFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/CoreItemFactory.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/CoreItemFactory.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/CoreItemFactory.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/ArealDensity.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/ArealDensity.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/ArealDensity.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/ArealDensity.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/DataAmount.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataAmount.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/DataAmount.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataAmount.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/DataTransferRate.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataTransferRate.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/DataTransferRate.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataTransferRate.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/Density.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Density.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/Density.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Density.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/Intensity.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Intensity.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/Intensity.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Intensity.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/VolumetricFlowRate.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/VolumetricFlowRate.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/dimension/VolumetricFlowRate.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/VolumetricFlowRate.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/CallItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/CallItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/CallItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/CallItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/ColorItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ColorItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/ColorItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ColorItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/ContactItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ContactItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/ContactItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ContactItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/DateTimeItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DateTimeItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/DateTimeItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DateTimeItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/DimmerItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DimmerItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/DimmerItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DimmerItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/ImageItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ImageItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/ImageItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ImageItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/LocationItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/LocationItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/LocationItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/LocationItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/NumberItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/NumberItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/NumberItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/NumberItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/PlayerItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/PlayerItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/PlayerItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/PlayerItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/RollershutterItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/RollershutterItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/RollershutterItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/RollershutterItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/StringItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/StringItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/StringItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/StringItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/SwitchItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/SwitchItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/items/SwitchItem.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/SwitchItem.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/ArithmeticGroupFunction.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/ArithmeticGroupFunction.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/ArithmeticGroupFunction.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/ArithmeticGroupFunction.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeGroupFunction.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeGroupFunction.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeGroupFunction.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeGroupFunction.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/DecimalType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DecimalType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/DecimalType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DecimalType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/HSBType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/HSBType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/HSBType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/HSBType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/IncreaseDecreaseType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/IncreaseDecreaseType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/IncreaseDecreaseType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/IncreaseDecreaseType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/NextPreviousType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/NextPreviousType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/NextPreviousType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/NextPreviousType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/OnOffType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OnOffType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/OnOffType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OnOffType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/OpenClosedType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OpenClosedType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/OpenClosedType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OpenClosedType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/PercentType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PercentType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/PercentType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PercentType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/PlayPauseType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PlayPauseType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/PlayPauseType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PlayPauseType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/PointType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PointType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/PointType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PointType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/QuantityType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/QuantityType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/QuantityTypeArithmeticGroupFunction.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunction.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/QuantityTypeArithmeticGroupFunction.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunction.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/RawType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RawType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/RawType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RawType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/RewindFastforwardType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RewindFastforwardType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/RewindFastforwardType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RewindFastforwardType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/StopMoveType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StopMoveType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/StopMoveType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StopMoveType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/StringListType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringListType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/StringListType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringListType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/StringType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/StringType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/UpDownType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/UpDownType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/UpDownType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/UpDownType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/BinaryPrefix.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/BinaryPrefix.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/BinaryPrefix.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/BinaryPrefix.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/CustomUnits.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/CustomUnits.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/CustomUnits.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/CustomUnits.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/ImperialUnits.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/ImperialUnits.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/ImperialUnits.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/ImperialUnits.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/MetricPrefix.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/MetricPrefix.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/MetricPrefix.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/MetricPrefix.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/SIUnits.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SIUnits.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/SIUnits.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SIUnits.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/SmartHomeUnits.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SmartHomeUnits.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/unit/SmartHomeUnits.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SmartHomeUnits.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/net/CidrAddress.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/CidrAddress.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/net/CidrAddress.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/net/CidrAddress.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/net/HttpServiceUtil.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/HttpServiceUtil.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/net/HttpServiceUtil.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/net/HttpServiceUtil.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/net/NetUtil.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetUtil.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/net/NetUtil.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetUtil.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/net/NetworkAddressChangeListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressChangeListener.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/net/NetworkAddressChangeListener.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressChangeListener.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/net/NetworkAddressService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/net/NetworkAddressService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/CronJob.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronJob.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/CronJob.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronJob.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/CronScheduler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronScheduler.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/CronScheduler.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronScheduler.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/PeriodicScheduler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/PeriodicScheduler.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/PeriodicScheduler.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/PeriodicScheduler.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/ScheduledCompletableFuture.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/ScheduledCompletableFuture.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/ScheduledCompletableFuture.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/ScheduledCompletableFuture.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/Scheduler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/Scheduler.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/Scheduler.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/Scheduler.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/SchedulerRunnable.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerRunnable.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/SchedulerRunnable.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerRunnable.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/SchedulerTemporalAdjuster.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerTemporalAdjuster.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/scheduler/SchedulerTemporalAdjuster.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerTemporalAdjuster.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/AbstractWatchService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/AbstractWatchService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/AbstractWatchService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/service/AbstractWatchService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/CommandDescriptionService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/CommandDescriptionService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/CommandDescriptionService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/service/CommandDescriptionService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/ReadyMarker.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/ReadyMarker.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/ReadyMarkerFilter.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerFilter.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/ReadyMarkerFilter.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerFilter.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/ReadyMarkerUtils.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerUtils.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/ReadyMarkerUtils.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerUtils.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/ReadyService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/ReadyService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/StateDescriptionService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/StateDescriptionService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/StateDescriptionService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/service/StateDescriptionService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/WatchQueueReader.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/WatchQueueReader.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/service/WatchQueueReader.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/service/WatchQueueReader.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/storage/DeletableStorage.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorage.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/storage/DeletableStorage.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorage.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/storage/DeletableStorageService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorageService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/storage/DeletableStorageService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorageService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/storage/Storage.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/Storage.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/storage/Storage.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/storage/Storage.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/storage/StorageService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/StorageService.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/storage/StorageService.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/storage/StorageService.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/Command.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/Command.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/Command.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/Command.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/CommandDescription.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescription.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/CommandDescription.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescription.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/CommandDescriptionBuilder.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionBuilder.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/CommandDescriptionBuilder.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionBuilder.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/CommandDescriptionProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/CommandDescriptionProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/CommandOption.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandOption.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/CommandOption.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandOption.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/ComplexType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/ComplexType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/ComplexType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/ComplexType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/EventDescription.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventDescription.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/EventDescription.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventDescription.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/EventOption.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventOption.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/EventOption.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventOption.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/EventType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/EventType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/PrimitiveType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/PrimitiveType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/PrimitiveType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/PrimitiveType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/RefreshType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/RefreshType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/RefreshType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/RefreshType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/State.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/State.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/State.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/State.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateDescription.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescription.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateDescription.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescription.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionFragment.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragment.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionFragment.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragment.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionFragmentBuilder.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentBuilder.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionFragmentBuilder.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentBuilder.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionFragmentProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionFragmentProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionProvider.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionProvider.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionProvider.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateOption.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateOption.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/StateOption.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateOption.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/Type.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/Type.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/Type.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/Type.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/TypeParser.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/TypeParser.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/TypeParser.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/TypeParser.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/UnDefType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/UnDefType.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/UnDefType.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/UnDefType.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/util/UnitUtils.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/util/UnitUtils.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/types/util/UnitUtils.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/types/util/UnitUtils.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/util/BundleResolver.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/util/BundleResolver.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/util/BundleResolver.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/util/BundleResolver.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/util/HexUtils.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/util/HexUtils.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/util/HexUtils.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/util/HexUtils.java
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/util/UIDUtils.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/util/UIDUtils.java
similarity index 100%
rename from bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/util/UIDUtils.java
rename to bundles/org.openhab.core/src/main/java/org/openhab/core/util/UIDUtils.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/auth/client/oauth2/AccessTokenResponseTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/auth/client/oauth2/AccessTokenResponseTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/auth/client/oauth2/AccessTokenResponseTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/auth/client/oauth2/AccessTokenResponseTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/cache/ExpiringCacheMapTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheMapTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/cache/ExpiringCacheMapTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheMapTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/cache/ExpiringCacheTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/cache/ExpiringCacheTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/common/QueueingThreadPoolExecutorTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/QueueingThreadPoolExecutorTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/common/QueueingThreadPoolExecutorTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/common/QueueingThreadPoolExecutorTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/common/ThreadFactoryBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadFactoryBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/common/ThreadFactoryBuilderTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadFactoryBuilderTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/common/ThreadPoolManagerTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadPoolManagerTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/common/ThreadPoolManagerTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadPoolManagerTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/common/osgi/ResourceBundleClassLoaderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/common/osgi/ResourceBundleClassLoaderTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/i18n/I18nProviderImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/i18n/I18nProviderImplTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/i18n/I18nProviderImplTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/i18n/I18nProviderImplTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/items/ItemBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/items/ItemBuilderTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/items/ItemStateConverterImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemStateConverterImplTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/items/ItemStateConverterImplTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemStateConverterImplTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/items/ItemTagTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemTagTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/items/ItemTagTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemTagTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/items/MetadataRegistryImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/MetadataRegistryImplTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/items/MetadataRegistryImplTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/MetadataRegistryImplTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterMiscTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterMiscTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterMiscTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterMiscTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/CronSchedulerImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronSchedulerImplTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/CronSchedulerImplTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronSchedulerImplTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/DelegatedSchedulerTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/DelegatedSchedulerTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/DelegatedSchedulerTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/DelegatedSchedulerTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/PeriodicSchedulerImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImplTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/PeriodicSchedulerImplTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImplTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/SchedulerImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/SchedulerImplTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/scheduler/SchedulerImplTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/SchedulerImplTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/ReadyServiceImplTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImplTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/ReadyServiceImplTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/service/StateDescriptionServiceImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/service/StateDescriptionServiceImplTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/types/StateDescriptionFragmentImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/types/StateDescriptionFragmentImplTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/internal/types/StateDescriptionFragmentImplTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/internal/types/StateDescriptionFragmentImplTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/GenericItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/GenericItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/MetadataKeyTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/MetadataKeyTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/MetadataKeyTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/items/MetadataKeyTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/TestItem.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/TestItem.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/TestItem.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/items/TestItem.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/dto/ItemDTOMapperTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/dto/ItemDTOMapperTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/dto/ItemDTOMapperTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/items/dto/ItemDTOMapperTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/events/AbstractEventFactoryTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/AbstractEventFactoryTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/events/AbstractEventFactoryTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/AbstractEventFactoryTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/events/ItemEventFactoryTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/ItemEventFactoryTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/items/events/ItemEventFactoryTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/ItemEventFactoryTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/CoreItemFactoryTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/CoreItemFactoryTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/CoreItemFactoryTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/CoreItemFactoryTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/dimension/VolumetricFlowRateTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/dimension/VolumetricFlowRateTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/dimension/VolumetricFlowRateTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/dimension/VolumetricFlowRateTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/CallItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/CallItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/CallItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/CallItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/ColorItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ColorItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/ColorItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ColorItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/ContactItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ContactItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/ContactItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ContactItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/DateTimeItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DateTimeItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/DateTimeItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DateTimeItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/DimmerItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DimmerItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/DimmerItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DimmerItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/ImageItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ImageItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/ImageItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ImageItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/LocationItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/LocationItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/LocationItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/LocationItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/NumberItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/NumberItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/NumberItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/NumberItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/PlayerItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/PlayerItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/PlayerItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/PlayerItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/RollershutterItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/RollershutterItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/RollershutterItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/RollershutterItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/StateUtil.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StateUtil.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/StateUtil.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StateUtil.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/StringItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StringItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/StringItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StringItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/SwitchItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/SwitchItemTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/items/SwitchItemTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/SwitchItemTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/ArithmeticGroupFunctionTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/ArithmeticGroupFunctionTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/ArithmeticGroupFunctionTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/ArithmeticGroupFunctionTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/DateTimeGroupFunctionTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeGroupFunctionTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/DateTimeGroupFunctionTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeGroupFunctionTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/DateTimeTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/DateTimeTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/DecimalTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DecimalTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/DecimalTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DecimalTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/HSBTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/HSBTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/HSBTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/HSBTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/OnOffTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OnOffTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/OnOffTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OnOffTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/OpenClosedTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OpenClosedTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/OpenClosedTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OpenClosedTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/PercentTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PercentTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/PercentTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PercentTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/PointTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PointTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/PointTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PointTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/QuantityTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/QuantityTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/StringListTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringListTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/StringListTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringListTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/StringTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/StringTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/UpDownTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/UpDownTypeTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/types/UpDownTypeTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/UpDownTypeTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/unit/SmartHomeUnitsTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/SmartHomeUnitsTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/library/unit/SmartHomeUnitsTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/SmartHomeUnitsTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/net/HttpServiceUtilTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/net/HttpServiceUtilTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/net/HttpServiceUtilTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/net/HttpServiceUtilTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/net/NetUtilTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/net/NetUtilTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/net/NetUtilTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/net/NetUtilTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/types/CommandDescriptionBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/CommandDescriptionBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/types/CommandDescriptionBuilderTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/types/CommandDescriptionBuilderTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/types/StateDescriptionFragmentBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/StateDescriptionFragmentBuilderTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/types/StateDescriptionFragmentBuilderTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/types/StateDescriptionFragmentBuilderTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/types/util/UnitUtilsTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/util/UnitUtilsTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/types/util/UnitUtilsTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/types/util/UnitUtilsTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/util/HexUtilsTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/util/HexUtilsTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/util/HexUtilsTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/util/HexUtilsTest.java
diff --git a/bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/util/UIDUtilsTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/util/UIDUtilsTest.java
similarity index 100%
rename from bundles/org.openhab.core/src/test/java/org/eclipse/smarthome/core/util/UIDUtilsTest.java
rename to bundles/org.openhab.core/src/test/java/org/openhab/core/util/UIDUtilsTest.java
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AbstractTestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AbstractTestAgent.java
similarity index 100%
rename from itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AbstractTestAgent.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AbstractTestAgent.java
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java
similarity index 100%
rename from itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java
similarity index 100%
rename from itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/TestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/TestAgent.java
similarity index 100%
rename from itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/TestAgent.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/TestAgent.java
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/cipher/CipherTest.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/cipher/CipherTest.java
similarity index 100%
rename from itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/cipher/CipherTest.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/cipher/CipherTest.java
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java
similarity index 100%
rename from itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java
diff --git a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoI18nTest.java b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoI18nTest.java
similarity index 100%
rename from itests/org.openhab.core.binding.xml.tests/src/main/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoI18nTest.java
rename to itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoI18nTest.java
diff --git a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoTest.java b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoTest.java
similarity index 100%
rename from itests/org.openhab.core.binding.xml.tests/src/main/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoTest.java
rename to itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoTest.java
diff --git a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/eclipse/smarthome/core/binding/xml/test/BindingInstaller.java b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInstaller.java
similarity index 100%
rename from itests/org.openhab.core.binding.xml.tests/src/main/java/org/eclipse/smarthome/core/binding/xml/test/BindingInstaller.java
rename to itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInstaller.java
diff --git a/itests/org.openhab.core.config.core.tests/src/main/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java b/itests/org.openhab.core.config.core.tests/src/main/java/org/openhab/core/config/core/ConfigOptionRegistryOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/main/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java
rename to itests/org.openhab.core.config.core.tests/src/main/java/org/openhab/core/config/core/ConfigOptionRegistryOSGiTest.java
diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/src/main/java/org/eclipse/smarthome/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java b/itests/org.openhab.core.config.discovery.mdns.tests/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.mdns.tests/src/main/java/org/eclipse/smarthome/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java
rename to itests/org.openhab.core.config.discovery.mdns.tests/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceMock.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMock.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.tests/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceMock.java
rename to itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMock.java
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceMockOfBridge.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMockOfBridge.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.tests/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceMockOfBridge.java
rename to itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMockOfBridge.java
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceRegistryOSGiTest.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.tests/src/main/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceRegistryOSGiTest.java
rename to itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/eclipse/smarthome/config/discovery/inbox/DynamicThingUpdateOSGiTest.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/inbox/DynamicThingUpdateOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.tests/src/main/java/org/eclipse/smarthome/config/discovery/inbox/DynamicThingUpdateOSGiTest.java
rename to itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/inbox/DynamicThingUpdateOSGiTest.java
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/eclipse/smarthome/config/discovery/internal/InboxOSGiTest.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.tests/src/main/java/org/eclipse/smarthome/config/discovery/internal/InboxOSGiTest.java
rename to itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
rename to itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
rename to itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
rename to itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/testutil/UsbSerialDeviceInformationGenerator.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/testutil/UsbSerialDeviceInformationGenerator.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/testutil/UsbSerialDeviceInformationGenerator.java
rename to itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/testutil/UsbSerialDeviceInformationGenerator.java
diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java b/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
rename to itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java b/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java
similarity index 100%
rename from itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/eclipse/smarthome/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java
rename to itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java
diff --git a/itests/org.openhab.core.config.dispatch.tests/src/main/java/org/eclipse/smarthome/config/dispatch/internal/ConfigDispatcherOSGiTest.java b/itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.config.dispatch.tests/src/main/java/org/eclipse/smarthome/config/dispatch/internal/ConfigDispatcherOSGiTest.java
rename to itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java
diff --git a/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/BindingInstaller.java b/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/BindingInstaller.java
similarity index 100%
rename from itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/BindingInstaller.java
rename to itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/BindingInstaller.java
diff --git a/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionI18nTest.java b/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionI18nTest.java
similarity index 100%
rename from itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionI18nTest.java
rename to itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionI18nTest.java
diff --git a/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionsTest.java b/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionsTest.java
similarity index 100%
rename from itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionsTest.java
rename to itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionsTest.java
diff --git a/itests/org.openhab.core.ephemeris.tests/src/main/java/org/eclipse/smarthome/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java b/itests/org.openhab.core.ephemeris.tests/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.ephemeris.tests/src/main/java/org/eclipse/smarthome/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java
rename to itests/org.openhab.core.ephemeris.tests/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/internal/discovery/InboxResourceOSGITest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResourceOSGITest.java
similarity index 100%
rename from itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/internal/discovery/InboxResourceOSGITest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResourceOSGITest.java
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/internal/item/ItemResourceOSGiTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/internal/item/ItemResourceOSGiTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/internal/persistence/PersistenceResourceTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResourceTest.java
similarity index 100%
rename from itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/internal/persistence/PersistenceResourceTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResourceTest.java
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/internal/profile/ProfileTypeResourceTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResourceTest.java
similarity index 100%
rename from itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/internal/profile/ProfileTypeResourceTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResourceTest.java
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/internal/service/ConfigurableServiceResourceOSGiTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResourceOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/internal/service/ConfigurableServiceResourceOSGiTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResourceOSGiTest.java
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/item/EnrichedItemDTOMapperWithTransformOSGiTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperWithTransformOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.io.rest.core.tests/src/main/java/org/eclipse/smarthome/io/rest/core/item/EnrichedItemDTOMapperWithTransformOSGiTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperWithTransformOSGiTest.java
diff --git a/itests/org.openhab.core.model.core.tests/src/main/java/org/eclipse/smarthome/model/core/internal/folder/FolderObserverTest.java b/itests/org.openhab.core.model.core.tests/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserverTest.java
similarity index 100%
rename from itests/org.openhab.core.model.core.tests/src/main/java/org/eclipse/smarthome/model/core/internal/folder/FolderObserverTest.java
rename to itests/org.openhab.core.model.core.tests/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserverTest.java
diff --git a/itests/org.openhab.core.model.item.tests/src/main/java/org/eclipse/smarthome/model/item/internal/GenericItemProviderTest.java b/itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericItemProviderTest.java
similarity index 100%
rename from itests/org.openhab.core.model.item.tests/src/main/java/org/eclipse/smarthome/model/item/internal/GenericItemProviderTest.java
rename to itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericItemProviderTest.java
diff --git a/itests/org.openhab.core.model.item.tests/src/main/java/org/eclipse/smarthome/model/item/internal/GenericMetadataProviderTest.java b/itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericMetadataProviderTest.java
similarity index 100%
rename from itests/org.openhab.core.model.item.tests/src/main/java/org/eclipse/smarthome/model/item/internal/GenericMetadataProviderTest.java
rename to itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericMetadataProviderTest.java
diff --git a/itests/org.openhab.core.model.persistence.tests/src/main/java/org/eclipse/smarthome/model/persistence/extensions/PersistenceExtensionsTest.java b/itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/extensions/PersistenceExtensionsTest.java
similarity index 100%
rename from itests/org.openhab.core.model.persistence.tests/src/main/java/org/eclipse/smarthome/model/persistence/extensions/PersistenceExtensionsTest.java
rename to itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/extensions/PersistenceExtensionsTest.java
diff --git a/itests/org.openhab.core.model.persistence.tests/src/main/java/org/eclipse/smarthome/model/persistence/tests/TestPersistenceService.java b/itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/tests/TestPersistenceService.java
similarity index 100%
rename from itests/org.openhab.core.model.persistence.tests/src/main/java/org/eclipse/smarthome/model/persistence/tests/TestPersistenceService.java
rename to itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/tests/TestPersistenceService.java
diff --git a/itests/org.openhab.core.model.rule.tests/src/main/java/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleExecutionTest.java b/itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleExecutionTest.java
similarity index 100%
rename from itests/org.openhab.core.model.rule.tests/src/main/java/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleExecutionTest.java
rename to itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleExecutionTest.java
diff --git a/itests/org.openhab.core.model.rule.tests/src/main/java/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleTriggerTest.java b/itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerTest.java
similarity index 100%
rename from itests/org.openhab.core.model.rule.tests/src/main/java/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleTriggerTest.java
rename to itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerTest.java
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/actions/ScriptExecutionTest.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/actions/ScriptExecutionTest.java
similarity index 100%
rename from itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/actions/ScriptExecutionTest.java
rename to itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/actions/ScriptExecutionTest.java
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/engine/ScriptEngineOSGiTest.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/engine/ScriptEngineOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/engine/ScriptEngineOSGiTest.java
rename to itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/engine/ScriptEngineOSGiTest.java
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/lib/NumberExtensionsTest.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/lib/NumberExtensionsTest.java
similarity index 100%
rename from itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/lib/NumberExtensionsTest.java
rename to itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/lib/NumberExtensionsTest.java
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/scheduler/test/AbstractScheduler.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/AbstractScheduler.java
similarity index 100%
rename from itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/scheduler/test/AbstractScheduler.java
rename to itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/AbstractScheduler.java
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/scheduler/test/MockClosure.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockClosure.java
similarity index 100%
rename from itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/scheduler/test/MockClosure.java
rename to itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockClosure.java
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/scheduler/test/MockScheduler.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockScheduler.java
similarity index 100%
rename from itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/scheduler/test/MockScheduler.java
rename to itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockScheduler.java
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/tests/lib/NumberExtensionsTest.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/tests/lib/NumberExtensionsTest.java
similarity index 100%
rename from itests/org.openhab.core.model.script.tests/src/main/java/org/eclipse/smarthome/model/script/tests/lib/NumberExtensionsTest.java
rename to itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/tests/lib/NumberExtensionsTest.java
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/GenericItemChannelLinkProviderJavaTest.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/GenericItemChannelLinkProviderJavaTest.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/GenericItemChannelLinkProviderJavaTest.java
rename to itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/GenericItemChannelLinkProviderJavaTest.java
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/hue/GenericItemChannelLinkProviderTest.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericItemChannelLinkProviderTest.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/hue/GenericItemChannelLinkProviderTest.java
rename to itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericItemChannelLinkProviderTest.java
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest.java
rename to itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest.java
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest2.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest2.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest2.java
rename to itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest2.java
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest3.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest3.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest3.java
rename to itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest3.java
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest4.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.tests/src/main/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest4.java
rename to itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/DumbThingHandlerFactory.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingHandlerFactory.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/DumbThingHandlerFactory.java
rename to itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingHandlerFactory.java
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/DumbThingTypeProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingTypeProvider.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/DumbThingTypeProvider.java
rename to itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingTypeProvider.java
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/TestHueChannelTypeProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueChannelTypeProvider.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/TestHueChannelTypeProvider.java
rename to itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueChannelTypeProvider.java
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/TestHueConfigDescriptionProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueConfigDescriptionProvider.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/TestHueConfigDescriptionProvider.java
rename to itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueConfigDescriptionProvider.java
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/TestHueThingHandlerFactory.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactory.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/TestHueThingHandlerFactory.java
rename to itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactory.java
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/TestHueThingHandlerFactoryX.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactoryX.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/TestHueThingHandlerFactoryX.java
rename to itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactoryX.java
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/TestHueThingTypeProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingTypeProvider.java
similarity index 100%
rename from itests/org.openhab.core.model.thing.testsupport/src/main/java/org/eclipse/smarthome/model/thing/testsupport/hue/TestHueThingTypeProvider.java
rename to itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingTypeProvider.java
diff --git a/itests/org.openhab.core.storage.json.tests/src/main/java/org/eclipse/smarthome/storage/json/internal/JsonStorageServiceOSGiTest.java b/itests/org.openhab.core.storage.json.tests/src/main/java/org/openhab/core/storage/json/internal/JsonStorageServiceOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.storage.json.tests/src/main/java/org/eclipse/smarthome/storage/json/internal/JsonStorageServiceOSGiTest.java
rename to itests/org.openhab.core.storage.json.tests/src/main/java/org/openhab/core/storage/json/internal/JsonStorageServiceOSGiTest.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheAsyncTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/cache/ExpiringCacheAsyncTest.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheAsyncTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/cache/ExpiringCacheAsyncTest.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/common/SafeCallerImplTest.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/common/SafeCallerImplTest.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/events/OSGiEventManagerOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/events/OSGiEventManagerOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/events/OSGiEventManagerOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/events/OSGiEventManagerOSGiTest.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/i18n/TranslationProviderOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/i18n/TranslationProviderOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/i18n/TranslationProviderOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/i18n/TranslationProviderOSGiTest.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemUpdaterOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/items/ItemUpdaterOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemUpdaterOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/items/ItemUpdaterOSGiTest.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/GroupItemOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/GroupItemOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/GroupItemOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/GroupItemOSGiTest.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ItemRegistryImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ItemRegistryImplTest.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ItemRegistryImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ItemRegistryImplTest.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ManagedItemProviderOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ManagedItemProviderOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ManagedItemProviderOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ManagedItemProviderOSGiTest.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/TestItem.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/TestItem.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/TestItem.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/TestItem.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/events/AbstractItemEventSubscriberOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriberOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/events/AbstractItemEventSubscriberOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriberOSGiTest.java
diff --git a/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/service/AbstractWatchServiceTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/service/AbstractWatchServiceTest.java
similarity index 100%
rename from itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/service/AbstractWatchServiceTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/openhab/core/service/AbstractWatchServiceTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/SystemWideChannelTypesTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/SystemWideChannelTypesTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/ThingPropertiesTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/ThingPropertiesTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/events/ThingEventFactoryTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/events/ThingEventFactoryTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/factory/ManagedThingProviderOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/factory/ManagedThingProviderOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/Constants.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/Constants.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/Constants.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/Constants.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/SimpleThingTypeProvider.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/SimpleThingTypeProvider.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingLinkManagerOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingLinkManagerOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactoryOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactoryOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/ItemChannelLinkOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/ItemChannelLinkOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/LinkEventOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/LinkEventOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/profiles/i18n/SystemProfileI18nOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/profiles/i18n/SystemProfileI18nOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/profiles/i18n/SystemProfileI18nOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/profiles/i18n/SystemProfileI18nOSGiTest.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/testutil/i18n/DefaultLocaleSetter.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/testutil/i18n/DefaultLocaleSetter.java
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelStateDescriptionProviderOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/type/ChannelStateDescriptionProviderOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelStateDescriptionProviderOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/type/ChannelStateDescriptionProviderOSGiTest.java
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesI18nTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesI18nTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesI18nTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesI18nTest.java
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesTest.java
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/ConfigDescriptionsTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ConfigDescriptionsTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/ConfigDescriptionsTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ConfigDescriptionsTest.java
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/LoadedTestBundle.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/LoadedTestBundle.java
similarity index 100%
rename from itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/LoadedTestBundle.java
rename to itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/LoadedTestBundle.java
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/SystemWideChannelTypesTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemWideChannelTypesTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/SystemWideChannelTypesTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemWideChannelTypesTest.java
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypeI18nTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypeI18nTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypeI18nTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypeI18nTest.java
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypesTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypesTest.java
similarity index 100%
rename from itests/org.openhab.core.thing.xml.tests/src/main/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypesTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypesTest.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/AudioManagerStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioManagerStub.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/AudioManagerStub.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioManagerStub.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/AudioSourceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioSourceStub.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/AudioSourceStub.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioSourceStub.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/ConsoleStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/ConsoleStub.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/ConsoleStub.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/ConsoleStub.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/HumanLanguageInterpreterStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/HumanLanguageInterpreterStub.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/HumanLanguageInterpreterStub.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/HumanLanguageInterpreterStub.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/KSServiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/KSServiceStub.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/KSServiceStub.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/KSServiceStub.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/STTServiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/STTServiceStub.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/STTServiceStub.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/STTServiceStub.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/SinkStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/SinkStub.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/SinkStub.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/SinkStub.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/TTSServiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/TTSServiceStub.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/TTSServiceStub.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/TTSServiceStub.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/VoiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/VoiceStub.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/internal/VoiceStub.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/VoiceStub.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/javavoicemanager/VoiceManagerTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/javavoicemanager/VoiceManagerTest.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/javavoicemanager/VoiceManagerTest.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/javavoicemanager/VoiceManagerTest.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/InterpretCommandTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/InterpretCommandTest.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/InterpretCommandTest.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/InterpretCommandTest.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/SayCommandTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/SayCommandTest.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoicesCommandTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoicesCommandTest.java
similarity index 100%
rename from itests/org.openhab.core.voice.tests/src/main/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoicesCommandTest.java
rename to itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoicesCommandTest.java

From 1966a72b6d0b7497be9429988af0491a18f08478 Mon Sep 17 00:00:00 2001
From: Christoph Weitkamp <github@christophweitkamp.de>
Date: Fri, 27 Dec 2019 11:10:17 +0100
Subject: [PATCH 2/3] Renamed packages

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
---
 .../openhab/core/audio/AudioException.java    |   2 +-
 .../org/openhab/core/audio/AudioFormat.java   |   2 +-
 .../openhab/core/audio/AudioHTTPServer.java   |   4 +-
 .../org/openhab/core/audio/AudioManager.java  |   4 +-
 .../org/openhab/core/audio/AudioSink.java     |   4 +-
 .../org/openhab/core/audio/AudioSource.java   |   2 +-
 .../org/openhab/core/audio/AudioStream.java   |   2 +-
 .../core/audio/ByteArrayAudioStream.java      |   2 +-
 .../openhab/core/audio/FileAudioStream.java   |   4 +-
 .../core/audio/FixedLengthAudioStream.java    |   2 +-
 .../openhab/core/audio/URLAudioStream.java    |   4 +-
 .../UnsupportedAudioFormatException.java      |   2 +-
 .../UnsupportedAudioStreamException.java      |   2 +-
 .../AudioConsoleCommandExtension.java         |  20 +--
 .../core/audio/internal/AudioManagerImpl.java |  34 ++---
 .../core/audio/internal/AudioServlet.java     |  14 +-
 .../core/audio/utils/AudioStreamUtils.java    |   2 +-
 .../internal/AbstractAudioServletTest.java    |  16 +--
 .../core/audio/internal/AudioConsoleTest.java |  22 +--
 .../core/audio/internal/AudioFormatTest.java  |   4 +-
 .../internal/AudioManagerServletTest.java     |  12 +-
 .../core/audio/internal/AudioManagerTest.java |  24 ++--
 .../core/audio/internal/AudioServletTest.java |  10 +-
 .../audio/internal/fake/AudioSinkFake.java    |  18 +--
 .../utils/BundledSoundFileHandler.java        |   6 +-
 .../internal/JaasAuthenticationProvider.java  |  14 +-
 .../auth/oauth2client/internal/Keyword.java   |   2 +-
 .../internal/OAuthClientServiceImpl.java      |  22 +--
 .../oauth2client/internal/OAuthConnector.java |  14 +-
 .../internal/OAuthFactoryImpl.java            |  10 +-
 .../internal/OAuthStoreHandler.java           |   4 +-
 .../internal/OAuthStoreHandlerImpl.java       |  14 +-
 .../internal/PersistedParams.java             |   2 +-
 .../internal/StorageRecordType.java           |   2 +-
 .../internal/cipher/SymmetricKeyCipher.java   |   4 +-
 .../internal/MediaActionTypeProvider.java     |  16 +--
 .../internal/MediaModuleHandlerFactory.java   |   4 +-
 .../internal/MediaScriptScopeProvider.java    |   4 +-
 .../media/internal/PlayActionHandler.java     |   4 +-
 .../media/internal/SayActionHandler.java      |   2 +-
 .../internal/RuleSupportScriptExtension.java  |   4 +-
 .../ScriptedCustomModuleTypeProvider.java     |   2 +-
 .../internal/loader/ScriptFileWatcher.java    |   4 +-
 .../RuleSupportRuleRegistryDelegate.java      |   2 +-
 .../shared/ScriptedAutomationManager.java     |   2 +-
 .../shared/ScriptedRuleProvider.java          |   2 +-
 .../rulesupport/shared/simple/SimpleRule.java |   4 +-
 .../DefaultScriptScopeProvider.java           |  60 ++++----
 .../defaultscope/ItemRegistryDelegate.java    |   8 +-
 .../internal/defaultscope/ScriptBusEvent.java |  18 +--
 .../defaultscope/ScriptThingActions.java      |  12 +-
 .../handler/AbstractScriptModuleHandler.java  |   2 +-
 .../provider/ScriptModuleTypeProvider.java    |  10 +-
 .../rest/internal/ModuleTypeResource.java     |   4 +-
 .../rest/internal/RuleResource.java           |   8 +-
 .../rest/internal/TemplateResource.java       |   4 +-
 bundles/org.openhab.core.automation/README.md |   4 +-
 .../org/openhab/core/automation/Action.java   |   2 +-
 .../openhab/core/automation/Condition.java    |   2 +-
 .../core/automation/ManagedRuleProvider.java  |   4 +-
 .../org/openhab/core/automation/Module.java   |   4 +-
 .../automation/ModuleHandlerCallback.java     |   2 +-
 .../org/openhab/core/automation/Rule.java     |   6 +-
 .../openhab/core/automation/RuleManager.java  |   2 +-
 .../openhab/core/automation/RuleProvider.java |   2 +-
 .../openhab/core/automation/RuleRegistry.java |   2 +-
 .../org/openhab/core/automation/Trigger.java  |   2 +-
 .../core/automation/dto/ActionDTOMapper.java  |   2 +-
 .../automation/dto/ActionTypeDTOMapper.java   |   2 +-
 .../automation/dto/ConditionDTOMapper.java    |   2 +-
 .../dto/ConditionTypeDTOMapper.java           |   2 +-
 .../core/automation/dto/ModuleTypeDTO.java    |   2 +-
 .../automation/dto/ModuleTypeDTOMapper.java   |   2 +-
 .../openhab/core/automation/dto/RuleDTO.java  |   2 +-
 .../core/automation/dto/RuleDTOMapper.java    |   4 +-
 .../core/automation/dto/RuleTemplateDTO.java  |   2 +-
 .../automation/dto/RuleTemplateDTOMapper.java |   2 +-
 .../core/automation/dto/TriggerDTOMapper.java |   2 +-
 .../automation/dto/TriggerTypeDTOMapper.java  |   2 +-
 .../events/AbstractRuleRegistryEvent.java     |   2 +-
 .../events/RuleStatusInfoEvent.java           |   2 +-
 .../core/automation/internal/ActionImpl.java  |   2 +-
 .../core/automation/internal/Automation.ucls  |  16 +--
 .../automation/internal/ConditionImpl.java    |   2 +-
 .../core/automation/internal/ModuleImpl.java  |   4 +-
 .../automation/internal/RuleEngineImpl.java   |  10 +-
 .../automation/internal/RuleEventFactory.java |   6 +-
 .../core/automation/internal/RuleImpl.java    |   4 +-
 .../automation/internal/RuleRegistryImpl.java |  22 +--
 .../core/automation/internal/TriggerImpl.java |   2 +-
 .../commands/AbstractCommandProvider.java     |   2 +-
 .../commands/AutomationCommandsPluggable.java |   4 +-
 .../CommandlineModuleTypeProvider.java        |   2 +-
 .../commands/CommandlineTemplateProvider.java |   2 +-
 .../automation/internal/commands/Printer.java |   6 +-
 .../CompositeModuleHandlerFactory.java        |   2 +-
 .../factory/CoreModuleHandlerFactory.java     |   4 +-
 .../EphemerisModuleHandlerFactory.java        |   2 +-
 .../handler/ChannelEventTriggerHandler.java   |   8 +-
 .../handler/CompareConditionHandler.java      |   4 +-
 .../handler/EphemerisConditionHandler.java    |   4 +-
 .../handler/GenericCronTriggerHandler.java    |   6 +-
 .../handler/GenericEventConditionHandler.java |   2 +-
 .../handler/GenericEventTriggerHandler.java   |   6 +-
 .../handler/ItemCommandActionHandler.java     |  16 +--
 .../handler/ItemCommandTriggerHandler.java    |  10 +-
 .../handler/ItemStateConditionHandler.java    |  12 +-
 .../handler/ItemStateTriggerHandler.java      |  14 +-
 .../handler/RuleEnablementActionHandler.java  |   2 +-
 .../module/handler/RunRuleActionHandler.java  |   2 +-
 .../handler/ThingStatusTriggerHandler.java    |  12 +-
 .../handler/TimeOfDayConditionHandler.java    |   2 +-
 .../handler/TimeOfDayTriggerHandler.java      |   6 +-
 .../handler/TimerModuleHandlerFactory.java    |   2 +-
 .../AnnotatedActionModuleTypeProvider.java    |   4 +-
 .../parser/gson/AbstractGSONParser.java       |   6 +-
 .../AbstractResourceBundleProvider.java       |   8 +-
 .../AutomationResourceBundlesTracker.java     |   2 +-
 .../ModuleTypeResourceBundleProvider.java     |   4 +-
 .../TemplateResourceBundleProvider.java       |  10 +-
 .../provider/file/AbstractFileProvider.java   |   6 +-
 .../provider/file/AutomationWatchService.java |   2 +-
 .../provider/i18n/ModuleI18nUtil.java         |   4 +-
 .../i18n/ModuleTypeI18nServiceImpl.java       |   8 +-
 .../provider/i18n/ModuleTypeI18nUtil.java     |   4 +-
 .../provider/i18n/RuleTemplateI18nUtil.java   |   4 +-
 .../template/RuleTemplateRegistry.java        |   4 +-
 .../internal/type/ModuleTypeRegistryImpl.java |   4 +-
 .../AnnotationActionModuleTypeHelper.java     |  10 +-
 .../automation/template/RuleTemplate.java     |   2 +-
 .../template/RuleTemplateProvider.java        |   4 +-
 .../core/automation/template/Template.java    |   2 +-
 .../automation/template/TemplateProvider.java |   2 +-
 .../automation/template/TemplateRegistry.java |   2 +-
 ...nnotatedThingActionModuleTypeProvider.java |   8 +-
 .../core/automation/type/ActionType.java      |   2 +-
 .../automation/type/CompositeActionType.java  |   2 +-
 .../type/CompositeConditionType.java          |   2 +-
 .../automation/type/CompositeTriggerType.java |   2 +-
 .../core/automation/type/ConditionType.java   |   2 +-
 .../core/automation/type/ModuleType.java      |   4 +-
 .../automation/type/ModuleTypeProvider.java   |   2 +-
 .../automation/type/ModuleTypeRegistry.java   |   2 +-
 .../core/automation/type/TriggerType.java     |   2 +-
 .../util/ConfigurationNormalizer.java         |   6 +-
 .../core/automation/util/ModuleBuilder.java   |   2 +-
 .../automation/util/ReferenceResolver.java    |   2 +-
 .../core/automation/util/RuleBuilder.java     |   4 +-
 .../moduletypes/ChannelTrigger.json           |   2 +-
 .../moduletypes/GenericConditions.json        |   2 +-
 .../moduletypes/GenericTriggers.json          |   2 +-
 .../automation/moduletypes/ItemTriggers.json  |   6 +-
 .../automation/moduletypes/ThingTriggers.json |  10 +-
 ...nnotationActionModuleTypeProviderTest.java |   8 +-
 .../util/ReferenceResolverUtilTest.java       |   2 +-
 .../xml/internal/BindingInfoConverter.java    |  12 +-
 .../xml/internal/BindingInfoReader.java       |  30 ++--
 .../xml/internal/BindingInfoXmlProvider.java  |  12 +-
 .../xml/internal/BindingInfoXmlResult.java    |   8 +-
 .../BindingXmlConfigDescriptionProvider.java  |  10 +-
 .../xml/internal/XmlBindingInfoProvider.java  |  26 ++--
 .../main/java/org/openhab/core/OpenHAB.java   |   2 +-
 .../openhab/core/internal/CoreActivator.java  |   2 +-
 .../internal/item/DefaultSitemapProvider.java |  24 ++--
 .../core/config/core/ConfigConstants.java     |   2 +-
 .../core/config/core/ConfigDescription.java   |   4 +-
 .../core/ConfigDescriptionAliasProvider.java  |   2 +-
 .../config/core/ConfigDescriptionBuilder.java |   2 +-
 .../core/ConfigDescriptionParameter.java      |   4 +-
 .../ConfigDescriptionParameterBuilder.java    |   4 +-
 .../core/ConfigDescriptionParameterGroup.java |   2 +-
 .../core/ConfigDescriptionProvider.java       |   2 +-
 .../core/ConfigDescriptionRegistry.java       |   2 +-
 .../config/core/ConfigOptionProvider.java     |   2 +-
 .../openhab/core/config/core/ConfigUtil.java  |  10 +-
 .../core/config/core/ConfigurableService.java |   2 +-
 .../core/config/core/Configuration.java       |   6 +-
 .../core/ConfigurationDeserializer.java       |   2 +-
 .../config/core/ConfigurationSerializer.java  |   2 +-
 .../core/config/core/FilterCriteria.java      |   2 +-
 .../core/config/core/ParameterOption.java     |   2 +-
 .../config/core/dto/ConfigDescriptionDTO.java |   4 +-
 .../core/dto/ConfigDescriptionDTOMapper.java  |  14 +-
 .../dto/ConfigDescriptionParameterDTO.java    |   4 +-
 .../ConfigDescriptionParameterGroupDTO.java   |   2 +-
 .../config/core/dto/FilterCriteriaDTO.java    |   2 +-
 .../config/core/dto/ParameterOptionDTO.java   |   2 +-
 .../i18n/ConfigI18nLocalizationService.java   |  18 +--
 .../config/core/internal/ConfigMapper.java    |   2 +-
 .../i18n/ConfigDescriptionGroupI18nUtil.java  |   6 +-
 .../i18n/ConfigDescriptionI18nUtil.java       |   6 +-
 .../i18n/I18nConfigOptionsProvider.java       |   6 +-
 ...MetadataConfigDescriptionProviderImpl.java |  16 +--
 .../net/NetworkConfigOptionProvider.java      |  10 +-
 .../normalization/AbstractNormalizer.java     |   2 +-
 .../normalization/BooleanNormalizer.java      |   4 +-
 .../normalization/DecimalNormalizer.java      |   4 +-
 .../internal/normalization/IntNormalizer.java |   4 +-
 .../normalization/ListNormalizer.java         |   2 +-
 .../internal/normalization/Normalizer.java    |   4 +-
 .../normalization/NormalizerFactory.java      |   6 +-
 .../normalization/TextNormalizer.java         |   4 +-
 .../ConfigDescriptionParameterValidator.java  |   6 +-
 ...gDescriptionParameterValidatorFactory.java |   2 +-
 .../ConfigDescriptionValidatorImpl.java       |  18 +--
 .../core/internal/validation/MessageKey.java  |   2 +-
 .../internal/validation/MinMaxValidator.java  |  12 +-
 .../internal/validation/PatternValidator.java |   8 +-
 .../validation/RequiredValidator.java         |   6 +-
 .../validation/TypeIntrospections.java        |   4 +-
 .../internal/validation/TypeValidator.java    |  10 +-
 .../MetadataConfigDescriptionProvider.java    |   6 +-
 .../core/status/ConfigStatusCallback.java     |   2 +-
 .../config/core/status/ConfigStatusInfo.java  |   4 +-
 .../core/status/ConfigStatusMessage.java      |   2 +-
 .../core/status/ConfigStatusProvider.java     |   4 +-
 .../core/status/ConfigStatusService.java      |  14 +-
 .../core/status/ConfigStatusSource.java       |   2 +-
 .../events/ConfigStatusEventFactory.java      |  10 +-
 .../status/events/ConfigStatusInfoEvent.java  |   6 +-
 .../ConfigDescriptionValidator.java           |   6 +-
 .../validation/ConfigValidationException.java |   8 +-
 .../validation/ConfigValidationMessage.java   |   6 +-
 .../core/ConfigDescriptionBuilderTest.java    |   4 +-
 ...ConfigDescriptionParameterBuilderTest.java |   4 +-
 .../core/ConfigDescriptionRegistryTest.java   |   4 +-
 .../core/config/core/ConfigUtilTest.java      |   4 +-
 .../core/config/core/ConfigurationTest.java   |   2 +-
 .../i18n/I18nConfigOptionsProviderTest.java   |   4 +-
 ...dataConfigDescriptionProviderImplTest.java |  18 +--
 .../normalization/NormalizerTest.java         |   6 +-
 .../ConfigDescriptionValidatorTest.java       |  18 +--
 .../ConfigValidationExceptionTest.java        |   8 +-
 .../core/status/ConfigStatusInfoTest.java     |   4 +-
 .../core/status/ConfigStatusServiceTest.java  |  14 +-
 .../mdns/MDNSDiscoveryParticipant.java        |  10 +-
 .../mdns/internal/MDNSDiscoveryService.java   |  38 +++---
 .../upnp/UpnpDiscoveryParticipant.java        |   8 +-
 .../upnp/internal/UpnpDiscoveryService.java   |  32 ++---
 .../internal/DeltaUsbSerialScanner.java       |   4 +-
 .../internal/PollingUsbSerialScanner.java     |  12 +-
 .../internal/SysfsUsbSerialScanner.java       |   4 +-
 .../linuxsysfs/internal/UsbSerialScanner.java |   4 +-
 .../usbserial/UsbSerialDeviceInformation.java |   2 +-
 .../usbserial/UsbSerialDiscovery.java         |   4 +-
 .../usbserial/UsbSerialDiscoveryListener.java |   2 +-
 .../UsbSerialDiscoveryParticipant.java        |  10 +-
 .../internal/UsbSerialDiscoveryService.java   |  22 +--
 .../discovery/AbstractDiscoveryService.java   |  16 +--
 .../config/discovery/DiscoveryListener.java   |   6 +-
 .../config/discovery/DiscoveryResult.java     |   8 +-
 .../discovery/DiscoveryResultBuilder.java     |   8 +-
 .../config/discovery/DiscoveryResultFlag.java |   2 +-
 .../config/discovery/DiscoveryService.java    |   4 +-
 .../discovery/DiscoveryServiceCallback.java   |   8 +-
 .../discovery/DiscoveryServiceRegistry.java   |   4 +-
 .../discovery/ExtendedDiscoveryService.java   |   2 +-
 .../core/config/discovery/ScanListener.java   |   2 +-
 .../discovery/UpnpDiscoveryParticipant.java   |   8 +-
 .../discovery/dto/DiscoveryResultDTO.java     |   4 +-
 .../dto/DiscoveryResultDTOMapper.java         |  10 +-
 .../core/config/discovery/inbox/Inbox.java    |  14 +-
 .../inbox/InboxAutoApprovePredicate.java      |   6 +-
 .../discovery/inbox/InboxFilterCriteria.java  |  10 +-
 .../config/discovery/inbox/InboxListener.java |   4 +-
 .../discovery/inbox/InboxPredicates.java      |  10 +-
 .../inbox/events/AbstractInboxEvent.java      |   8 +-
 .../inbox/events/InboxAddedEvent.java         |   4 +-
 .../inbox/events/InboxEventFactory.java       |  14 +-
 .../inbox/events/InboxRemovedEvent.java       |   4 +-
 .../inbox/events/InboxUpdatedEvent.java       |   4 +-
 .../internal/AutomaticInboxProcessor.java     |  42 +++---
 .../internal/DiscoveryResultImpl.java         |  10 +-
 .../DiscoveryServiceRegistryImpl.java         |  22 +--
 .../discovery/internal/PersistentInbox.java   |  62 ++++-----
 .../DiscoveryConsoleCommandExtension.java     |  14 +-
 .../console/InboxConsoleCommandExtension.java |  22 +--
 .../discovery/inbox/InboxPredicatesTest.java  |  14 +-
 .../inbox/events/InboxEventFactoryTest.java   |  14 +-
 .../internal/AutomaticInboxProcessorTest.java |  46 +++----
 .../internal/DiscoveryResultImplTest.java     |  10 +-
 .../internal/PersistentInboxTest.java         |  50 +++----
 .../dispatch/internal/ConfigDispatcher.java   |  10 +-
 .../internal/ConfigDispatcherFileWatcher.java |   6 +-
 .../ConfigDispatcherFileWatcherTest.java      |   2 +-
 .../internal/SerialConfigOptionProvider.java  |   8 +-
 .../config/xml/AbstractXmlBasedProvider.java  |   6 +-
 .../AbstractXmlConfigDescriptionProvider.java |   8 +-
 .../xml/ConfigDescriptionConverter.java       |  16 +--
 .../ConfigDescriptionParameterConverter.java  |  20 +--
 ...figDescriptionParameterGroupConverter.java |   8 +-
 .../ConfigXmlConfigDescriptionProvider.java   |  24 ++--
 .../config/xml/FilterCriteriaConverter.java   |   6 +-
 .../xml/internal/ConfigDescriptionReader.java |  32 ++---
 .../ConfigDescriptionXmlProvider.java         |  10 +-
 .../xml/osgi/XmlDocumentBundleTracker.java    |  12 +-
 .../config/xml/osgi/XmlDocumentProvider.java  |   4 +-
 .../xml/osgi/XmlDocumentProviderFactory.java  |   2 +-
 .../config/xml/util/ConverterAssertion.java   |   2 +-
 .../util/ConverterAttributeMapValidator.java  |   2 +-
 .../config/xml/util/ConverterValueMap.java    |   2 +-
 .../config/xml/util/GenericUnmarshaller.java  |   2 +-
 .../core/config/xml/util/NodeAttributes.java  |   2 +-
 .../xml/util/NodeAttributesConverter.java     |   2 +-
 .../core/config/xml/util/NodeIterator.java    |   2 +-
 .../core/config/xml/util/NodeList.java        |   2 +-
 .../config/xml/util/NodeListConverter.java    |   2 +-
 .../core/config/xml/util/NodeName.java        |   2 +-
 .../core/config/xml/util/NodeValue.java       |   2 +-
 .../config/xml/util/NodeValueConverter.java   |   2 +-
 .../config/xml/util/XmlDocumentReader.java    |   2 +-
 .../core/ephemeris/EphemerisManager.java      |   2 +-
 .../internal/EphemerisManagerImpl.java        |  12 +-
 .../internal/SampleExtensionService.java      |  14 +-
 .../org/openhab/core/id/InstanceUUID.java     |   4 +-
 .../core/id/internal/UUIDResource.java        |   8 +-
 .../java/org/openhab/core/id/UUIDTest.java    |   4 +-
 .../openhab/core/io/bin2json/Bin2Json.java    |   2 +-
 .../internal/ConsoleSupportEclipse.java       |   8 +-
 .../console/eclipse/internal/OSGiConsole.java |   4 +-
 .../karaf/internal/CommandWrapper.java        |   8 +-
 .../karaf/internal/ConsoleSupportKaraf.java   |   4 +-
 .../console/karaf/internal/OSGiConsole.java   |   4 +-
 .../rfc147/internal/CommandWrapper.java       |   6 +-
 .../internal/ConsoleCommandsContainer.java    |   4 +-
 .../rfc147/internal/ConsoleSupportRfc147.java |   6 +-
 .../console/rfc147/internal/OSGiConsole.java  |   4 +-
 .../HelpConsoleCommandExtension.java          |  12 +-
 .../org/openhab/core/io/console/Console.java  |   2 +-
 .../core/io/console/ConsoleInterpreter.java   |   4 +-
 .../AbstractConsoleCommandExtension.java      |   4 +-
 .../extensions/ConsoleCommandExtension.java   |   4 +-
 .../ItemConsoleCommandExtension.java          |  16 +--
 .../MetadataConsoleCommandExtension.java      |  18 +--
 .../SendConsoleCommandExtension.java          |  24 ++--
 .../StatusConsoleCommandExtension.java        |  16 +--
 .../UpdateConsoleCommandExtension.java        |  24 ++--
 .../basic/internal/BasicChallengeHandler.java |   8 +-
 .../internal/BasicCredentialsExtractor.java   |   8 +-
 .../io/http/auth/CredentialsExtractor.java    |   4 +-
 .../auth/internal/AuthenticationHandler.java  |  20 +--
 .../http/auth/internal/RedirectHandler.java   |  10 +-
 .../org/openhab/core/io/http/Handler.java     |   2 +-
 .../openhab/core/io/http/HandlerContext.java  |   2 +-
 .../core/io/http/HandlerPriorities.java       |   2 +-
 .../io/http/HttpContextFactoryService.java    |   2 +-
 .../core/io/http/WrappingHttpContext.java     |   2 +-
 .../io/http/internal/BundleHttpContext.java   |   2 +-
 .../core/io/http/internal/CatchHandler.java   |   6 +-
 .../http/internal/DefaultHandlerContext.java  |   6 +-
 .../http/internal/DelegatingHttpContext.java  |   2 +-
 .../HttpContextFactoryServiceImpl.java        |   6 +-
 .../http/internal/SmartHomeHttpContext.java   |   6 +-
 .../io/http/servlet/BaseSmartHomeServlet.java |   2 +-
 .../http/servlet/SmartHomeBundleServlet.java  |   4 +-
 .../io/http/servlet/SmartHomeServlet.java     |   2 +-
 .../HttpContextFactoryServiceImplTest.java    |   4 +-
 .../core/io/monitor/internal/EventLogger.java |   8 +-
 .../openhab/core/io/net/exec/ExecUtil.java    |   2 +-
 .../io/net/http/ExtensibleTrustManager.java   |   2 +-
 .../core/io/net/http/HttpClientFactory.java   |   2 +-
 .../HttpClientInitializationException.java    |   2 +-
 .../core/io/net/http/HttpRequestBuilder.java  |   2 +-
 .../openhab/core/io/net/http/HttpUtil.java    |   4 +-
 .../io/net/http/TlsCertificateProvider.java   |   2 +-
 .../openhab/core/io/net/http/TlsProvider.java |   2 +-
 .../io/net/http/TlsTrustManagerProvider.java  |   2 +-
 .../io/net/http/TrustAllTrustMananger.java    |   2 +-
 .../io/net/http/TrustManagerProvider.java     |   2 +-
 .../core/io/net/http/WebSocketFactory.java    |   2 +-
 .../internal/ExtensibleTrustManagerImpl.java  |   8 +-
 .../TlsCertificateTrustManagerAdapter.java    |   6 +-
 .../net/http/internal/TrustManagerUtil.java   |   2 +-
 .../http/internal/WebClientFactoryImpl.java   |  14 +-
 .../core/io/net/http/BaseHttpUtilTest.java    |   2 +-
 .../io/net/http/HttpRequestBuilderTest.java   |   2 +-
 .../core/io/net/http/HttpUtilTest.java        |   2 +-
 .../ExtensibleTrustManagerImplTest.java       |   4 +-
 .../internal/WebClientFactoryImplTest.java    |   4 +-
 .../io/rest/audio/internal/AudioMapper.java   |   6 +-
 .../io/rest/audio/internal/AudioResource.java |  16 +--
 .../io/rest/audio/internal/AudioSinkDTO.java  |   4 +-
 .../rest/audio/internal/AudioSourceDTO.java   |   4 +-
 .../internal/SmartHomeRestServletConfig.java  |   2 +-
 bundles/org.openhab.core.io.rest.core/bnd.bnd |   2 +-
 .../core/config/ConfigurationService.java     |   6 +-
 .../EnrichedConfigDescriptionDTOMapper.java   |  14 +-
 ...EnrichedConfigDescriptionParameterDTO.java |  10 +-
 .../io/rest/core/internal/GsonProvider.java   |   2 +-
 .../rest/core/internal/RESTCoreActivator.java |   4 +-
 .../internal/binding/BindingResource.java     |  26 ++--
 .../internal/channel/ChannelTypeResource.java |  38 +++---
 .../config/ConfigDescriptionResource.java     |  20 +--
 .../internal/discovery/DiscoveryResource.java |  10 +-
 .../internal/discovery/InboxResource.java     |  22 +--
 .../extensions/ExtensionResource.java         |  26 ++--
 .../rest/core/internal/item/ItemResource.java |  64 ++++-----
 .../item/MetadataSelectorMatcher.java         |  10 +-
 .../link/ItemChannelLinkResource.java         |  24 ++--
 .../persistence/PersistenceResource.java      |  46 +++----
 .../internal/profile/ProfileTypeResource.java |  30 ++--
 .../service/ConfigurableServiceResource.java  |  24 ++--
 .../core/internal/thing/ThingResource.java    |  96 ++++++-------
 .../internal/thing/ThingTypeResource.java     |  52 +++----
 .../rest/core/item/EnrichedGroupItemDTO.java  |  10 +-
 .../io/rest/core/item/EnrichedItemDTO.java    |   8 +-
 .../rest/core/item/EnrichedItemDTOMapper.java |  22 +--
 .../core/persistence/ItemHistoryListDTO.java  |   4 +-
 .../core/service/ConfigurableServiceDTO.java  |   2 +-
 .../rest/core/thing/EnrichedChannelDTO.java   |   4 +-
 .../io/rest/core/thing/EnrichedThingDTO.java  |  10 +-
 .../core/thing/EnrichedThingDTOMapper.java    |  14 +-
 ...nrichedConfigDescriptionDTOMapperTest.java |  14 +-
 .../channel/ChannelTypeResourceTest.java      |  18 +--
 .../item/MetadataSelectorMatcherTest.java     |  10 +-
 .../core/item/EnrichedItemDTOMapperTest.java  |  10 +-
 .../thing/EnrichedThingDTOMapperTest.java     |  20 +--
 .../io/rest/log/internal/LogConstants.java    |   2 +-
 .../core/io/rest/log/internal/LogHandler.java |   4 +-
 .../io/rest/mdns/internal/MDNSAnnouncer.java  |  14 +-
 .../org.openhab.core.io.rest.optimize/bnd.bnd |   2 +-
 .../io/rest/optimize/internal/Activator.java  |   2 +-
 .../optimize/internal/ResourceFilterImpl.java |  16 +--
 .../sitemap/SitemapSubscriptionService.java   |  34 ++---
 .../io/rest/sitemap/internal/MappingDTO.java  |   2 +-
 .../sitemap/internal/PageChangeListener.java  |  34 ++---
 .../io/rest/sitemap/internal/PageDTO.java     |   2 +-
 .../sitemap/internal/ServerAliveEvent.java    |   2 +-
 .../sitemap/internal/SitemapChangedEvent.java |   2 +-
 .../io/rest/sitemap/internal/SitemapDTO.java  |   2 +-
 .../rest/sitemap/internal/SitemapEvent.java   |   2 +-
 .../sitemap/internal/SitemapEventOutput.java  |   4 +-
 .../sitemap/internal/SitemapResource.java     |  68 +++++-----
 .../sitemap/internal/SitemapWidgetEvent.java  |   4 +-
 .../io/rest/sitemap/internal/WidgetDTO.java   |   4 +-
 .../sitemap/internal/SitemapResourceTest.java |  36 ++---
 bundles/org.openhab.core.io.rest.sse/bnd.bnd  |   2 +-
 .../openhab/core/io/rest/sse/SseResource.java |  10 +-
 .../core/io/rest/sse/beans/EventBean.java     |   2 +-
 .../io/rest/sse/internal/SseActivator.java    |   2 +-
 .../io/rest/sse/internal/SseEventOutput.java  |   6 +-
 .../listeners/SseEventSubscriber.java         |  10 +-
 .../io/rest/sse/internal/util/SseUtil.java    |   6 +-
 .../rest/sse/internal/util/SseUtilTest.java   |   2 +-
 .../io/rest/voice/internal/HLIMapper.java     |   4 +-
 .../internal/HumanLanguageInterpreterDTO.java |   4 +-
 .../core/io/rest/voice/internal/VoiceDTO.java |   4 +-
 .../io/rest/voice/internal/VoiceMapper.java   |   4 +-
 .../io/rest/voice/internal/VoiceResource.java |  18 +--
 .../org/openhab/core/io/rest/DTOMapper.java   |   2 +-
 .../openhab/core/io/rest/JSONResponse.java    |   4 +-
 .../openhab/core/io/rest/LocaleService.java   |   2 +-
 .../core/io/rest/LocaleServiceImpl.java       |   4 +-
 .../openhab/core/io/rest/RESTConstants.java   |   2 +-
 .../openhab/core/io/rest/RESTResource.java    |   2 +-
 .../core/io/rest/Stream2JSONInputStream.java  |   4 +-
 .../core/io/rest/internal/Constants.java      |   2 +-
 .../core/io/rest/internal/DTOMapperImpl.java  |   4 +-
 .../io/rest/internal/filter/CorsFilter.java   |   6 +-
 .../io/rest/internal/filter/ProxyFilter.java  |   4 +-
 .../filter/SatisfiableResourceFilter.java     |   4 +-
 .../rest/internal/resources/RootResource.java |  12 +-
 .../internal/resources/beans/RootBean.java    |   2 +-
 .../core/io/rest/JSONResponseTest.java        |   2 +-
 .../io/rest/Stream2JSONInputStreamTest.java   |   2 +-
 .../rest/internal/filter/CorsFilterTest.java  |   4 +-
 .../rest/internal/filter/ProxyFilterTest.java |   4 +-
 .../filter/SatisfiableResourceFilterTest.java |   4 +-
 .../bnd.bnd                                   |   2 +-
 .../core/io/transport/mdns/MDNSClient.java    |   2 +-
 .../core/io/transport/mdns/MDNSService.java   |   2 +-
 .../io/transport/mdns/ServiceDescription.java |   2 +-
 .../discovery/MDNSDiscoveryParticipant.java   |  10 +-
 .../mdns/internal/MDNSActivator.java          |   2 +-
 .../mdns/internal/MDNSClientImpl.java         |  12 +-
 .../mdns/internal/MDNSServiceImpl.java        |   8 +-
 .../io/transport/mqtt/MqttActionCallback.java |   2 +-
 .../transport/mqtt/MqttBrokerConnection.java  |  22 +--
 .../mqtt/MqttBrokerConnectionConfig.java      |   2 +-
 .../mqtt/MqttConnectionObserver.java          |   2 +-
 .../transport/mqtt/MqttConnectionState.java   |   2 +-
 .../core/io/transport/mqtt/MqttException.java |   2 +-
 .../transport/mqtt/MqttMessageSubscriber.java |   2 +-
 .../core/io/transport/mqtt/MqttService.java   |   4 +-
 .../transport/mqtt/MqttServiceObserver.java   |   2 +-
 .../transport/mqtt/MqttWillAndTestament.java  |   2 +-
 .../mqtt/internal/ClientCallback.java         |  14 +-
 .../MqttBrokerConnectionServiceInstance.java  |  14 +-
 ...BrokerConnectionServiceInstanceMarker.java |   6 +-
 .../mqtt/internal/MqttServiceImpl.java        |  18 +--
 .../mqtt/internal/TopicSubscribers.java       |   4 +-
 .../client/Mqtt3AsyncClientWrapper.java       |  10 +-
 .../client/Mqtt5AsyncClientWrapper.java       |  10 +-
 .../client/MqttAsyncClientWrapper.java        |   6 +-
 .../reconnect/AbstractReconnectStrategy.java  |   6 +-
 .../reconnect/PeriodicReconnectStrategy.java  |   4 +-
 .../mqtt/ssl/CustomTrustManagerFactory.java   |   4 +-
 .../AcceptAllCertificatesSSLContext.java      |   2 +-
 .../sslcontext/CustomSSLContextProvider.java  |   2 +-
 .../mqtt/sslcontext/SSLContextProvider.java   |   4 +-
 .../mqtt/MqttBrokerConnectionEx.java          |   4 +-
 .../mqtt/MqttBrokerConnectionTests.java       |  10 +-
 .../mqtt/internal/MqttServiceTests.java       |  10 +-
 .../mqtt/internal/TopicSubscriberTests.java   |   2 +-
 .../serial/internal/JavaCommPortProvider.java |  10 +-
 .../serial/internal/SerialPortEventImpl.java  |   4 +-
 .../internal/SerialPortIdentifierImpl.java    |   8 +-
 .../serial/internal/SerialPortImpl.java       |   8 +-
 .../rfc2217/internal/RFC2217PortProvider.java |  10 +-
 .../internal/SerialPortIdentifierImpl.java    |  10 +-
 .../serial/internal/RxTxPortProvider.java     |  10 +-
 .../serial/internal/SerialPortEventImpl.java  |   4 +-
 .../internal/SerialPortIdentifierImpl.java    |  10 +-
 .../serial/internal/SerialPortUtil.java       |   2 +-
 .../transport/serial/rxtx/RxTxSerialPort.java |  10 +-
 .../transport/serial/PortInUseException.java  |   2 +-
 .../io/transport/serial/ProtocolType.java     |   2 +-
 .../core/io/transport/serial/SerialPort.java  |   2 +-
 .../io/transport/serial/SerialPortEvent.java  |   2 +-
 .../serial/SerialPortEventListener.java       |   2 +-
 .../serial/SerialPortIdentifier.java          |   2 +-
 .../transport/serial/SerialPortManager.java   |   2 +-
 .../transport/serial/SerialPortProvider.java  |   2 +-
 .../UnsupportedCommOperationException.java    |   2 +-
 .../internal/SerialPortManagerImpl.java       |   8 +-
 .../serial/internal/SerialPortRegistry.java   |   6 +-
 .../console/SerialCommandExtension.java       |  14 +-
 .../io/transport/upnp/UpnpIOParticipant.java  |   2 +-
 .../core/io/transport/upnp/UpnpIOService.java |   2 +-
 .../upnp/internal/UpnpIOServiceImpl.java      |   8 +-
 .../upnp/internal/UpnpIOServiceTest.java      |   4 +-
 .../core/karaf/internal/FeatureInstaller.java |  10 +-
 .../karaf/internal/KarafExtensionService.java |   6 +-
 .../1 Generate Items Model.launch             |   8 +-
 .../2 Generate Sitemap Model.launch           |   8 +-
 .../3 Generate Script Model.launch            |   8 +-
 .../4 Generate Rule Model.launch              |   8 +-
 .../5 Generate Persistence Model.launch       |   8 +-
 .../6 Generate Thing Model.launch             |  10 +-
 bundles/org.openhab.core.model.core/bnd.bnd   |   2 +-
 .../openhab/core/model/core/EventType.java    |   2 +-
 .../core/model/core/ModelCoreConstants.java   |   4 +-
 .../openhab/core/model/core/ModelParser.java  |   2 +-
 .../core/model/core/ModelRepository.java      |   2 +-
 .../core/ModelRepositoryChangeListener.java   |   2 +-
 .../org/openhab/core/model/core/SafeEMF.java  |   2 +-
 .../core/internal/ModelCoreActivator.java     |   2 +-
 .../core/internal/ModelRepositoryImpl.java    |  10 +-
 .../core/model/core/internal/SafeEMFImpl.java |   4 +-
 .../core/internal/folder/FolderObserver.java  |  12 +-
 .../model/core/internal/util/MathUtils.java   |   2 +-
 .../ValueTypeToStringConverter.java           |   2 +-
 .../core/model/ide/ItemsIdeModule.xtend       |   2 +-
 .../core/model/ide/ItemsIdeSetup.xtend        |   6 +-
 .../internal/ItemRuntimeActivator.java        |   6 +-
 bundles/org.openhab.core.model.item/bnd.bnd   |  50 +++----
 .../org.openhab.core.model.item/plugin.xml    |   4 +-
 .../plugin.xml_gen                            |   4 +-
 bundles/org.openhab.core.model.item/pom.xml   |   2 +-
 .../org/openhab/core/model/GenerateItems.mwe2 |   4 +-
 .../src/org/openhab/core/model/Items.xtext    |   4 +-
 .../core/model/ItemsRuntimeModule.xtend       |   4 +-
 .../core/model/ItemsStandaloneSetup.xtend     |   4 +-
 .../model/formatting/ItemsFormatter.xtend     |   4 +-
 .../core/model/generator/ItemsGenerator.xtend |   2 +-
 .../valueconverter/ItemValueConverters.java   |   4 +-
 .../item/BindingConfigParseException.java     |   2 +-
 .../core/model/item/BindingConfigReader.java  |   6 +-
 .../item/internal/GenericItemProvider.java    |  52 +++----
 .../internal/GenericMetadataProvider.java     |  12 +-
 .../model/scoping/ItemsScopeProvider.xtend    |   2 +-
 .../serializer/ItemsSemanticSequencer.xtend   |   2 +-
 .../serializer/ItemsSyntacticSequencer.xtend  |   2 +-
 .../model/validation/ItemsValidator.xtend     |   8 +-
 .../core/model/lazygen/GlobalResourceSet.java |   2 +-
 .../core/model/lazygen/LazyGenerator.java     |   2 +-
 .../model/lazygen/LazyLanguageConfig.java     |   2 +-
 .../model/lazygen/LazyStandaloneSetup.java    |   2 +-
 .../lsp/internal/MappingUriExtensions.java    |   2 +-
 .../core/model/lsp/internal/ModelServer.java  |  12 +-
 .../model/lsp/internal/RegistryProvider.java  |  18 +--
 .../lsp/internal/RuntimeServerModule.java     |   8 +-
 .../internal/MappingUriExtensionsTest.java    |   2 +-
 .../ide/PersistenceIdeModule.xtend            |   2 +-
 .../persistence/ide/PersistenceIdeSetup.xtend |   6 +-
 .../internal/PersistenceRuntimeActivator.java |   6 +-
 .../bnd.bnd                                   |  46 +++----
 .../plugin.xml                                |   4 +-
 .../pom.xml                                   |   2 +-
 .../persistence/GeneratePersistence.mwe2      |   4 +-
 .../core/model/persistence/Persistence.xtext  |   4 +-
 .../PersistenceRuntimeModule.xtend            |   4 +-
 .../PersistenceStandaloneSetup.xtend          |   4 +-
 .../extensions/PersistenceExtensions.java     |  22 +--
 .../formatting/PersistenceFormatter.xtend     |   4 +-
 .../generator/PersistenceGenerator.xtend      |   2 +-
 .../internal/PersistenceModelManager.java     |  46 +++----
 .../persistence/scoping/GlobalStrategies.java |   6 +-
 .../PersistenceGlobalScopeProvider.java       |   6 +-
 .../scoping/PersistenceScopeProvider.xtend    |   2 +-
 .../PersistenceSemanticSequencer.xtend        |   2 +-
 .../PersistenceSyntacticSequencer.xtend       |   2 +-
 .../validation/PersistenceValidator.xtend     |   2 +-
 .../core/model/rule/ide/RulesIdeModule.xtend  |   4 +-
 .../core/model/rule/ide/RulesIdeSetup.xtend   |   8 +-
 .../core/model/rule/runtime/RuleEngine.java   |   2 +-
 .../internal/RuleRuntimeActivator.java        |  10 +-
 .../internal/engine/ExecuteRuleJob.java       |  14 +-
 .../internal/engine/GuiceAwareJobFactory.java |   2 +-
 .../internal/engine/RuleContextHelper.java    |  12 +-
 .../internal/engine/RuleEngineImpl.java       |  62 ++++-----
 .../engine/RuleEvaluationContext.java         |   2 +-
 .../internal/engine/RuleTriggerManager.java   |  46 +++----
 bundles/org.openhab.core.model.rule/bnd.bnd   |  58 ++++----
 .../org.openhab.core.model.rule/plugin.xml    |   4 +-
 bundles/org.openhab.core.model.rule/pom.xml   |   2 +-
 .../core/model/rule/GenerateRules.mwe2        |   4 +-
 .../org/openhab/core/model/rule/Rules.xtext   |   4 +-
 .../core/model/rule/RulesRuntimeModule.xtend  |  14 +-
 .../model/rule/RulesStandaloneSetup.xtend     |  12 +-
 .../rule/formatting/RulesFormatter.xtend      |   4 +-
 .../rule/jvmmodel/RulesItemRefresher.java     |  12 +-
 .../rule/jvmmodel/RulesJvmModelInferrer.xtend |  40 +++---
 .../model/rule/jvmmodel/RulesRefresher.java   |   6 +-
 .../rule/jvmmodel/RulesThingRefresher.java    |  12 +-
 .../scoping/RulesImplicitlyImportedTypes.java |   4 +-
 .../rule/scoping/RulesScopeProvider.xtend     |   2 +-
 .../serializer/RulesSemanticSequencer.xtend   |   2 +-
 .../serializer/RulesSyntacticSequencer.xtend  |   2 +-
 .../rule/validation/RulesValidator.xtend      |   2 +-
 .../model/script/ide/ScriptIdeModule.xtend    |   4 +-
 .../model/script/ide/ScriptIdeSetup.xtend     |   8 +-
 .../model/script/runtime/ScriptRuntime.java   |   2 +-
 .../internal/engine/ScriptEngineImpl.java     |  18 +--
 .../runtime/internal/engine/ScriptImpl.java   |   6 +-
 bundles/org.openhab.core.model.script/bnd.bnd |  82 +++++------
 .../org.openhab.core.model.script/plugin.xml  |   4 +-
 bundles/org.openhab.core.model.script/pom.xml |   2 +-
 .../core/model/script/GenerateScript.mwe2     |   4 +-
 ...ptimizingFeatureScopeTrackerProvider2.java |   2 +-
 .../openhab/core/model/script/Script.xtext    |   4 +-
 .../model/script/ScriptRuntimeModule.xtend    |  16 +--
 .../core/model/script/ScriptServiceUtil.java  |  16 +--
 .../model/script/ScriptStandaloneSetup.xtend  |   6 +-
 .../core/model/script/ServiceModule.java      |  22 +--
 .../core/model/script/actions/Audio.java      |  12 +-
 .../core/model/script/actions/BusEvent.java   |  22 +--
 .../core/model/script/actions/Ephemeris.java  |   6 +-
 .../core/model/script/actions/Exec.java       |   4 +-
 .../core/model/script/actions/HTTP.java       |   4 +-
 .../core/model/script/actions/LogAction.java  |  20 +--
 .../core/model/script/actions/Ping.java       |   2 +-
 .../model/script/actions/ScriptExecution.java |  16 +--
 .../core/model/script/actions/Things.java     |   8 +-
 .../core/model/script/actions/Timer.java      |   2 +-
 .../core/model/script/actions/Voice.java      |  12 +-
 .../script/engine/IActionServiceProvider.java |   4 +-
 .../script/engine/IThingActionsProvider.java  |   4 +-
 .../core/model/script/engine/Script.java      |   2 +-
 .../model/script/engine/ScriptEngine.java     |   2 +-
 .../core/model/script/engine/ScriptError.java |   2 +-
 .../model/script/engine/ScriptException.java  |   2 +-
 .../engine/ScriptExecutionException.java      |   2 +-
 .../script/engine/ScriptParsingException.java |   2 +-
 .../model/script/engine/action/ActionDoc.java |   2 +-
 .../script/engine/action/ActionService.java   |   2 +-
 .../model/script/engine/action/ParamDoc.java  |   2 +-
 .../ScriptEngineConsoleCommandExtension.java  |  16 +--
 .../script/formatting/ScriptFormatter.xtend   |   4 +-
 .../RuleHumanLanguageInterpreter.java         |  22 +--
 .../internal/ScriptEncodingProvider.java      |   2 +-
 .../internal/actions/TimerExecutionJob.java   |   2 +-
 .../script/internal/actions/TimerImpl.java    |   4 +-
 .../ServiceTrackerActionServiceProvider.xtend |   6 +-
 .../ServiceTrackerThingActionsProvider.xtend  |   6 +-
 .../engine/action/AudioActionService.java     |   8 +-
 .../engine/action/EphemerisActionService.java |   8 +-
 .../action/PersistenceActionService.java      |   6 +-
 .../engine/action/ThingActionService.java     |  20 +--
 .../action/TransformationActionService.java   |   6 +-
 .../engine/action/VoiceActionService.java     |   8 +-
 .../interpreter/ScriptInterpreter.xtend       |  22 +--
 .../script/jvmmodel/ScriptItemRefresher.java  |  12 +-
 .../jvmmodel/ScriptJvmModelInferrer.xtend     |   8 +-
 .../script/jvmmodel/ScriptTypeComputer.java   |  10 +-
 .../model/script/lib/NumberExtensions.java    |  10 +-
 .../script/scoping/ActionClassLoader.java     |   8 +-
 .../ScriptImplicitlyImportedTypes.java        |  42 +++---
 ...ptImportSectionNamespaceScopeProvider.java |   2 +-
 .../script/scoping/ScriptScopeProvider.xtend  |   2 +-
 .../scoping/StateAndCommandProvider.java      |  28 ++--
 .../serializer/ScriptSemanticSequencer.xtend  |   2 +-
 .../serializer/ScriptSyntacticSequencer.xtend |   2 +-
 .../script/validation/ScriptValidator.xtend   |   2 +-
 .../model/sitemap/ide/SitemapIdeModule.xtend  |   2 +-
 .../model/sitemap/ide/SitemapIdeSetup.xtend   |   6 +-
 .../bnd.bnd                                   |   2 +-
 .../internal/SitemapRuntimeActivator.java     |   6 +-
 .../org.openhab.core.model.sitemap/bnd.bnd    |  28 ++--
 .../org.openhab.core.model.sitemap/plugin.xml |   4 +-
 .../org.openhab.core.model.sitemap/pom.xml    |   2 +-
 .../core/model/sitemap/GenerateSitemap.mwe2   |   4 +-
 .../core/model/sitemap/Sitemap.properties     |   2 +-
 .../openhab/core/model/sitemap/Sitemap.xtext  |   4 +-
 .../core/model/sitemap/SitemapProvider.java   |   6 +-
 .../model/sitemap/SitemapRuntimeModule.xtend  |   6 +-
 .../sitemap/SitemapStandaloneSetup.xtend      |   4 +-
 .../sitemap/formatting/SitemapFormatter.xtend |   4 +-
 .../sitemap/generator/SitemapGenerator.xtend  |   2 +-
 .../sitemap/internal/SitemapProviderImpl.java |  12 +-
 .../scoping/SitemapScopeProvider.xtend        |   2 +-
 .../serializer/SitemapSemanticSequencer.xtend |   2 +-
 .../SitemapSyntacticSequencer.xtend           |   2 +-
 .../sitemap/validation/SitemapValidator.xtend |  14 +-
 .../valueconverter/SitemapConverters.java     |   2 +-
 .../core/model/thing/ide/ThingIdeModule.xtend |   2 +-
 .../core/model/thing/ide/ThingIdeSetup.xtend  |   6 +-
 .../internal/ThingRuntimeActivator.java       |   6 +-
 bundles/org.openhab.core.model.thing/bnd.bnd  |  56 ++++----
 .../org.openhab.core.model.thing/plugin.xml   |   4 +-
 .../plugin.xml_gen                            |   4 +-
 bundles/org.openhab.core.model.thing/pom.xml  |   2 +-
 ...nericThingProviderMultipleBundlesTest.java |  28 ++--
 .../core/model/thing/GenerateThing.mwe2       |   4 +-
 .../org/openhab/core/model/thing/Thing.xtext  |   4 +-
 .../core/model/thing/ThingRuntimeModule.xtend |   8 +-
 .../model/thing/ThingStandaloneSetup.xtend    |   4 +-
 .../thing/formatting/ThingFormatter.xtend     |   4 +-
 .../thing/generator/ThingGenerator.xtend      |   2 +-
 .../GenericItemChannelLinkProvider.java       |  16 +--
 .../thing/internal/GenericThingProvider.xtend |  76 +++++------
 .../thing/scoping/ThingScopeProvider.xtend    |   2 +-
 .../serializer/ThingSemanticSequencer.xtend   |   2 +-
 .../serializer/ThingSyntacticSequencer.xtend  |   2 +-
 .../ThingSyntacticSequencerExtension.java     |   2 +-
 .../thing/validation/ThingValidator.xtend     |   8 +-
 .../valueconverter/ThingValueConverters.java  |   4 +-
 .../valueconverter/UIDtoStringConverter.java  |   4 +-
 .../core/persistence/FilterCriteria.java      |   4 +-
 .../core/persistence/HistoricItem.java        |   6 +-
 .../ModifiablePersistenceService.java         |   6 +-
 .../core/persistence/PersistenceItemInfo.java |   2 +-
 .../core/persistence/PersistenceManager.java  |   2 +-
 .../core/persistence/PersistenceService.java  |   4 +-
 .../PersistenceServiceConfiguration.java      |   4 +-
 .../PersistenceServiceRegistry.java           |   2 +-
 .../QueryablePersistenceService.java          |   4 +-
 .../core/persistence/SimpleFilter.java        |   2 +-
 .../persistence/SimpleItemConfiguration.java  |   6 +-
 .../persistence/config/SimpleAllConfig.java   |   2 +-
 .../core/persistence/config/SimpleConfig.java |   2 +-
 .../persistence/config/SimpleGroupConfig.java |   2 +-
 .../persistence/config/SimpleItemConfig.java  |   2 +-
 .../core/persistence/dto/ItemHistoryDTO.java  |   4 +-
 .../dto/PersistenceServiceDTO.java            |   2 +-
 .../persistence/internal/PersistItemsJob.java |  14 +-
 .../internal/PersistenceManagerImpl.java      |  52 +++----
 .../PersistenceServiceRegistryImpl.java       |  16 +--
 .../strategy/SimpleCronStrategy.java          |   2 +-
 .../persistence/strategy/SimpleStrategy.java  |   2 +-
 bundles/org.openhab.core.scheduler/bnd.bnd    |   2 +-
 .../internal/SchedulerActivator.java          |   2 +-
 .../model/generateTagClasses.groovy           |  32 ++---
 .../openhab/core/semantics/SemanticTags.java  |  24 ++--
 .../core/semantics/SemanticsPredicates.java   |  14 +-
 .../core/semantics/SemanticsService.java      |   6 +-
 .../internal/SemanticsMetadataProvider.java   |  32 ++---
 .../internal/SemanticsServiceImpl.java        |  30 ++--
 .../core/semantics/model/Equipment.java       |   2 +-
 .../core/semantics/model/Location.java        |   2 +-
 .../openhab/core/semantics/model/Point.java   |   2 +-
 .../core/semantics/model/Property.java        |   2 +-
 .../org/openhab/core/semantics/model/Tag.java |   2 +-
 .../openhab/core/semantics/model/TagInfo.java |   2 +-
 .../semantics/model/equipment/Battery.java    |   6 +-
 .../semantics/model/equipment/Blinds.java     |   6 +-
 .../semantics/model/equipment/Camera.java     |   6 +-
 .../core/semantics/model/equipment/Car.java   |   6 +-
 .../model/equipment/CleaningRobot.java        |   6 +-
 .../core/semantics/model/equipment/Door.java  |   6 +-
 .../semantics/model/equipment/Equipments.java |   4 +-
 .../semantics/model/equipment/FrontDoor.java  |   4 +-
 .../semantics/model/equipment/GarageDoor.java |   4 +-
 .../core/semantics/model/equipment/HVAC.java  |   6 +-
 .../semantics/model/equipment/Inverter.java   |   6 +-
 .../semantics/model/equipment/LawnMower.java  |   6 +-
 .../semantics/model/equipment/Lightbulb.java  |   6 +-
 .../core/semantics/model/equipment/Lock.java  |   6 +-
 .../model/equipment/MotionDetector.java       |   6 +-
 .../model/equipment/NetworkAppliance.java     |   6 +-
 .../model/equipment/PowerOutlet.java          |   6 +-
 .../semantics/model/equipment/Projector.java  |   6 +-
 .../model/equipment/RadiatorControl.java      |   6 +-
 .../semantics/model/equipment/Receiver.java   |   6 +-
 .../model/equipment/RemoteControl.java        |   6 +-
 .../semantics/model/equipment/Screen.java     |   6 +-
 .../core/semantics/model/equipment/Siren.java |   6 +-
 .../model/equipment/SmokeDetector.java        |   6 +-
 .../semantics/model/equipment/Speaker.java    |   6 +-
 .../core/semantics/model/equipment/Valve.java |   6 +-
 .../semantics/model/equipment/WallSwitch.java |   6 +-
 .../semantics/model/equipment/WebService.java |   6 +-
 .../semantics/model/equipment/WhiteGood.java  |   6 +-
 .../semantics/model/equipment/Window.java     |   6 +-
 .../core/semantics/model/location/Attic.java  |   4 +-
 .../semantics/model/location/Basement.java    |   4 +-
 .../semantics/model/location/Bathroom.java    |   4 +-
 .../semantics/model/location/Bedroom.java     |   4 +-
 .../semantics/model/location/Building.java    |   4 +-
 .../semantics/model/location/Carport.java     |   4 +-
 .../semantics/model/location/Corridor.java    |   4 +-
 .../semantics/model/location/FirstFloor.java  |   4 +-
 .../core/semantics/model/location/Floor.java  |   4 +-
 .../core/semantics/model/location/Garage.java |   4 +-
 .../core/semantics/model/location/Garden.java |   4 +-
 .../semantics/model/location/GroundFloor.java |   4 +-
 .../core/semantics/model/location/Indoor.java |   6 +-
 .../semantics/model/location/Kitchen.java     |   4 +-
 .../semantics/model/location/LivingRoom.java  |   4 +-
 .../semantics/model/location/Locations.java   |   4 +-
 .../semantics/model/location/Outdoor.java     |   6 +-
 .../core/semantics/model/location/Room.java   |   4 +-
 .../semantics/model/location/Terrace.java     |   4 +-
 .../core/semantics/model/point/Alarm.java     |   6 +-
 .../core/semantics/model/point/Control.java   |   6 +-
 .../semantics/model/point/LowBattery.java     |   4 +-
 .../semantics/model/point/Measurement.java    |   6 +-
 .../core/semantics/model/point/OpenLevel.java |   4 +-
 .../core/semantics/model/point/OpenState.java |   4 +-
 .../core/semantics/model/point/Points.java    |   4 +-
 .../core/semantics/model/point/Setpoint.java  |   6 +-
 .../core/semantics/model/point/Status.java    |   6 +-
 .../core/semantics/model/point/Switch.java    |   4 +-
 .../core/semantics/model/point/Tampered.java  |   4 +-
 .../core/semantics/model/point/Tilt.java      |   4 +-
 .../core/semantics/model/property/CO.java     |   6 +-
 .../core/semantics/model/property/CO2.java    |   6 +-
 .../model/property/ColorTemperature.java      |   6 +-
 .../semantics/model/property/Current.java     |   6 +-
 .../core/semantics/model/property/Energy.java |   6 +-
 .../semantics/model/property/Frequency.java   |   6 +-
 .../core/semantics/model/property/Gas.java    |   6 +-
 .../semantics/model/property/Humidity.java    |   6 +-
 .../core/semantics/model/property/Light.java  |   6 +-
 .../core/semantics/model/property/Noise.java  |   6 +-
 .../core/semantics/model/property/Oil.java    |   6 +-
 .../core/semantics/model/property/Power.java  |   6 +-
 .../semantics/model/property/Presence.java    |   6 +-
 .../semantics/model/property/Pressure.java    |   6 +-
 .../semantics/model/property/Properties.java  |   4 +-
 .../core/semantics/model/property/Rain.java   |   6 +-
 .../core/semantics/model/property/Smoke.java  |   6 +-
 .../semantics/model/property/SoundVolume.java |   6 +-
 .../semantics/model/property/Temperature.java |   6 +-
 .../semantics/model/property/Voltage.java     |   6 +-
 .../core/semantics/model/property/Water.java  |   6 +-
 .../core/semantics/model/property/Wind.java   |   6 +-
 .../core/semantics/SemanticTagsTest.java      |  22 +--
 .../internal/SemanticsServiceImplTest.java    |  18 +--
 .../storage/json/internal/JsonStorage.java    |   8 +-
 .../json/internal/JsonStorageService.java     |  14 +-
 .../storage/json/internal/StorageEntry.java   |   2 +-
 .../internal/StorageEntryMapDeserializer.java |   2 +-
 .../json/internal/JsonStorageTest.java        |   6 +-
 .../storage/mapdb/internal/MapDbStorage.java  |  10 +-
 .../mapdb/internal/MapDbStorageService.java   |  12 +-
 .../mapdb/internal/PropertiesTypeAdapter.java |   2 +-
 .../PropertiesTypeAdapterFactory.java         |   2 +-
 .../internal/MapDbStorageServiceTest.java     |  10 +-
 .../magic/binding/MagicBindingConstants.java  |   4 +-
 .../core/magic/binding/MagicService.java      |   4 +-
 .../MagicActionModuleThingHandler.java        |  16 +--
 .../binding/handler/MagicBridgeHandler.java   |  12 +-
 .../handler/MagicBridgedThingHandler.java     |  16 +--
 .../handler/MagicChattyThingHandler.java      |  24 ++--
 .../handler/MagicColorLightHandler.java       |  12 +-
 .../MagicConfigurableThingHandler.java        |  12 +-
 .../binding/handler/MagicContactHandler.java  |  12 +-
 .../handler/MagicDelayedOnlineHandler.java    |  14 +-
 .../handler/MagicDimmableLightHandler.java    |  12 +-
 ...icDynamicStateDescriptionThingHandler.java |  18 +--
 .../handler/MagicExtensibleThingHandler.java  |  12 +-
 .../MagicFirmwareUpdateThingHandler.java      |  24 ++--
 .../binding/handler/MagicImageHandler.java    |  20 +--
 .../handler/MagicLocationThingHandler.java    |  12 +-
 .../handler/MagicOnOffLightHandler.java       |  12 +-
 .../handler/MagicOnlineOfflineHandler.java    |  12 +-
 .../binding/handler/MagicPlayerHandler.java   |  12 +-
 .../handler/MagicRolllershutterHandler.java   |  12 +-
 .../handler/MagicThermostatThingHandler.java  |  18 +--
 .../internal/MagicDiscoveryService.java       |  16 +--
 .../MagicDynamicStateDescriptionProvider.java |   8 +-
 .../binding/internal/MagicHandlerFactory.java |  54 ++++----
 .../binding/internal/MagicServiceConfig.java  |   4 +-
 .../binding/internal/MagicServiceImpl.java    |  14 +-
 .../modules/MagicMultiActionMarker.java       |   6 +-
 .../MagicMultiServiceMultiActions.java        |   4 +-
 .../modules/MagicSingleActionService.java     |   8 +-
 .../modules/MagicThingActionsService.java     |   8 +-
 .../firmware/MagicFirmwareProvider.java       |  12 +-
 .../internal/http/MagicHttpResource.java      |   2 +-
 .../metadata/MagicMetadataProvider.java       |  12 +-
 .../metadata/MagicMetadataProvider2.java      |   8 +-
 .../metadata/MagicMetadataUsingService.java   |   8 +-
 .../service/MagicMultiInstanceService.java    |   4 +-
 .../MagicMultiInstanceServiceMarker.java      |   8 +-
 .../main/resources/ESH-INF/config/config.xml  |   2 +-
 .../handler/MagicColorLightHandlerTest.java   |  12 +-
 .../MagicDimmableLightHandlerTest.java        |  12 +-
 .../handler/MagicOnOffLightHandlerTest.java   |  12 +-
 .../internal/MagicHandlerFactoryTest.java     |  14 +-
 .../internal/MagicServiceImplTest.java        |   6 +-
 .../web/index.html                            |   6 +-
 bundles/org.openhab.core.test/bnd.bnd         |   2 +-
 .../openhab/core/test/AsyncResultWrapper.java |   2 +-
 .../openhab/core/test/BundleCloseable.java    |   2 +-
 .../core/test/SyntheticBundleInstaller.java   |  14 +-
 .../org/openhab/core/test/TestPortUtil.java   |   2 +-
 .../org/openhab/core/test/TestServer.java     |   2 +-
 .../internal/java/MissingServiceAnalyzer.java |   2 +-
 .../openhab/core/test/java/JavaOSGiTest.java  |   6 +-
 .../org/openhab/core/test/java/JavaTest.java  |   2 +-
 .../core/test/storage/VolatileStorage.java    |   4 +-
 .../test/storage/VolatileStorageService.java  |   6 +-
 .../openhab/core/test/java/JavaTestTest.java  |   2 +-
 .../AbstractDescriptionTypeConverter.java     |  12 +-
 .../xml/internal/BridgeTypeConverter.java     |   6 +-
 .../xml/internal/BridgeTypeXmlResult.java     |  12 +-
 .../thing/xml/internal/ChannelConverter.java  |  12 +-
 .../internal/ChannelGroupTypeConverter.java   |   8 +-
 .../internal/ChannelGroupTypeXmlResult.java   |  10 +-
 .../xml/internal/ChannelTypeConverter.java    |  28 ++--
 .../xml/internal/ChannelTypeXmlResult.java    |   8 +-
 .../thing/xml/internal/ChannelXmlResult.java  |  12 +-
 .../internal/CommandDescriptionConverter.java |  16 +--
 .../internal/EventDescriptionConverter.java   |  14 +-
 .../internal/StateDescriptionConverter.java   |  16 +--
 .../internal/ThingDescriptionConverter.java   |   6 +-
 .../xml/internal/ThingDescriptionList.java    |   2 +-
 .../xml/internal/ThingDescriptionReader.java  |  38 +++---
 .../xml/internal/ThingTypeConverter.java      |  12 +-
 .../xml/internal/ThingTypeXmlProvider.java    |  20 +--
 .../xml/internal/ThingTypeXmlResult.java      |  20 +--
 .../ThingXmlConfigDescriptionProvider.java    |  10 +-
 .../internal/XmlChannelGroupTypeProvider.java |  14 +-
 .../xml/internal/XmlChannelTypeProvider.java  |  14 +-
 .../core/thing/xml/internal/XmlHelper.java    |   2 +-
 .../xml/internal/XmlThingTypeProvider.java    |  34 ++---
 .../core/thing/xml/internal/Example.java      |   2 +-
 .../thing/xml/internal/XmlHelperTest.java     |   2 +-
 .../java/org/openhab/core/thing/Bridge.java   |   4 +-
 .../java/org/openhab/core/thing/Channel.java  |  14 +-
 .../openhab/core/thing/ChannelGroupUID.java   |   2 +-
 .../org/openhab/core/thing/ChannelUID.java    |   2 +-
 .../core/thing/CommonTriggerEvents.java       |   2 +-
 .../DefaultSystemChannelTypeProvider.java     |  26 ++--
 .../core/thing/ManagedThingProvider.java      |   6 +-
 .../java/org/openhab/core/thing/Thing.java    |  10 +-
 .../org/openhab/core/thing/ThingManager.java  |   2 +-
 .../org/openhab/core/thing/ThingProvider.java |   4 +-
 .../org/openhab/core/thing/ThingRegistry.java |  12 +-
 .../thing/ThingRegistryChangeListener.java    |   4 +-
 .../org/openhab/core/thing/ThingStatus.java   |   2 +-
 .../openhab/core/thing/ThingStatusDetail.java |   2 +-
 .../openhab/core/thing/ThingStatusInfo.java   |   2 +-
 .../core/thing/ThingTypeMigrationService.java |   4 +-
 .../org/openhab/core/thing/ThingTypeUID.java  |   2 +-
 .../java/org/openhab/core/thing/ThingUID.java |   2 +-
 .../main/java/org/openhab/core/thing/UID.java |   4 +-
 .../core/thing/binding/BaseBridgeHandler.java |  10 +-
 ...BaseDynamicCommandDescriptionProvider.java |  20 +--
 .../BaseDynamicStateDescriptionProvider.java  |  20 +--
 .../core/thing/binding/BaseThingHandler.java  |  36 ++---
 .../binding/BaseThingHandlerFactory.java      |  22 +--
 .../core/thing/binding/BridgeHandler.java     |   6 +-
 .../binding/ConfigStatusBridgeHandler.java    |  10 +-
 .../binding/ConfigStatusThingHandler.java     |  10 +-
 .../core/thing/binding/ThingActions.java      |   2 +-
 .../core/thing/binding/ThingActionsScope.java |   2 +-
 .../binding/ThingConfigStatusSource.java      |   6 +-
 .../core/thing/binding/ThingFactory.java      |  24 ++--
 .../core/thing/binding/ThingHandler.java      |  18 +--
 .../thing/binding/ThingHandlerCallback.java   |  36 ++---
 .../thing/binding/ThingHandlerFactory.java    |  14 +-
 .../thing/binding/ThingHandlerService.java    |   2 +-
 .../core/thing/binding/ThingTypeProvider.java |   6 +-
 .../thing/binding/builder/BridgeBuilder.java  |  16 +--
 .../thing/binding/builder/ChannelBuilder.java |  16 +--
 .../thing/binding/builder/ThingBuilder.java   |  18 +--
 .../builder/ThingStatusInfoBuilder.java       |   8 +-
 .../core/thing/binding/firmware/Firmware.java |  14 +-
 .../binding/firmware/FirmwareBuilder.java     |   6 +-
 .../binding/firmware/FirmwareRestriction.java |   6 +-
 ...rmwareUpdateBackgroundTransferHandler.java |   6 +-
 .../firmware/FirmwareUpdateHandler.java       |  10 +-
 .../binding/firmware/ProgressCallback.java    |   2 +-
 .../thing/binding/firmware/ProgressStep.java  |   2 +-
 .../openhab/core/thing/dto/ChannelDTO.java    |   8 +-
 .../core/thing/dto/ChannelDTOMapper.java      |  14 +-
 .../core/thing/dto/ChannelDefinitionDTO.java  |   4 +-
 .../thing/dto/ChannelGroupDefinitionDTO.java  |   2 +-
 .../core/thing/dto/ChannelTypeDTO.java        |  12 +-
 .../core/thing/dto/StrippedThingTypeDTO.java  |   2 +-
 .../thing/dto/StrippedThingTypeDTOMapper.java |   6 +-
 .../org/openhab/core/thing/dto/ThingDTO.java  |   2 +-
 .../core/thing/dto/ThingDTOMapper.java        |  18 +--
 .../openhab/core/thing/dto/ThingTypeDTO.java  |   6 +-
 .../events/AbstractThingRegistryEvent.java    |   8 +-
 .../thing/events/ChannelTriggeredEvent.java   |   6 +-
 .../core/thing/events/ThingAddedEvent.java    |   4 +-
 .../core/thing/events/ThingEventFactory.java  |  22 +--
 .../core/thing/events/ThingRemovedEvent.java  |   4 +-
 .../events/ThingStatusInfoChangedEvent.java   |   8 +-
 .../thing/events/ThingStatusInfoEvent.java    |   8 +-
 .../core/thing/events/ThingUpdatedEvent.java  |   4 +-
 .../thing/firmware/FirmwareEventFactory.java  |   8 +-
 .../core/thing/firmware/FirmwareProvider.java |   6 +-
 .../core/thing/firmware/FirmwareRegistry.java |   8 +-
 .../core/thing/firmware/FirmwareStatus.java   |  10 +-
 .../thing/firmware/FirmwareStatusInfo.java    |   6 +-
 .../firmware/FirmwareStatusInfoEvent.java     |   8 +-
 .../firmware/FirmwareUpdateProgressInfo.java  |   8 +-
 .../FirmwareUpdateProgressInfoEvent.java      |   4 +-
 .../thing/firmware/FirmwareUpdateResult.java  |   2 +-
 .../firmware/FirmwareUpdateResultInfo.java    |   4 +-
 .../FirmwareUpdateResultInfoEvent.java        |   4 +-
 .../thing/firmware/FirmwareUpdateService.java |  12 +-
 .../core/thing/firmware/dto/FirmwareDTO.java  |   2 +-
 .../thing/firmware/dto/FirmwareStatusDTO.java |   2 +-
 ...annelGroupTypeI18nLocalizationService.java |  18 +--
 .../ChannelTypeI18nLocalizationService.java   |  28 ++--
 ...hingStatusInfoI18nLocalizationService.java |  14 +-
 .../ThingTypeI18nLocalizationService.java     |  26 ++--
 .../AutoUpdateConfigDescriptionProvider.java  |   8 +-
 .../thing/internal/AutoUpdateManager.java     |  46 +++----
 .../core/thing/internal/BridgeImpl.java       |  14 +-
 .../ChannelCommandDescriptionProvider.java    |  20 +--
 .../thing/internal/ChannelItemProvider.java   |  40 +++---
 .../ChannelStateDescriptionProvider.java      |  28 ++--
 .../thing/internal/CommunicationManager.java  |  88 ++++++------
 .../thing/internal/ProfileContextImpl.java    |   8 +-
 .../ThingConfigDescriptionAliasProvider.java  |  24 ++--
 .../thing/internal/ThingFactoryHelper.java    |  32 ++---
 .../core/thing/internal/ThingImpl.java        |  24 ++--
 .../core/thing/internal/ThingManagerImpl.java | 108 +++++++--------
 .../thing/internal/ThingRegistryImpl.java     |  34 ++---
 .../core/thing/internal/ThingTracker.java     |   6 +-
 ...FirmwareUpdateConsoleCommandExtension.java |  24 ++--
 .../console/LinkConsoleCommandExtension.java  |  14 +-
 .../console/ThingConsoleCommandExtension.java |  32 ++---
 .../thing/internal/firmware/FirmwareImpl.java |  12 +-
 .../firmware/FirmwareRegistryImpl.java        |  12 +-
 .../firmware/FirmwareUpdateServiceImpl.java   |  50 +++----
 .../internal/firmware/ParameterChecks.java    |   2 +-
 .../firmware/ProgressCallbackImpl.java        |  28 ++--
 .../internal/i18n/ChannelGroupI18nUtil.java   |  14 +-
 .../thing/internal/i18n/ChannelI18nUtil.java  |  18 +--
 .../internal/i18n/ThingTypeI18nUtil.java      |  16 +--
 ...mChannelLinkConfigDescriptionProvider.java |  36 ++---
 .../profiles/ProfileCallbackImpl.java         |  30 ++--
 .../profiles/ProfileTypeRegistryImpl.java     |   8 +-
 .../profiles/RawButtonOnOffSwitchProfile.java |  16 +--
 .../RawButtonTogglePlayerProfile.java         |  16 +--
 .../RawButtonToggleRollershutterProfile.java  |  16 +--
 .../RawButtonToggleSwitchProfile.java         |  16 +--
 .../profiles/RawRockerDimmerProfile.java      |  22 +--
 .../RawRockerNextPreviousProfile.java         |  18 +--
 .../profiles/RawRockerOnOffProfile.java       |  16 +--
 .../profiles/RawRockerPlayPauseProfile.java   |  18 +--
 .../RawRockerRewindFastforwardProfile.java    |  18 +--
 .../profiles/RawRockerStopMoveProfile.java    |  18 +--
 .../profiles/RawRockerUpDownProfile.java      |  18 +--
 .../profiles/StateProfileTypeImpl.java        |   6 +-
 .../profiles/SystemDefaultProfile.java        |  16 +--
 .../profiles/SystemFollowProfile.java         |  16 +--
 .../profiles/SystemOffsetProfile.java         |  30 ++--
 .../profiles/SystemProfileFactory.java        |  38 +++---
 .../profiles/TimestampChangeProfile.java      |  16 +--
 .../profiles/TimestampUpdateProfile.java      |  16 +--
 .../profiles/TriggerProfileTypeImpl.java      |   8 +-
 .../profiles/i18n/ProfileI18nUtil.java        |  14 +-
 .../type/AbstractChannelTypeBuilder.java      |   8 +-
 .../type/StateChannelTypeBuilderImpl.java     |  16 +--
 .../type/TriggerChannelTypeBuilderImpl.java   |  12 +-
 .../openhab/core/thing/link/AbstractLink.java |   8 +-
 .../core/thing/link/AbstractLinkRegistry.java |   8 +-
 .../core/thing/link/ItemChannelLink.java      |   8 +-
 .../thing/link/ItemChannelLinkProvider.java   |   4 +-
 .../thing/link/ItemChannelLinkRegistry.java   |  20 +--
 .../link/ManagedItemChannelLinkProvider.java  |   8 +-
 .../core/thing/link/ThingLinkManager.java     |  44 +++---
 .../core/thing/link/dto/AbstractLinkDTO.java  |   2 +-
 .../thing/link/dto/ItemChannelLinkDTO.java    |   2 +-
 .../AbstractItemChannelLinkRegistryEvent.java |   6 +-
 .../events/ItemChannelLinkAddedEvent.java     |   4 +-
 .../events/ItemChannelLinkRemovedEvent.java   |   4 +-
 .../thing/link/events/LinkEventFactory.java   |  14 +-
 .../openhab/core/thing/profiles/Profile.java  |   4 +-
 .../core/thing/profiles/ProfileAdvisor.java   |   6 +-
 .../core/thing/profiles/ProfileCallback.java  |   6 +-
 .../core/thing/profiles/ProfileContext.java   |   4 +-
 .../core/thing/profiles/ProfileFactory.java   |   2 +-
 .../core/thing/profiles/ProfileType.java      |   4 +-
 .../thing/profiles/ProfileTypeBuilder.java    |   8 +-
 .../thing/profiles/ProfileTypeProvider.java   |   2 +-
 .../thing/profiles/ProfileTypeRegistry.java   |   2 +-
 .../core/thing/profiles/ProfileTypeUID.java   |   4 +-
 .../core/thing/profiles/StateProfile.java     |   6 +-
 .../core/thing/profiles/StateProfileType.java |   2 +-
 .../core/thing/profiles/SystemProfiles.java   |   8 +-
 .../core/thing/profiles/TriggerProfile.java   |   2 +-
 .../thing/profiles/TriggerProfileType.java    |   4 +-
 .../thing/profiles/dto/ProfileTypeDTO.java    |   2 +-
 .../profiles/dto/ProfileTypeDTOMapper.java    |   6 +-
 .../ProfileTypeI18nLocalizationService.java   |  16 +--
 .../thing/type/AbstractDescriptionType.java   |   6 +-
 .../core/thing/type/AutoUpdatePolicy.java     |   2 +-
 .../openhab/core/thing/type/BridgeType.java   |   6 +-
 .../core/thing/type/ChannelDefinition.java    |   6 +-
 .../thing/type/ChannelDefinitionBuilder.java  |   2 +-
 .../thing/type/ChannelGroupDefinition.java    |   4 +-
 .../core/thing/type/ChannelGroupType.java     |   2 +-
 .../thing/type/ChannelGroupTypeBuilder.java   |   2 +-
 .../thing/type/ChannelGroupTypeProvider.java  |   2 +-
 .../thing/type/ChannelGroupTypeRegistry.java  |   2 +-
 .../core/thing/type/ChannelGroupTypeUID.java  |   4 +-
 .../openhab/core/thing/type/ChannelKind.java  |   2 +-
 .../openhab/core/thing/type/ChannelType.java  |  12 +-
 .../core/thing/type/ChannelTypeBuilder.java   |   6 +-
 .../core/thing/type/ChannelTypeProvider.java  |   2 +-
 .../core/thing/type/ChannelTypeRegistry.java  |   2 +-
 .../core/thing/type/ChannelTypeUID.java       |   4 +-
 .../DynamicCommandDescriptionProvider.java    |   6 +-
 .../type/DynamicStateDescriptionProvider.java |   6 +-
 .../thing/type/StateChannelTypeBuilder.java   |   8 +-
 .../openhab/core/thing/type/ThingType.java    |   8 +-
 .../core/thing/type/ThingTypeBuilder.java     |   4 +-
 .../core/thing/type/ThingTypeRegistry.java    |  10 +-
 .../thing/type/TriggerChannelTypeBuilder.java |   4 +-
 .../core/thing/util/ThingHandlerHelper.java   |   8 +-
 .../openhab/core/thing/util/ThingHelper.java  |  28 ++--
 .../core/thing/ChannelGroupUIDTest.java       |   2 +-
 .../org/openhab/core/thing/ChannelTest.java   |   2 +-
 .../openhab/core/thing/ChannelUIDTest.java    |   2 +-
 .../org/openhab/core/thing/ThingUIDTest.java  |   2 +-
 .../java/org/openhab/core/thing/UIDTest.java  |   2 +-
 .../binding/builder/ChannelBuilderTest.java   |  18 +--
 .../binding/builder/ThingBuilderTest.java     |  14 +-
 .../builder/ThingStatusInfoBuilderTest.java   |   8 +-
 .../firmware/FirmwareEventFactoryTest.java    |  12 +-
 .../thing/internal/AutoUpdateManagerTest.java |  44 +++---
 .../internal/ChannelItemProviderTest.java     |  36 ++---
 .../core/thing/internal/ThingImplTest.java    |  16 +--
 .../thing/internal/ThingManagerImplTest.java  |  16 +--
 .../firmware/ProgressCallbackTest.java        |  34 ++---
 .../RawButtonOnOffSwitchProfileTest.java      |  12 +-
 .../RawButtonToggleSwitchProfileTest.java     |  20 +--
 .../profiles/SystemDefaultProfileTest.java    |   6 +-
 .../profiles/SystemFollowProfileTest.java     |   6 +-
 .../profiles/SystemOffsetProfileTest.java     |  20 +--
 .../profiles/TimestampProfileTest.java        |  12 +-
 .../type/ChannelGroupTypeBuilderTest.java     |   2 +-
 .../thing/type/ChannelTypeBuilderTest.java    |  10 +-
 .../core/thing/type/ThingTypeBuilderTest.java |   4 +-
 .../thing/util/ThingHandlerHelperTest.java    |  18 +--
 .../core/thing/util/ThingHelperTest.java      |  18 +--
 bundles/org.openhab.core.transform/bnd.bnd    |   2 +-
 .../AbstractFileTransformationService.java    |   6 +-
 .../transform/TransformationException.java    |   2 +-
 .../core/transform/TransformationHelper.java  |   2 +-
 .../core/transform/TransformationService.java |   2 +-
 .../transform/actions/Transformation.java     |  10 +-
 .../internal/TransformationActivator.java     |   2 +-
 .../transform/actions/TransformationTest.java |   4 +-
 .../ui/icon/AbstractResourceIconProvider.java |   6 +-
 .../openhab/core/ui/icon/IconProvider.java    |   4 +-
 .../org/openhab/core/ui/icon/IconSet.java     |   2 +-
 .../ui/icon/internal/CustomIconProvider.java  |  10 +-
 .../core/ui/icon/internal/IconServlet.java    |   8 +-
 .../ui/icon/internal/IconSetResource.java     |  10 +-
 .../AbstractResourceIconProviderTest.java     |   4 +-
 .../ui/icon/internal/IconServletTest.java     |   8 +-
 bundles/org.openhab.core.ui/bnd.bnd           |   2 +-
 .../openhab/core/ui/chart/ChartProvider.java  |   4 +-
 .../openhab/core/ui/internal/UIActivator.java |   2 +-
 .../core/ui/internal/chart/ChartServlet.java  |  14 +-
 .../defaultchartprovider/ChartTheme.java      |   2 +-
 .../defaultchartprovider/ChartThemeBlack.java |   2 +-
 .../ChartThemeBright.java                     |   2 +-
 .../defaultchartprovider/ChartThemeDark.java  |   2 +-
 .../defaultchartprovider/ChartThemeWhite.java |   2 +-
 .../DefaultChartProvider.java                 |  36 ++---
 .../ui/internal/items/ItemUIRegistryImpl.java | 108 +++++++--------
 .../ui/internal/proxy/AsyncProxyServlet.java  |   2 +-
 .../internal/proxy/BlockingProxyServlet.java  |   2 +-
 .../internal/proxy/ProxyServletService.java   |  20 +--
 .../openhab/core/ui/items/ItemUIProvider.java |   6 +-
 .../openhab/core/ui/items/ItemUIRegistry.java |  16 +--
 .../items/ItemUIRegistryImplTest.java         |  52 +++----
 .../proxy/ProxyServletServiceTest.java        |  28 ++--
 .../openhab/core/voice/AudioStartEvent.java   |   2 +-
 .../openhab/core/voice/AudioStopEvent.java    |   2 +-
 .../org/openhab/core/voice/KSErrorEvent.java  |   2 +-
 .../java/org/openhab/core/voice/KSEvent.java  |   2 +-
 .../org/openhab/core/voice/KSException.java   |   2 +-
 .../org/openhab/core/voice/KSListener.java    |   2 +-
 .../org/openhab/core/voice/KSService.java     |   6 +-
 .../openhab/core/voice/KSServiceHandle.java   |   2 +-
 .../org/openhab/core/voice/KSpottedEvent.java |   2 +-
 .../core/voice/RecognitionStartEvent.java     |   2 +-
 .../core/voice/RecognitionStopEvent.java      |   2 +-
 .../java/org/openhab/core/voice/STTEvent.java |   2 +-
 .../org/openhab/core/voice/STTException.java  |   2 +-
 .../org/openhab/core/voice/STTListener.java   |   2 +-
 .../org/openhab/core/voice/STTService.java    |   6 +-
 .../openhab/core/voice/STTServiceHandle.java  |   2 +-
 .../voice/SpeechRecognitionErrorEvent.java    |   2 +-
 .../core/voice/SpeechRecognitionEvent.java    |   2 +-
 .../openhab/core/voice/SpeechStartEvent.java  |   2 +-
 .../openhab/core/voice/SpeechStopEvent.java   |   2 +-
 .../org/openhab/core/voice/TTSException.java  |   2 +-
 .../org/openhab/core/voice/TTSService.java    |   6 +-
 .../java/org/openhab/core/voice/Voice.java    |   2 +-
 .../org/openhab/core/voice/VoiceManager.java  |  12 +-
 .../core/voice/internal/DialogProcessor.java  |  62 ++++-----
 .../VoiceConsoleCommandExtension.java         |  26 ++--
 .../core/voice/internal/VoiceManagerImpl.java |  48 +++----
 .../internal/text/StandardInterpreter.java    |  30 ++--
 .../org/openhab/core/voice/text/ASTNode.java  |   2 +-
 .../text/AbstractRuleBasedInterpreter.java    |  22 +--
 .../openhab/core/voice/text/Expression.java   |   2 +-
 .../voice/text/ExpressionAlternatives.java    |   2 +-
 .../voice/text/ExpressionCardinality.java     |   2 +-
 .../core/voice/text/ExpressionIdentifier.java |   2 +-
 .../core/voice/text/ExpressionLet.java        |   2 +-
 .../core/voice/text/ExpressionMatch.java      |   2 +-
 .../core/voice/text/ExpressionSequence.java   |   2 +-
 .../voice/text/HumanLanguageInterpreter.java  |   2 +-
 .../voice/text/InterpretationException.java   |   2 +-
 .../core/voice/text/InterpretationResult.java |   2 +-
 .../org/openhab/core/voice/text/Rule.java     |   2 +-
 .../openhab/core/voice/text/TokenList.java    |   2 +-
 .../openhab/core/voice/STTExceptionTest.java  |   2 +-
 .../SpeechRecognitionErrorEventTest.java      |   2 +-
 .../voice/SpeechRecognitionEventTest.java     |   2 +-
 .../openhab/core/voice/TTSExceptionTest.java  |   2 +-
 .../org/openhab/core/auth/Authentication.java |   2 +-
 .../core/auth/AuthenticationException.java    |   2 +-
 .../core/auth/AuthenticationManager.java      |   2 +-
 .../core/auth/AuthenticationProvider.java     |   2 +-
 .../org/openhab/core/auth/Credentials.java    |   2 +-
 .../main/java/org/openhab/core/auth/Role.java |   2 +-
 .../openhab/core/auth/SecurityException.java  |   2 +-
 .../auth/UnsupportedCredentialsException.java |   2 +-
 .../auth/UsernamePasswordCredentials.java     |   2 +-
 .../oauth2/AccessTokenRefreshListener.java    |   2 +-
 .../client/oauth2/AccessTokenResponse.java    |   2 +-
 .../client/oauth2/OAuthClientService.java     |   2 +-
 .../auth/client/oauth2/OAuthException.java    |   2 +-
 .../core/auth/client/oauth2/OAuthFactory.java |   2 +-
 .../client/oauth2/OAuthResponseException.java |   2 +-
 .../auth/client/oauth2/StorageCipher.java     |   2 +-
 .../org/openhab/core/binding/BindingInfo.java |   4 +-
 .../core/binding/BindingInfoProvider.java     |   2 +-
 .../core/binding/BindingInfoRegistry.java     |   2 +-
 .../core/binding/dto/BindingInfoDTO.java      |   2 +-
 .../i18n/BindingI18nLocalizationService.java  |   8 +-
 .../internal/i18n/BindingI18nUtil.java        |   6 +-
 .../org/openhab/core/cache/ExpiringCache.java |   2 +-
 .../core/cache/ExpiringCacheAsync.java        |   4 +-
 .../openhab/core/cache/ExpiringCacheMap.java  |   2 +-
 .../org/openhab/core/common/AbstractUID.java  |   2 +-
 .../core/common/NamedThreadFactory.java       |   2 +-
 .../common/QueueingThreadPoolExecutor.java    |   2 +-
 .../org/openhab/core/common/SafeCaller.java   |   2 +-
 .../core/common/SafeCallerBuilder.java        |   2 +-
 .../core/common/ThreadFactoryBuilder.java     |   2 +-
 .../core/common/ThreadPoolManager.java        |   8 +-
 .../osgi/ResourceBundleClassLoader.java       |   2 +-
 .../registry/AbstractManagedProvider.java     |   6 +-
 .../common/registry/AbstractProvider.java     |   2 +-
 .../common/registry/AbstractRegistry.java     |   6 +-
 .../DefaultAbstractManagedProvider.java       |   4 +-
 .../core/common/registry/Identifiable.java    |   2 +-
 .../core/common/registry/ManagedProvider.java |   2 +-
 .../core/common/registry/Provider.java        |   2 +-
 .../registry/ProviderChangeListener.java      |   2 +-
 .../core/common/registry/Registry.java        |   2 +-
 .../registry/RegistryChangeListener.java      |   2 +-
 .../openhab/core/events/AbstractEvent.java    |   2 +-
 .../core/events/AbstractEventFactory.java     |   2 +-
 .../events/AbstractTypedEventSubscriber.java  |   2 +-
 .../java/org/openhab/core/events/Event.java   |   2 +-
 .../org/openhab/core/events/EventFactory.java |   2 +-
 .../org/openhab/core/events/EventFilter.java  |   2 +-
 .../openhab/core/events/EventPublisher.java   |   2 +-
 .../openhab/core/events/EventSubscriber.java  |   2 +-
 .../openhab/core/events/TopicEventFilter.java |   2 +-
 .../org/openhab/core/extension/Extension.java |   2 +-
 .../core/extension/ExtensionEvent.java        |   4 +-
 .../core/extension/ExtensionEventFactory.java |   8 +-
 .../core/extension/ExtensionService.java      |   2 +-
 .../openhab/core/extension/ExtensionType.java |   2 +-
 .../java/org/openhab/core/i18n/I18nUtil.java  |   2 +-
 .../org/openhab/core/i18n/LocaleProvider.java |   2 +-
 .../org/openhab/core/i18n/LocalizedKey.java   |   2 +-
 .../openhab/core/i18n/LocationProvider.java   |   4 +-
 .../openhab/core/i18n/TimeZoneProvider.java   |   2 +-
 .../core/i18n/TranslationProvider.java        |   2 +-
 .../org/openhab/core/i18n/UnitProvider.java   |   2 +-
 .../auth/AuthenticationManagerImpl.java       |  14 +-
 .../common/AbstractInvocationHandler.java     |   2 +-
 .../internal/common/CombinedClassLoader.java  |   2 +-
 .../common/DuplicateExecutionException.java   |   2 +-
 .../core/internal/common/Invocation.java      |   2 +-
 .../common/InvocationHandlerAsync.java        |   2 +-
 .../common/InvocationHandlerSync.java         |   2 +-
 .../core/internal/common/SafeCallManager.java |   2 +-
 .../internal/common/SafeCallManagerImpl.java  |   2 +-
 .../common/SafeCallerBuilderImpl.java         |   6 +-
 .../core/internal/common/SafeCallerImpl.java  |  10 +-
 .../WrappedScheduledExecutorService.java      |   2 +-
 .../core/internal/events/EventHandler.java    |  12 +-
 .../internal/events/OSGiEventManager.java     |   8 +-
 .../internal/events/OSGiEventPublisher.java   |   6 +-
 .../internal/events/ThreadedEventHandler.java |   6 +-
 .../core/internal/i18n/I18nProviderImpl.java  |  28 ++--
 .../i18n/LanguageResourceBundleManager.java   |   6 +-
 .../internal/i18n/ResourceBundleTracker.java  |   4 +-
 .../internal/items/GroupFunctionHelper.java   |  16 +--
 .../items/ItemBuilderFactoryImpl.java         |  14 +-
 .../core/internal/items/ItemBuilderImpl.java  |  14 +-
 .../core/internal/items/ItemRegistryImpl.java |  40 +++---
 .../items/ItemStateConverterImpl.java         |  22 +--
 .../core/internal/items/ItemUpdater.java      |  22 +--
 .../items/ManagedMetadataProviderImpl.java    |  16 +--
 .../internal/items/MetadataRegistryImpl.java  |  16 +--
 .../library/unit/UnitInitializer.java         |   8 +-
 .../core/internal/scheduler/CronAdjuster.java |   4 +-
 .../internal/scheduler/CronSchedulerImpl.java |  12 +-
 .../scheduler/DelegatedSchedulerImpl.java     |  10 +-
 .../internal/scheduler/PeriodicAdjuster.java  |   4 +-
 .../scheduler/PeriodicSchedulerImpl.java      |  10 +-
 .../internal/scheduler/SchedulerImpl.java     |  12 +-
 .../internal/service/BundleResolverImpl.java  |   4 +-
 .../CommandDescriptionServiceImpl.java        |   8 +-
 .../internal/service/ReadyServiceImpl.java    |   8 +-
 .../service/StateDescriptionServiceImpl.java  |  16 +--
 .../types/CommandDescriptionImpl.java         |   6 +-
 .../types/StateDescriptionFragmentImpl.java   |  10 +-
 .../org/openhab/core/items/ActiveItem.java    |   2 +-
 .../org/openhab/core/items/GenericItem.java   |  30 ++--
 .../org/openhab/core/items/GroupFunction.java |   6 +-
 .../org/openhab/core/items/GroupItem.java     |  10 +-
 .../java/org/openhab/core/items/Item.java     |  22 +--
 .../org/openhab/core/items/ItemBuilder.java   |   2 +-
 .../core/items/ItemBuilderFactory.java        |   2 +-
 .../org/openhab/core/items/ItemFactory.java   |   2 +-
 .../core/items/ItemLookupException.java       |   2 +-
 .../core/items/ItemNotFoundException.java     |   2 +-
 .../core/items/ItemNotUniqueException.java    |   2 +-
 .../openhab/core/items/ItemPredicates.java    |   2 +-
 .../org/openhab/core/items/ItemProvider.java  |   4 +-
 .../org/openhab/core/items/ItemRegistry.java  |   8 +-
 .../items/ItemRegistryChangeListener.java     |   4 +-
 .../core/items/ItemStateConverter.java        |   4 +-
 .../java/org/openhab/core/items/ItemUtil.java |   6 +-
 .../core/items/ManagedItemProvider.java       |  12 +-
 .../core/items/ManagedMetadataProvider.java   |   6 +-
 .../java/org/openhab/core/items/Metadata.java |   4 +-
 .../org/openhab/core/items/MetadataKey.java   |   4 +-
 .../core/items/MetadataPredicates.java        |   2 +-
 .../openhab/core/items/MetadataProvider.java  |   4 +-
 .../openhab/core/items/MetadataRegistry.java  |   4 +-
 .../org/openhab/core/items/RegistryHook.java  |   4 +-
 .../core/items/StateChangeListener.java       |   4 +-
 .../core/items/dto/GroupFunctionDTO.java      |   2 +-
 .../openhab/core/items/dto/GroupItemDTO.java  |   2 +-
 .../org/openhab/core/items/dto/ItemDTO.java   |   2 +-
 .../openhab/core/items/dto/ItemDTOMapper.java |  20 +--
 .../openhab/core/items/dto/MetadataDTO.java   |   2 +-
 .../events/AbstractItemEventSubscriber.java   |   8 +-
 .../events/AbstractItemRegistryEvent.java     |   8 +-
 .../events/GroupItemStateChangedEvent.java    |   4 +-
 .../core/items/events/ItemAddedEvent.java     |   4 +-
 .../core/items/events/ItemCommandEvent.java   |   6 +-
 .../core/items/events/ItemEventFactory.java   |  26 ++--
 .../core/items/events/ItemRemovedEvent.java   |   4 +-
 .../items/events/ItemStateChangedEvent.java   |   6 +-
 .../core/items/events/ItemStateEvent.java     |   6 +-
 .../items/events/ItemStatePredictedEvent.java |   6 +-
 .../core/items/events/ItemUpdatedEvent.java   |   4 +-
 .../openhab/core/library/CoreItemFactory.java |  32 ++---
 .../core/library/dimension/ArealDensity.java  |   2 +-
 .../core/library/dimension/DataAmount.java    |   2 +-
 .../library/dimension/DataTransferRate.java   |   2 +-
 .../core/library/dimension/Density.java       |   2 +-
 .../core/library/dimension/Intensity.java     |   2 +-
 .../library/dimension/VolumetricFlowRate.java |   2 +-
 .../openhab/core/library/items/CallItem.java  |  14 +-
 .../openhab/core/library/items/ColorItem.java |  22 +--
 .../core/library/items/ContactItem.java       |  16 +--
 .../core/library/items/DateTimeItem.java      |  16 +--
 .../core/library/items/DimmerItem.java        |  18 +--
 .../openhab/core/library/items/ImageItem.java |  16 +--
 .../core/library/items/LocationItem.java      |  18 +--
 .../core/library/items/NumberItem.java        |  26 ++--
 .../core/library/items/PlayerItem.java        |  20 +--
 .../core/library/items/RollershutterItem.java |  20 +--
 .../core/library/items/StringItem.java        |  20 +--
 .../core/library/items/SwitchItem.java        |  16 +--
 .../types/ArithmeticGroupFunction.java        |  10 +-
 .../library/types/DateTimeGroupFunction.java  |  10 +-
 .../core/library/types/DateTimeType.java      |   8 +-
 .../core/library/types/DecimalType.java       |   8 +-
 .../openhab/core/library/types/HSBType.java   |  10 +-
 .../library/types/IncreaseDecreaseType.java   |   6 +-
 .../core/library/types/NextPreviousType.java  |   8 +-
 .../openhab/core/library/types/OnOffType.java |   8 +-
 .../core/library/types/OpenClosedType.java    |   8 +-
 .../core/library/types/PercentType.java       |   6 +-
 .../core/library/types/PlayPauseType.java     |  10 +-
 .../openhab/core/library/types/PointType.java |  12 +-
 .../core/library/types/QuantityType.java      |  16 +--
 .../QuantityTypeArithmeticGroupFunction.java  |  14 +-
 .../openhab/core/library/types/RawType.java   |   6 +-
 .../library/types/RewindFastforwardType.java  |  10 +-
 .../core/library/types/StopMoveType.java      |   6 +-
 .../core/library/types/StringListType.java    |   6 +-
 .../core/library/types/StringType.java        |   8 +-
 .../core/library/types/UpDownType.java        |   8 +-
 .../core/library/unit/BinaryPrefix.java       |   2 +-
 .../core/library/unit/CustomUnits.java        |   2 +-
 .../core/library/unit/ImperialUnits.java      |   2 +-
 .../core/library/unit/MetricPrefix.java       |   2 +-
 .../openhab/core/library/unit/SIUnits.java    |   2 +-
 .../core/library/unit/SmartHomeUnits.java     |  14 +-
 .../org/openhab/core/net/CidrAddress.java     |   2 +-
 .../org/openhab/core/net/HttpServiceUtil.java |   2 +-
 .../java/org/openhab/core/net/NetUtil.java    |   8 +-
 .../net/NetworkAddressChangeListener.java     |   2 +-
 .../core/net/NetworkAddressService.java       |   2 +-
 .../org/openhab/core/scheduler/CronJob.java   |   2 +-
 .../openhab/core/scheduler/CronScheduler.java |   2 +-
 .../core/scheduler/PeriodicScheduler.java     |   2 +-
 .../scheduler/ScheduledCompletableFuture.java |   2 +-
 .../org/openhab/core/scheduler/Scheduler.java |   2 +-
 .../core/scheduler/SchedulerRunnable.java     |   2 +-
 .../scheduler/SchedulerTemporalAdjuster.java  |   2 +-
 .../core/service/AbstractWatchService.java    |   2 +-
 .../service/CommandDescriptionService.java    |   4 +-
 .../org/openhab/core/service/ReadyMarker.java |   2 +-
 .../core/service/ReadyMarkerFilter.java       |   2 +-
 .../core/service/ReadyMarkerUtils.java        |   2 +-
 .../openhab/core/service/ReadyService.java    |   2 +-
 .../core/service/StateDescriptionService.java |   4 +-
 .../core/service/WatchQueueReader.java        |   4 +-
 .../core/storage/DeletableStorage.java        |   2 +-
 .../core/storage/DeletableStorageService.java |   2 +-
 .../org/openhab/core/storage/Storage.java     |   2 +-
 .../openhab/core/storage/StorageService.java  |   2 +-
 .../java/org/openhab/core/types/Command.java  |   2 +-
 .../core/types/CommandDescription.java        |   2 +-
 .../core/types/CommandDescriptionBuilder.java |   4 +-
 .../types/CommandDescriptionProvider.java     |   2 +-
 .../org/openhab/core/types/CommandOption.java |   2 +-
 .../org/openhab/core/types/ComplexType.java   |   2 +-
 .../openhab/core/types/EventDescription.java  |   2 +-
 .../org/openhab/core/types/EventOption.java   |   2 +-
 .../org/openhab/core/types/EventType.java     |   2 +-
 .../org/openhab/core/types/PrimitiveType.java |   2 +-
 .../org/openhab/core/types/RefreshType.java   |   2 +-
 .../java/org/openhab/core/types/State.java    |   2 +-
 .../openhab/core/types/StateDescription.java  |   2 +-
 .../core/types/StateDescriptionFragment.java  |   2 +-
 .../StateDescriptionFragmentBuilder.java      |   4 +-
 .../StateDescriptionFragmentProvider.java     |   2 +-
 .../core/types/StateDescriptionProvider.java  |   2 +-
 .../org/openhab/core/types/StateOption.java   |   2 +-
 .../java/org/openhab/core/types/Type.java     |   2 +-
 .../org/openhab/core/types/TypeParser.java    |   4 +-
 .../org/openhab/core/types/UnDefType.java     |   2 +-
 .../openhab/core/types/util/UnitUtils.java    |  16 +--
 .../org/openhab/core/util/BundleResolver.java |   2 +-
 .../java/org/openhab/core/util/HexUtils.java  |   2 +-
 .../java/org/openhab/core/util/UIDUtils.java  |   2 +-
 .../oauth2/AccessTokenResponseTest.java       |   2 +-
 .../core/cache/ExpiringCacheMapTest.java      |   2 +-
 .../openhab/core/cache/ExpiringCacheTest.java |   2 +-
 .../QueueingThreadPoolExecutorTest.java       |   2 +-
 .../core/common/ThreadFactoryBuilderTest.java |   2 +-
 .../core/common/ThreadPoolManagerTest.java    |   2 +-
 .../osgi/ResourceBundleClassLoaderTest.java   |   2 +-
 .../internal/i18n/I18nProviderImplTest.java   |   6 +-
 .../core/internal/items/ItemBuilderTest.java  |  12 +-
 .../items/ItemStateConverterImplTest.java     |  22 +--
 .../core/internal/items/ItemTagTest.java      |   4 +-
 .../items/MetadataRegistryImplTest.java       |  10 +-
 .../scheduler/CronAdjusterMiscTest.java       |   2 +-
 .../internal/scheduler/CronAdjusterTest.java  |   2 +-
 .../scheduler/CronSchedulerImplTest.java      |   6 +-
 .../scheduler/DelegatedSchedulerTest.java     |   4 +-
 .../scheduler/PeriodicSchedulerImplTest.java  |   4 +-
 .../internal/scheduler/SchedulerImplTest.java |   8 +-
 .../service/ReadyServiceImplTest.java         |   8 +-
 .../StateDescriptionServiceImplTest.java      |  16 +--
 .../StateDescriptionFragmentImplTest.java     |   8 +-
 .../openhab/core/items/GenericItemTest.java   |  30 ++--
 .../openhab/core/items/MetadataKeyTest.java   |   2 +-
 .../java/org/openhab/core/items/TestItem.java |   6 +-
 .../core/items/dto/ItemDTOMapperTest.java     |  10 +-
 .../events/AbstractEventFactoryTest.java      |   4 +-
 .../items/events/ItemEventFactoryTest.java    |  24 ++--
 .../core/library/CoreItemFactoryTest.java     |   6 +-
 .../dimension/VolumetricFlowRateTest.java     |   6 +-
 .../core/library/items/CallItemTest.java      |   4 +-
 .../core/library/items/ColorItemTest.java     |  10 +-
 .../core/library/items/ContactItemTest.java   |   4 +-
 .../core/library/items/DateTimeItemTest.java  |   4 +-
 .../core/library/items/DimmerItemTest.java    |  12 +-
 .../core/library/items/ImageItemTest.java     |   6 +-
 .../core/library/items/LocationItemTest.java  |   6 +-
 .../core/library/items/NumberItemTest.java    |  26 ++--
 .../core/library/items/PlayerItemTest.java    |   6 +-
 .../library/items/RollershutterItemTest.java  |  10 +-
 .../openhab/core/library/items/StateUtil.java |  36 ++---
 .../core/library/items/StringItemTest.java    |   8 +-
 .../core/library/items/SwitchItemTest.java    |  10 +-
 .../types/ArithmeticGroupFunctionTest.java    |  18 +--
 .../types/DateTimeGroupFunctionTest.java      |  14 +-
 .../core/library/types/DateTimeTypeTest.java  |   2 +-
 .../core/library/types/DecimalTypeTest.java   |   2 +-
 .../core/library/types/HSBTypeTest.java       |   2 +-
 .../core/library/types/OnOffTypeTest.java     |   2 +-
 .../library/types/OpenClosedTypeTest.java     |   2 +-
 .../core/library/types/PercentTypeTest.java   |   4 +-
 .../core/library/types/PointTypeTest.java     |   2 +-
 ...antityTypeArithmeticGroupFunctionTest.java |  18 +--
 .../core/library/types/QuantityTypeTest.java  |  18 +--
 .../library/types/StringListTypeTest.java     |   2 +-
 .../core/library/types/StringTypeTest.java    |   2 +-
 .../core/library/types/UpDownTypeTest.java    |   2 +-
 .../core/library/unit/SmartHomeUnitsTest.java |  12 +-
 .../openhab/core/net/HttpServiceUtilTest.java |   2 +-
 .../org/openhab/core/net/NetUtilTest.java     |   2 +-
 .../types/CommandDescriptionBuilderTest.java  |   2 +-
 .../StateDescriptionFragmentBuilderTest.java  |   2 +-
 .../core/types/util/UnitUtilsTest.java        |  14 +-
 .../org/openhab/core/util/HexUtilsTest.java   |   2 +-
 .../org/openhab/core/util/UIDUtilsTest.java   |   4 +-
 .../openhab-core/src/main/feature/feature.xml |  10 +-
 .../test/internal/AbstractTestAgent.java      |  12 +-
 .../internal/AuthorizationCodeTestAgent.java  |   4 +-
 .../test/internal/ResourceOwnerTestAgent.java |   4 +-
 .../oauth2client/test/internal/TestAgent.java |  10 +-
 .../test/internal/cipher/CipherTest.java      |   4 +-
 .../console/ConsoleOAuthCommandExtension.java |  24 ++--
 .../test/AutomationIntegrationJsonTest.java   |  34 ++---
 .../test/AutomationIntegrationTest.java       |  34 ++---
 .../test/HostFragmentSupportTest.java         |   4 +-
 .../internal/module/RunRuleModuleTest.java    |  32 ++---
 .../internal/module/RuntimeRuleTest.java      |  34 ++---
 .../defaultscope/internal/ScopeTest.java      |   2 +-
 .../module/script/ScriptRuleTest.java         |  30 ++--
 .../internal/BasicConditionHandlerTest.java   |  32 ++---
 .../DayOfWeekConditionHandlerTest.java        |   2 +-
 .../timer/internal/RuntimeRuleTest.java       |  22 +--
 .../TimeOfDayConditionHandlerTest.java        |   2 +-
 .../internal/TimeOfDayTriggerHandlerTest.java |   4 +-
 .../core/automation/event/RuleEventTest.java  |  32 ++---
 .../automation/internal/RuleEngineTest.java   |  14 +-
 .../automation/internal/RuleRegistryTest.java |   2 +-
 .../internal/TestModuleTypeProvider.java      |   2 +-
 .../binding/xml/test/BindingInfoI18nTest.java |  12 +-
 .../binding/xml/test/BindingInfoTest.java     |  14 +-
 .../binding/xml/test/BindingInstaller.java    |   8 +-
 .../core/ConfigOptionRegistryOSGiTest.java    |   4 +-
 .../MDNSDiscoveryServiceOSGiTest.java         |   8 +-
 .../discovery/DiscoveryServiceMock.java       |  10 +-
 .../DiscoveryServiceMockOfBridge.java         |   8 +-
 .../DiscoveryServiceRegistryOSGiTest.java     |  12 +-
 .../inbox/DynamicThingUpdateOSGiTest.java     |  38 +++---
 .../discovery/internal/InboxOSGiTest.java     |  70 +++++-----
 .../internal/DeltaUsbSerialScannerTest.java   |   8 +-
 .../internal/PollingUsbSerialScannerTest.java |  10 +-
 .../internal/SysFsUsbSerialScannerTest.java   |   6 +-
 .../UsbSerialDeviceInformationGenerator.java  |   4 +-
 .../itest.bndrun                              |   2 +-
 .../UsbSerialDiscoveryServiceTest.java        |  22 +--
 .../UsbSerialDeviceInformationGenerator.java  |   4 +-
 .../internal/ConfigDispatcherOSGiTest.java    |   6 +-
 .../config/xml/test/BindingInstaller.java     |   8 +-
 .../xml/test/ConfigDescriptionI18nTest.java   |  12 +-
 .../xml/test/ConfigDescriptionsTest.java      |  18 +--
 .../EphemerisManagerImplOSGiTest.java         |  10 +-
 .../discovery/InboxResourceOSGITest.java      |  16 +--
 .../internal/item/ItemResourceOSGiTest.java   |  28 ++--
 .../persistence/PersistenceResourceTest.java  |  18 +--
 .../profile/ProfileTypeResourceTest.java      |  22 +--
 .../ConfigurableServiceResourceOSGiTest.java  |  10 +-
 ...hedItemDTOMapperWithTransformOSGiTest.java |  14 +-
 .../internal/folder/FolderObserverTest.java   |  14 +-
 .../internal/GenericItemProviderTest.java     |  54 ++++----
 .../internal/GenericMetadataProviderTest.java |   4 +-
 .../extensions/PersistenceExtensionsTest.java |  18 +--
 .../tests/TestPersistenceService.java         |  18 +--
 .../internal/engine/RuleExecutionTest.java    |  34 ++---
 .../internal/engine/RuleTriggerTest.java      |  20 +--
 .../script/actions/ScriptExecutionTest.java   |   8 +-
 .../script/engine/ScriptEngineOSGiTest.java   |  42 +++---
 .../script/lib/NumberExtensionsTest.java      |  10 +-
 .../scheduler/test/AbstractScheduler.java     |   2 +-
 .../script/scheduler/test/MockClosure.java    |   4 +-
 .../script/scheduler/test/MockScheduler.java  |   2 +-
 .../tests/lib/NumberExtensionsTest.java       |  20 +--
 ...enericItemChannelLinkProviderJavaTest.java |  26 ++--
 .../GenericItemChannelLinkProviderTest.java   |  20 +--
 .../test/hue/GenericThingProviderTest.java    |  32 ++---
 .../test/hue/GenericThingProviderTest2.java   |  14 +-
 .../test/hue/GenericThingProviderTest3.java   |  30 ++--
 .../test/hue/GenericThingProviderTest4.java   |  36 ++---
 .../hue/DumbThingHandlerFactory.java          |  16 +--
 .../hue/DumbThingTypeProvider.java            |  16 +--
 .../hue/TestHueChannelTypeProvider.java       |  20 +--
 .../hue/TestHueConfigDescriptionProvider.java |  10 +-
 .../hue/TestHueThingHandlerFactory.java       |  28 ++--
 .../hue/TestHueThingHandlerFactoryX.java      |  16 +--
 .../hue/TestHueThingTypeProvider.java         |  16 +--
 .../internal/JsonStorageServiceOSGiTest.java  |  14 +-
 .../core/cache/ExpiringCacheAsyncTest.java    |   4 +-
 .../internal/common/SafeCallerImplTest.java   |   6 +-
 .../events/OSGiEventManagerOSGiTest.java      |  14 +-
 .../i18n/TranslationProviderOSGiTest.java     |   8 +-
 .../internal/items/ItemUpdaterOSGiTest.java   |  24 ++--
 .../openhab/core/items/GroupItemOSGiTest.java |  58 ++++----
 .../core/items/ItemRegistryImplTest.java      |  32 ++---
 .../items/ManagedItemProviderOSGiTest.java    |  30 ++--
 .../java/org/openhab/core/items/TestItem.java |   6 +-
 .../AbstractItemEventSubscriberOSGiTest.java  |  24 ++--
 .../service/AbstractWatchServiceTest.java     |   4 +-
 .../thing/SystemWideChannelTypesTest.java     |  14 +-
 .../core/thing/ThingPropertiesTest.java       |  12 +-
 .../binding/BindingBaseClassesOSGiTest.java   |  70 +++++-----
 .../binding/ChangeThingTypeOSGiTest.java      |  64 ++++-----
 .../core/thing/binding/ThingFactoryTest.java  |  52 +++----
 .../thing/binding/firmware/FirmwareTest.java  |  10 +-
 .../thing/events/ThingEventFactoryTest.java   |  30 ++--
 .../factory/ManagedThingProviderOSGiTest.java |  18 +--
 .../core/thing/firmware/Constants.java        |  10 +-
 ...eUpdateServiceFirmwareRestrictionTest.java |  18 +--
 ...eUpdateServicePrerequisiteVersionTest.java |  16 +--
 ...strictedFirmwareUpdateServiceOSGiTest.java |  32 ++---
 ...usInfoI18nLocalizationServiceOSGiTest.java |  40 +++---
 .../CommunicationManagerOSGiTest.java         | 100 +++++++-------
 .../internal/SimpleThingTypeProvider.java     |   8 +-
 .../internal/ThingLinkManagerOSGiTest.java    |  56 ++++----
 .../internal/ThingManagerOSGiJavaTest.java    | 108 +++++++--------
 .../thing/internal/ThingManagerOSGiTest.java  | 128 +++++++++---------
 .../thing/internal/ThingRegistryOSGiTest.java |  46 +++----
 .../firmware/FirmwareRegistryOSGiTest.java    |  22 +--
 .../firmware/FirmwareUpdateServiceTest.java   |  52 +++----
 .../SystemProfileFactoryOSGiTest.java         |  28 ++--
 .../thing/link/ItemChannelLinkOSGiTest.java   |  18 +--
 .../core/thing/link/LinkEventOSGiTest.java    |  16 +--
 .../i18n/SystemProfileI18nOSGiTest.java       |  12 +-
 .../testutil/i18n/DefaultLocaleSetter.java    |   4 +-
 ...annelStateDescriptionProviderOSGiTest.java |  74 +++++-----
 .../thing/xml/test/ChannelTypesI18nTest.java  |  22 +--
 .../core/thing/xml/test/ChannelTypesTest.java |  16 +--
 .../xml/test/ConfigDescriptionsTest.java      |  16 +--
 .../core/thing/xml/test/LoadedTestBundle.java |  14 +-
 .../SystemChannelsInChannelGroupsTest.java    |  20 +--
 .../xml/test/SystemWideChannelTypesTest.java  |  20 +--
 .../thing/xml/test/ThingTypeI18nTest.java     |  22 +--
 .../core/thing/xml/test/ThingTypesTest.java   |  26 ++--
 .../ESH-INF/thing/thing-types.xml             |   2 +-
 .../core/voice/internal/AudioManagerStub.java |  14 +-
 .../core/voice/internal/AudioSourceStub.java  |  10 +-
 .../core/voice/internal/ConsoleStub.java      |   4 +-
 .../HumanLanguageInterpreterStub.java         |   6 +-
 .../core/voice/internal/KSServiceStub.java    |  14 +-
 .../core/voice/internal/STTServiceStub.java   |  14 +-
 .../openhab/core/voice/internal/SinkStub.java |  12 +-
 .../core/voice/internal/TTSServiceStub.java   |  12 +-
 .../core/voice/internal/VoiceStub.java        |   4 +-
 .../javavoicemanager/VoiceManagerTest.java    |  38 +++---
 .../InterpretCommandTest.java                 |  10 +-
 .../SayCommandTest.java                       |  24 ++--
 .../VoiceConsoleCommandExtensionTest.java     |  22 +--
 .../VoicesCommandTest.java                    |   8 +-
 pom.xml                                       |   8 +-
 ..._bindingIdCamelCase__BindingConstants.java |   2 +-
 .../__bindingIdCamelCase__Handler.java        |  12 +-
 .../__bindingIdCamelCase__HandlerFactory.java |  10 +-
 .../checkstyle/ruleset.properties             |   2 +-
 .../checkstyle/suppressions.xml               |  10 +-
 .../pmd/suppressions.properties               |  26 ++--
 .../spotbugs/suppressions.xml                 |   2 +-
 1698 files changed, 7941 insertions(+), 7941 deletions(-)

diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioException.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioException.java
index 96308788a3f..15857518084 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioException.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java
index 6351034ecf0..6ac2ae80b5b 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioFormat.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import java.util.Set;
 
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioHTTPServer.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioHTTPServer.java
index c52ee220b24..1d22f537b3c 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioHTTPServer.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioHTTPServer.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.audio.internal.AudioServlet;
+import org.openhab.core.audio.internal.AudioServlet;
 
 /**
  * This is an interface that is implemented by {@link AudioServlet} and which allows exposing audio streams through
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioManager.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioManager.java
index 72a366be92d..a07ae13f491 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioManager.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioManager.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import java.io.IOException;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.library.types.PercentType;
+import org.openhab.core.library.types.PercentType;
 
 /**
  * This service provides functionality around audio services and is the central service to be used directly by others.
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSink.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSink.java
index f7adc24bd12..16198160543 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSink.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSink.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import java.io.IOException;
 import java.util.Locale;
@@ -18,7 +18,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.library.types.PercentType;
+import org.openhab.core.library.types.PercentType;
 
 /**
  * Definition of an audio output like headphones, a speaker or for writing to
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSource.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSource.java
index 86cbc40be5c..e1b6a127a8c 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSource.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioSource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import java.util.Locale;
 import java.util.Set;
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioStream.java
index eebdba64775..f895ce5b211 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioStream.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/AudioStream.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import java.io.InputStream;
 
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/ByteArrayAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/ByteArrayAudioStream.java
index dc578682b69..8f461c4b87c 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/ByteArrayAudioStream.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/ByteArrayAudioStream.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FileAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FileAudioStream.java
index 015b6cba792..70097210d79 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FileAudioStream.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FileAudioStream.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,7 +20,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.audio.utils.AudioStreamUtils;
+import org.openhab.core.audio.utils.AudioStreamUtils;
 
 /**
  * This is an AudioStream from an audio file
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FixedLengthAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FixedLengthAudioStream.java
index 596d9df9ded..0f81614d831 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FixedLengthAudioStream.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/FixedLengthAudioStream.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import java.io.InputStream;
 
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java
index 5c823780036..1ca095e4d41 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,7 +25,7 @@
 import org.apache.commons.io.IOUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.audio.utils.AudioStreamUtils;
+import org.openhab.core.audio.utils.AudioStreamUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioFormatException.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioFormatException.java
index 0d2724e6a90..b1ff6a9aa1c 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioFormatException.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioFormatException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioStreamException.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioStreamException.java
index 6eb836a66c1..c68bc9d69d1 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioStreamException.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/UnsupportedAudioStreamException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio;
+package org.openhab.core.audio;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioConsoleCommandExtension.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioConsoleCommandExtension.java
index 89aaccb233d..4cebd55d753 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioConsoleCommandExtension.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal;
+package org.openhab.core.audio.internal;
 
 import static java.util.Comparator.comparing;
 
@@ -22,15 +22,15 @@
 import org.apache.commons.lang.ArrayUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.audio.AudioException;
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.audio.AudioSource;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.audio.AudioException;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioSource;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java
index 3f169efbf75..d0bb2b56a76 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioManagerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal;
+package org.openhab.core.audio.internal;
 
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.toList;
@@ -28,20 +28,20 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.config.core.ConfigOptionProvider;
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.audio.AudioException;
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.audio.AudioSource;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.FileAudioStream;
-import org.eclipse.smarthome.core.audio.URLAudioStream;
-import org.eclipse.smarthome.core.audio.UnsupportedAudioFormatException;
-import org.eclipse.smarthome.core.audio.UnsupportedAudioStreamException;
-import org.eclipse.smarthome.core.library.types.PercentType;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.config.core.ConfigOptionProvider;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.audio.AudioException;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioSource;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.FileAudioStream;
+import org.openhab.core.audio.URLAudioStream;
+import org.openhab.core.audio.UnsupportedAudioFormatException;
+import org.openhab.core.audio.UnsupportedAudioStreamException;
+import org.openhab.core.library.types.PercentType;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -63,8 +63,8 @@
  * @author Wouter Born - Sort audio sink and source options
  */
 @NonNullByDefault
-@Component(immediate = true, configurationPid = "org.eclipse.smarthome.audio", property = { //
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.audio", //
+@Component(immediate = true, configurationPid = "org.openhab.core.audio", property = { //
+        Constants.SERVICE_PID + "=org.openhab.core.audio", //
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", //
         ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + AudioManagerImpl.CONFIG_URI, //
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=Audio" //
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioServlet.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioServlet.java
index faf4814f86c..b633ed26826 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioServlet.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/AudioServlet.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal;
+package org.openhab.core.audio.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,12 +31,12 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.audio.AudioException;
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioHTTPServer;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.FixedLengthAudioStream;
-import org.eclipse.smarthome.io.http.servlet.SmartHomeServlet;
+import org.openhab.core.audio.AudioException;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioHTTPServer;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.FixedLengthAudioStream;
+import org.openhab.core.io.http.servlet.SmartHomeServlet;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/utils/AudioStreamUtils.java b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/utils/AudioStreamUtils.java
index c5e3344dede..de1f47cd56e 100644
--- a/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/utils/AudioStreamUtils.java
+++ b/bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/utils/AudioStreamUtils.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.utils;
+package org.openhab.core.audio.utils;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AbstractAudioServletTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AbstractAudioServletTest.java
index e10cfd85f13..9b9ca5c12d8 100644
--- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AbstractAudioServletTest.java
+++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AbstractAudioServletTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal;
+package org.openhab.core.audio.internal;
 
 import static org.junit.Assert.fail;
 
@@ -21,13 +21,13 @@
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.ByteArrayAudioStream;
-import org.eclipse.smarthome.core.audio.FixedLengthAudioStream;
-import org.eclipse.smarthome.test.TestPortUtil;
-import org.eclipse.smarthome.test.TestServer;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.ByteArrayAudioStream;
+import org.openhab.core.audio.FixedLengthAudioStream;
+import org.openhab.core.test.TestPortUtil;
+import org.openhab.core.test.TestServer;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java
index 5effb279dfa..eae9e666cb6 100644
--- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java
+++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioConsoleTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal;
+package org.openhab.core.audio.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -20,16 +20,16 @@
 import java.io.IOException;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.audio.AudioException;
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioSource;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.FileAudioStream;
-import org.eclipse.smarthome.core.audio.URLAudioStream;
-import org.eclipse.smarthome.core.audio.internal.fake.AudioSinkFake;
-import org.eclipse.smarthome.core.audio.internal.utils.BundledSoundFileHandler;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.io.console.Console;
+import org.openhab.core.audio.AudioException;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioSource;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.FileAudioStream;
+import org.openhab.core.audio.URLAudioStream;
+import org.openhab.core.audio.internal.fake.AudioSinkFake;
+import org.openhab.core.audio.internal.utils.BundledSoundFileHandler;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.io.console.Console;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioFormatTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioFormatTest.java
index ddd9fc181ad..658ca0109a9 100644
--- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioFormatTest.java
+++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioFormatTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal;
+package org.openhab.core.audio.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -18,7 +18,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioFormat;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerServletTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerServletTest.java
index 1846c710bc5..340dd9b5e6f 100644
--- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerServletTest.java
+++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerServletTest.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal;
+package org.openhab.core.audio.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.ByteArrayAudioStream;
-import org.eclipse.smarthome.core.audio.URLAudioStream;
-import org.eclipse.smarthome.core.audio.internal.fake.AudioSinkFake;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.ByteArrayAudioStream;
+import org.openhab.core.audio.URLAudioStream;
+import org.openhab.core.audio.internal.fake.AudioSinkFake;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java
index 98556ed3832..79be18c5855 100644
--- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java
+++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioManagerTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal;
+package org.openhab.core.audio.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -25,17 +25,17 @@
 import java.util.Locale;
 import java.util.function.BiFunction;
 
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.audio.AudioException;
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioSource;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.ByteArrayAudioStream;
-import org.eclipse.smarthome.core.audio.FileAudioStream;
-import org.eclipse.smarthome.core.audio.UnsupportedAudioStreamException;
-import org.eclipse.smarthome.core.audio.internal.fake.AudioSinkFake;
-import org.eclipse.smarthome.core.audio.internal.utils.BundledSoundFileHandler;
-import org.eclipse.smarthome.core.library.types.PercentType;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.audio.AudioException;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioSource;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.ByteArrayAudioStream;
+import org.openhab.core.audio.FileAudioStream;
+import org.openhab.core.audio.UnsupportedAudioStreamException;
+import org.openhab.core.audio.internal.fake.AudioSinkFake;
+import org.openhab.core.audio.internal.utils.BundledSoundFileHandler;
+import org.openhab.core.library.types.PercentType;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioServletTest.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioServletTest.java
index 9604ac20be2..377d5dbe0b1 100644
--- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioServletTest.java
+++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/AudioServletTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal;
+package org.openhab.core.audio.internal;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
@@ -21,10 +21,10 @@
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.http.HttpStatus;
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.FileAudioStream;
-import org.eclipse.smarthome.core.audio.internal.utils.BundledSoundFileHandler;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.FileAudioStream;
+import org.openhab.core.audio.internal.utils.BundledSoundFileHandler;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java
index 9779e3123b3..bdfa1feafdb 100644
--- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java
+++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/fake/AudioSinkFake.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal.fake;
+package org.openhab.core.audio.internal.fake;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -21,14 +21,14 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.FixedLengthAudioStream;
-import org.eclipse.smarthome.core.audio.URLAudioStream;
-import org.eclipse.smarthome.core.audio.UnsupportedAudioFormatException;
-import org.eclipse.smarthome.core.audio.UnsupportedAudioStreamException;
-import org.eclipse.smarthome.core.library.types.PercentType;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.FixedLengthAudioStream;
+import org.openhab.core.audio.URLAudioStream;
+import org.openhab.core.audio.UnsupportedAudioFormatException;
+import org.openhab.core.audio.UnsupportedAudioStreamException;
+import org.openhab.core.library.types.PercentType;
 
 /**
  * An {@link AudioSink} fake used for the tests.
diff --git a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/utils/BundledSoundFileHandler.java b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/utils/BundledSoundFileHandler.java
index 167b3e66926..4a070b929e0 100644
--- a/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/utils/BundledSoundFileHandler.java
+++ b/bundles/org.openhab.core.audio/src/test/java/org/openhab/core/audio/internal/utils/BundledSoundFileHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.audio.internal.utils;
+package org.openhab.core.audio.internal.utils;
 
 import java.io.Closeable;
 import java.io.File;
@@ -22,8 +22,8 @@
 import java.nio.file.Path;
 import java.util.Comparator;
 
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.core.audio.internal.AudioManagerTest;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.audio.internal.AudioManagerTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java b/bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java
index 592fd1cc10c..44deb8fe074 100644
--- a/bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java
+++ b/bundles/org.openhab.core.auth.jaas/src/main/java/org/openhab/core/auth/jaas/internal/JaasAuthenticationProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.jaas.internal;
+package org.openhab.core.auth.jaas.internal;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -26,11 +26,11 @@
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
-import org.eclipse.smarthome.core.auth.Authentication;
-import org.eclipse.smarthome.core.auth.AuthenticationException;
-import org.eclipse.smarthome.core.auth.AuthenticationProvider;
-import org.eclipse.smarthome.core.auth.Credentials;
-import org.eclipse.smarthome.core.auth.UsernamePasswordCredentials;
+import org.openhab.core.auth.Authentication;
+import org.openhab.core.auth.AuthenticationException;
+import org.openhab.core.auth.AuthenticationProvider;
+import org.openhab.core.auth.Credentials;
+import org.openhab.core.auth.UsernamePasswordCredentials;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -45,7 +45,7 @@
  * @author Łukasz Dywicki - Initial contribution
  * @author Kai Kreuzer - Removed ManagedService and used DS configuration instead
  */
-@Component(configurationPid = "org.eclipse.smarthome.jaas")
+@Component(configurationPid = "org.openhab.core.jaas")
 public class JaasAuthenticationProvider implements AuthenticationProvider {
 
     private String realmName;
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/Keyword.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/Keyword.java
index 5912cf96521..189cc1b5259 100644
--- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/Keyword.java
+++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/Keyword.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.internal;
+package org.openhab.core.auth.oauth2client.internal;
 
 /**
  * Just a place to store all the important, reused keywords.
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java
index d8c5e392d12..a6a84ac0117 100644
--- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java
+++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthClientServiceImpl.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.internal;
+package org.openhab.core.auth.oauth2client.internal;
 
-import static org.eclipse.smarthome.auth.oauth2client.internal.Keyword.*;
+import static org.openhab.core.auth.oauth2client.internal.Keyword.*;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -27,12 +27,12 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.UrlEncoded;
-import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenRefreshListener;
-import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthClientService;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthException;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthResponseException;
-import org.eclipse.smarthome.io.net.http.HttpClientFactory;
+import org.openhab.core.auth.client.oauth2.AccessTokenRefreshListener;
+import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
+import org.openhab.core.auth.client.oauth2.OAuthClientService;
+import org.openhab.core.auth.client.oauth2.OAuthException;
+import org.openhab.core.auth.client.oauth2.OAuthResponseException;
+import org.openhab.core.io.net.http.HttpClientFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,7 +41,7 @@
  *
  * It requires the following services:
  *
- * org.eclipse.smarthome.core.storage.Storage (mandatory; for storing grant tokens, access tokens and refresh tokens)
+ * org.openhab.core.storage.Storage (mandatory; for storing grant tokens, access tokens and refresh tokens)
  *
  * HttpClientFactory for http connections with Jetty
  *
@@ -83,7 +83,7 @@ private OAuthClientServiceImpl(String handle, int tokenExpiresInSeconds, HttpCli
      *
      * @param bundleContext Bundle Context
      * @param handle The handle produced previously from
-     *            {@link org.eclipse.smarthome.core.auth.client.oauth2.OAuthFactory#createOAuthClientService}
+     *            {@link org.openhab.core.auth.client.oauth2.OAuthFactory#createOAuthClientService}
      * @param storeHandler Storage handler
      * @param tokenExpiresInSeconds Positive integer; a small time buffer in seconds. It is used to calculate the expiry
      *            of the access tokens. This allows the access token to expire earlier than the
@@ -113,7 +113,7 @@ private OAuthClientServiceImpl(String handle, int tokenExpiresInSeconds, HttpCli
      *
      * @param bundleContext Bundle Context*
      * @param handle The handle produced previously from
-     *            {@link org.eclipse.smarthome.core.auth.client.oauth2.OAuthFactory#createOAuthClientService}*
+     *            {@link org.openhab.core.auth.client.oauth2.OAuthFactory#createOAuthClientService}*
      * @param storeHandler Storage handler
      * @param httpClientFactory Http client factory
      * @param persistedParams These parameters are static with respect to the oauth provider and thus can be persisted.
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java
index fb67de8c263..4ab53c43037 100644
--- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java
+++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthConnector.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.internal;
+package org.openhab.core.auth.oauth2client.internal;
 
-import static org.eclipse.smarthome.auth.oauth2client.internal.Keyword.*;
+import static org.openhab.core.auth.oauth2client.internal.Keyword.*;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -36,11 +36,11 @@
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.util.Fields;
-import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthException;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthResponseException;
-import org.eclipse.smarthome.io.net.http.HttpClientFactory;
-import org.eclipse.smarthome.io.net.http.TrustManagerProvider;
+import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
+import org.openhab.core.auth.client.oauth2.OAuthException;
+import org.openhab.core.auth.client.oauth2.OAuthResponseException;
+import org.openhab.core.io.net.http.HttpClientFactory;
+import org.openhab.core.io.net.http.TrustManagerProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthFactoryImpl.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthFactoryImpl.java
index de5f9b3c222..6be1923308e 100644
--- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthFactoryImpl.java
+++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthFactoryImpl.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.internal;
+package org.openhab.core.auth.oauth2client.internal;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthClientService;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthException;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthFactory;
-import org.eclipse.smarthome.io.net.http.HttpClientFactory;
+import org.openhab.core.auth.client.oauth2.OAuthClientService;
+import org.openhab.core.auth.client.oauth2.OAuthException;
+import org.openhab.core.auth.client.oauth2.OAuthFactory;
+import org.openhab.core.io.net.http.HttpClientFactory;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandler.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandler.java
index 269c3b822a2..2265547272b 100644
--- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandler.java
+++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandler.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.internal;
+package org.openhab.core.auth.oauth2client.internal;
 
 import java.security.GeneralSecurityException;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
+import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
 
 /**
  * This is for OAuth client internal use.
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandlerImpl.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandlerImpl.java
index 128825a0632..44d73d6ef40 100644
--- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandlerImpl.java
+++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/OAuthStoreHandlerImpl.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.internal;
+package org.openhab.core.auth.oauth2client.internal;
 
-import static org.eclipse.smarthome.auth.oauth2client.internal.StorageRecordType.*;
+import static org.openhab.core.auth.oauth2client.internal.StorageRecordType.*;
 
 import java.security.GeneralSecurityException;
 import java.time.LocalDateTime;
@@ -28,11 +28,11 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.auth.oauth2client.internal.cipher.SymmetricKeyCipher;
-import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
-import org.eclipse.smarthome.core.auth.client.oauth2.StorageCipher;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.auth.oauth2client.internal.cipher.SymmetricKeyCipher;
+import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
+import org.openhab.core.auth.client.oauth2.StorageCipher;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/PersistedParams.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/PersistedParams.java
index a5758f0f590..ac817f1002b 100644
--- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/PersistedParams.java
+++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/PersistedParams.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.internal;
+package org.openhab.core.auth.oauth2client.internal;
 
 import org.eclipse.jdt.annotation.Nullable;
 
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/StorageRecordType.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/StorageRecordType.java
index 1665268963e..ab2b0f9c748 100644
--- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/StorageRecordType.java
+++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/StorageRecordType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.internal;
+package org.openhab.core.auth.oauth2client.internal;
 
 import org.eclipse.jdt.annotation.NonNull;
 
diff --git a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java
index 572d721f88f..247fdc4a069 100644
--- a/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java
+++ b/bundles/org.openhab.core.auth.oauth2client/src/main/java/org/openhab/core/auth/oauth2client/internal/cipher/SymmetricKeyCipher.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.internal.cipher;
+package org.openhab.core.auth.oauth2client.internal.cipher;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -29,7 +29,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.auth.client.oauth2.StorageCipher;
+import org.openhab.core.auth.client.oauth2.StorageCipher;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.annotations.Activate;
diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaActionTypeProvider.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaActionTypeProvider.java
index d2d14a17d0e..324569b5aed 100644
--- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaActionTypeProvider.java
+++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaActionTypeProvider.java
@@ -24,14 +24,14 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.Visibility;
 import org.openhab.core.automation.type.ActionType;
 import org.openhab.core.automation.type.ModuleType;
diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java
index 65068d6e818..9d77c89f286 100644
--- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java
+++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaModuleHandlerFactory.java
@@ -17,8 +17,8 @@
 
 import java.util.Collection;
 
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.core.voice.VoiceManager;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.voice.VoiceManager;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.handler.BaseModuleHandlerFactory;
diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java
index f0df0e384dc..a0aaabc36d4 100644
--- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java
+++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/MediaScriptScopeProvider.java
@@ -17,8 +17,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.core.voice.VoiceManager;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.voice.VoiceManager;
 import org.openhab.core.automation.module.script.ScriptExtensionProvider;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/PlayActionHandler.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/PlayActionHandler.java
index 09fd906a8a1..e0aac87ee19 100644
--- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/PlayActionHandler.java
+++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/PlayActionHandler.java
@@ -14,8 +14,8 @@
 
 import java.util.Map;
 
-import org.eclipse.smarthome.core.audio.AudioException;
-import org.eclipse.smarthome.core.audio.AudioManager;
+import org.openhab.core.audio.AudioException;
+import org.openhab.core.audio.AudioManager;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.handler.BaseActionModuleHandler;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/SayActionHandler.java b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/SayActionHandler.java
index de92b74c9b2..9c9f206285e 100644
--- a/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/SayActionHandler.java
+++ b/bundles/org.openhab.core.automation.module.media/src/main/java/org/openhab/core/automation/module/media/internal/SayActionHandler.java
@@ -14,7 +14,7 @@
 
 import java.util.Map;
 
-import org.eclipse.smarthome.core.voice.VoiceManager;
+import org.openhab.core.voice.VoiceManager;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.handler.BaseActionModuleHandler;
 
diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/RuleSupportScriptExtension.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/RuleSupportScriptExtension.java
index 63646df3044..5cb1f4a02d1 100644
--- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/RuleSupportScriptExtension.java
+++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/RuleSupportScriptExtension.java
@@ -21,8 +21,8 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Rule;
diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/ScriptedCustomModuleTypeProvider.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/ScriptedCustomModuleTypeProvider.java
index 15fa9b0a7fd..4ed8ccfa743 100644
--- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/ScriptedCustomModuleTypeProvider.java
+++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/ScriptedCustomModuleTypeProvider.java
@@ -21,7 +21,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.type.ModuleType;
 import org.openhab.core.automation.type.ModuleTypeProvider;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java
index 7651acab85a..d6e0b0aadbb 100644
--- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java
+++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java
@@ -35,8 +35,8 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.core.service.AbstractWatchService;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.service.AbstractWatchService;
 import org.openhab.core.automation.module.script.ScriptEngineContainer;
 import org.openhab.core.automation.module.script.ScriptEngineManager;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/RuleSupportRuleRegistryDelegate.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/RuleSupportRuleRegistryDelegate.java
index 1c6a949f76a..47bebec2786 100644
--- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/RuleSupportRuleRegistryDelegate.java
+++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/RuleSupportRuleRegistryDelegate.java
@@ -19,7 +19,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
+import org.openhab.core.common.registry.RegistryChangeListener;
 import org.openhab.core.automation.Rule;
 import org.openhab.core.automation.RuleRegistry;
 
diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedAutomationManager.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedAutomationManager.java
index fa8819e66e8..2f1617c8ffe 100644
--- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedAutomationManager.java
+++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedAutomationManager.java
@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Rule;
diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedRuleProvider.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedRuleProvider.java
index 5df78a55940..14666c886d6 100644
--- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedRuleProvider.java
+++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedRuleProvider.java
@@ -17,7 +17,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.Rule;
 import org.openhab.core.automation.RuleProvider;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/simple/SimpleRule.java b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/simple/SimpleRule.java
index a1b34cb5d21..cc74f9452a1 100644
--- a/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/simple/SimpleRule.java
+++ b/bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/simple/SimpleRule.java
@@ -20,8 +20,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java
index 10a09762e69..342f623a299 100644
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/DefaultScriptScopeProvider.java
@@ -22,36 +22,36 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.IncreaseDecreaseType;
-import org.eclipse.smarthome.core.library.types.NextPreviousType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.OpenClosedType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.PlayPauseType;
-import org.eclipse.smarthome.core.library.types.PointType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.types.RawType;
-import org.eclipse.smarthome.core.library.types.RewindFastforwardType;
-import org.eclipse.smarthome.core.library.types.StopMoveType;
-import org.eclipse.smarthome.core.library.types.StringListType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.library.types.UpDownType;
-import org.eclipse.smarthome.core.library.unit.BinaryPrefix;
-import org.eclipse.smarthome.core.library.unit.ImperialUnits;
-import org.eclipse.smarthome.core.library.unit.MetricPrefix;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.binding.ThingActions;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.IncreaseDecreaseType;
+import org.openhab.core.library.types.NextPreviousType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.OpenClosedType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.library.types.PointType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.types.RawType;
+import org.openhab.core.library.types.RewindFastforwardType;
+import org.openhab.core.library.types.StopMoveType;
+import org.openhab.core.library.types.StringListType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.library.types.UpDownType;
+import org.openhab.core.library.unit.BinaryPrefix;
+import org.openhab.core.library.unit.ImperialUnits;
+import org.openhab.core.library.unit.MetricPrefix;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.SmartHomeUnits;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.binding.ThingActions;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 import org.openhab.core.automation.RuleRegistry;
 import org.openhab.core.automation.module.script.ScriptExtensionProvider;
 import org.osgi.service.component.annotations.Activate;
diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java
index 8a82259c450..84ee00c01b6 100644
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java
@@ -18,10 +18,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.types.State;
 
 /**
  * This is a helper class that can be added to script scopes. It provides easy access to the current item states.
diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptBusEvent.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptBusEvent.java
index c3f6261cb59..84dc902f898 100644
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptBusEvent.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptBusEvent.java
@@ -16,15 +16,15 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.TypeParser;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.TypeParser;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptThingActions.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptThingActions.java
index a950089f5ed..4b6b720501e 100644
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptThingActions.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptThingActions.java
@@ -15,12 +15,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingActions;
-import org.eclipse.smarthome.core.thing.binding.ThingActionsScope;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingActions;
+import org.openhab.core.thing.binding.ThingActionsScope;
+import org.openhab.core.thing.binding.ThingHandler;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
index 63633551e20..5ff20c5d3f2 100644
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
@@ -22,7 +22,7 @@
 import javax.script.ScriptEngine;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.handler.BaseModuleHandler;
 import org.openhab.core.automation.module.script.ScriptEngineContainer;
diff --git a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/provider/ScriptModuleTypeProvider.java b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/provider/ScriptModuleTypeProvider.java
index e582a38206d..d6b2a2ef583 100755
--- a/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/provider/ScriptModuleTypeProvider.java
+++ b/bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/provider/ScriptModuleTypeProvider.java
@@ -23,11 +23,11 @@
 
 import javax.script.ScriptEngine;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.Visibility;
 import org.openhab.core.automation.module.script.ScriptEngineFactory;
 import org.openhab.core.automation.module.script.internal.handler.AbstractScriptModuleHandler;
diff --git a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/ModuleTypeResource.java b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/ModuleTypeResource.java
index 8c61ecf6111..d84f7035466 100644
--- a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/ModuleTypeResource.java
+++ b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/ModuleTypeResource.java
@@ -30,8 +30,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
 import org.openhab.core.automation.dto.ActionTypeDTOMapper;
 import org.openhab.core.automation.dto.ConditionTypeDTOMapper;
 import org.openhab.core.automation.dto.ModuleTypeDTO;
diff --git a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/RuleResource.java b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/RuleResource.java
index 90db8a1bfcd..0e3d0fc7cd5 100644
--- a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/RuleResource.java
+++ b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/RuleResource.java
@@ -37,10 +37,10 @@
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.smarthome.config.core.ConfigUtil;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.config.core.ConfigUtil;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.RESTResource;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/TemplateResource.java b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/TemplateResource.java
index 2e031bd8e32..04cf09cf92f 100644
--- a/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/TemplateResource.java
+++ b/bundles/org.openhab.core.automation.rest/src/main/java/org/openhab/core/automation/rest/internal/TemplateResource.java
@@ -29,8 +29,8 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
 import org.openhab.core.automation.dto.RuleTemplateDTO;
 import org.openhab.core.automation.dto.RuleTemplateDTOMapper;
 import org.openhab.core.automation.template.RuleTemplate;
diff --git a/bundles/org.openhab.core.automation/README.md b/bundles/org.openhab.core.automation/README.md
index 66b17075fc6..1ac5786477f 100644
--- a/bundles/org.openhab.core.automation/README.md
+++ b/bundles/org.openhab.core.automation/README.md
@@ -22,7 +22,7 @@ Its category should also be `RuleActions`.
 
 ### Thing
 
-For actions that need access to the logic of a `ThingHandler`, one has to implement a service which implements the `org.eclipse.smarthome.core.thing.binding.AnnotatedActionThingHandlerService` interface.
+For actions that need access to the logic of a `ThingHandler`, one has to implement a service which implements the `org.openhab.core.thing.binding.AnnotatedActionThingHandlerService` interface.
 The `ThingHandler` has to override the `Collection<Class> getServices()` method from the `BaseThingHandler` and return the class of the aforementioned service.
 The framework takes care of registering and un-registering of that service.
 
@@ -45,4 +45,4 @@ Within the implementation of the method, only those output names which are speci
 
 ## Examples
 
-For examples, please see the package `org.eclipse.smarthome.magic.binding.internal.automation.modules` inside the `org.eclipse.smarthome.magic` bundle.
+For examples, please see the package `org.openhab.core.magic.binding.internal.automation.modules` inside the `org.openhab.core.magic` bundle.
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Action.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Action.java
index 2cd396c0d09..3a12ce60464 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Action.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Action.java
@@ -15,7 +15,7 @@
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.automation.type.ActionType;
 import org.openhab.core.automation.type.Input;
 import org.openhab.core.automation.type.Output;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Condition.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Condition.java
index fc9304d8c6f..65071bff2dc 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Condition.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Condition.java
@@ -15,7 +15,7 @@
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.automation.type.ConditionType;
 import org.openhab.core.automation.type.Input;
 import org.openhab.core.automation.type.Output;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ManagedRuleProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ManagedRuleProvider.java
index a6b9e4e954d..1c272db3132 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ManagedRuleProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ManagedRuleProvider.java
@@ -12,8 +12,8 @@
  */
 package org.openhab.core.automation;
 
-import org.eclipse.smarthome.core.common.registry.AbstractManagedProvider;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.common.registry.AbstractManagedProvider;
+import org.openhab.core.storage.StorageService;
 import org.openhab.core.automation.dto.RuleDTO;
 import org.openhab.core.automation.dto.RuleDTOMapper;
 import org.osgi.service.component.annotations.Activate;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Module.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Module.java
index 9c10796eefb..41306d951be 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Module.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Module.java
@@ -14,8 +14,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.type.Input;
 import org.openhab.core.automation.type.ModuleType;
 import org.openhab.core.automation.type.Output;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ModuleHandlerCallback.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ModuleHandlerCallback.java
index 2e037b1dc61..db9c077680d 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ModuleHandlerCallback.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/ModuleHandlerCallback.java
@@ -16,7 +16,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
+import org.openhab.core.common.registry.RegistryChangeListener;
 
 /**
  * This class is responsible to provide a {@link RegistryChangeListener} logic. A instance of it is added to
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Rule.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Rule.java
index 69603415db1..0271e878680 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Rule.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Rule.java
@@ -17,9 +17,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.Identifiable;
 import org.openhab.core.automation.template.RuleTemplate;
 
 /**
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleManager.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleManager.java
index 4102246848b..14385b56db0 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleManager.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleManager.java
@@ -16,7 +16,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
+import org.openhab.core.common.registry.RegistryChangeListener;
 
 /**
  * This class is responsible to provide a {@link RegistryChangeListener} logic. A instance of it is added to
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleProvider.java
index 484cfa87a70..6b38cfd8042 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleProvider.java
@@ -13,7 +13,7 @@
 package org.openhab.core.automation;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.Provider;
+import org.openhab.core.common.registry.Provider;
 
 /**
  * This class is responsible for providing {@link Rule}s. {@link RuleProvider}s are tracked by the {@link RuleRegistry}
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleRegistry.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleRegistry.java
index 30449bb7d5c..103b1ceedbd 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleRegistry.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/RuleRegistry.java
@@ -16,7 +16,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Registry;
+import org.openhab.core.common.registry.Registry;
 
 /**
  * The {@link RuleRegistry} provides basic functionality for managing {@link Rule}s.
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Trigger.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Trigger.java
index 7f080bf9ea1..b69f346604e 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Trigger.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/Trigger.java
@@ -13,7 +13,7 @@
 package org.openhab.core.automation;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.automation.type.Input;
 import org.openhab.core.automation.type.Output;
 import org.openhab.core.automation.type.TriggerType;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionDTOMapper.java
index 5664158b7d0..96ff6b43613 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionDTOMapper.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionDTOMapper.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.util.ModuleBuilder;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionTypeDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionTypeDTOMapper.java
index 438b7592dca..0b0d29a92fe 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionTypeDTOMapper.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ActionTypeDTOMapper.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
 import org.openhab.core.automation.type.ActionType;
 import org.openhab.core.automation.type.CompositeActionType;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionDTOMapper.java
index 1efa638b919..d834986c77f 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionDTOMapper.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionDTOMapper.java
@@ -15,7 +15,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.util.ModuleBuilder;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionTypeDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionTypeDTOMapper.java
index f755dc2c70c..e510298a6d4 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionTypeDTOMapper.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ConditionTypeDTOMapper.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
 import org.openhab.core.automation.type.CompositeConditionType;
 import org.openhab.core.automation.type.ConditionType;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTO.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTO.java
index 268b9ee3c0c..c7fee6ef915 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTO.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTO.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
 import org.openhab.core.automation.Visibility;
 
 /**
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTOMapper.java
index ecff79e5405..8f1f72764e4 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTOMapper.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/ModuleTypeDTOMapper.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.core.automation.dto;
 
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
 import org.openhab.core.automation.dto.ModuleTypeDTO;
 import org.openhab.core.automation.type.ModuleType;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTO.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTO.java
index b04ff695890..ef9825fac1d 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTO.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTO.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
 import org.openhab.core.automation.Visibility;
 
 /**
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTOMapper.java
index fa9305d4af6..2a5e25e611b 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTOMapper.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleDTOMapper.java
@@ -12,8 +12,8 @@
  */
 package org.openhab.core.automation.dto;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
 import org.openhab.core.automation.Rule;
 import org.openhab.core.automation.dto.RuleDTO;
 import org.openhab.core.automation.util.RuleBuilder;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTO.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTO.java
index ac33909eba7..2dff019ae70 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTO.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTO.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
 import org.openhab.core.automation.Visibility;
 
 /**
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTOMapper.java
index 7e978886fae..62850d65a48 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTOMapper.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/RuleTemplateDTOMapper.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.core.automation.dto;
 
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
 import org.openhab.core.automation.dto.RuleTemplateDTO;
 import org.openhab.core.automation.template.RuleTemplate;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerDTOMapper.java
index 12eb5dcf908..c9115c54b8e 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerDTOMapper.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerDTOMapper.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.util.ModuleBuilder;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerTypeDTOMapper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerTypeDTOMapper.java
index 9d5652243d5..939f64b5591 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerTypeDTOMapper.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/dto/TriggerTypeDTOMapper.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
 import org.openhab.core.automation.type.CompositeTriggerType;
 import org.openhab.core.automation.type.TriggerType;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/AbstractRuleRegistryEvent.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/AbstractRuleRegistryEvent.java
index 915df16b210..a56f1e0836a 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/AbstractRuleRegistryEvent.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/AbstractRuleRegistryEvent.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.core.automation.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
+import org.openhab.core.events.AbstractEvent;
 import org.openhab.core.automation.dto.RuleDTO;
 
 /**
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/RuleStatusInfoEvent.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/RuleStatusInfoEvent.java
index 59efc858c23..2746b90f2dd 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/RuleStatusInfoEvent.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/events/RuleStatusInfoEvent.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.core.automation.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
+import org.openhab.core.events.AbstractEvent;
 import org.openhab.core.automation.RuleStatusInfo;
 
 /**
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ActionImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ActionImpl.java
index f100b8bec82..95ef0ba2edc 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ActionImpl.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ActionImpl.java
@@ -17,7 +17,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.type.Input;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/Automation.ucls b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/Automation.ucls
index 2c65aa3cab6..942d407e50c 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/Automation.ucls
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/Automation.ucls
@@ -3,7 +3,7 @@
   associations="true" dependencies="true" nesting-relationships="true" router="FAN">  
   <interface id="1" language="java" name="org.openhab.core.automation.RuleProvider" 
     project="org.openhab.core.automation.api" 
-    file="/org.openhab.core.automation.api/src/main/java/org/eclipse/smarthome/automation/RuleProvider.java" 
+    file="/org.openhab.core.automation.api/src/main/java/org/openhab/core/automation/RuleProvider.java" 
     binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="997" y="197"/>    
     <display autosize="false" stereotype="false" package="false" initial-value="false" signature="false" 
@@ -14,7 +14,7 @@
   </interface>  
   <interface id="2" language="java" name="org.openhab.core.automation.handler.ModuleHandlerFactory" 
     project="org.openhab.core.automation.api" 
-    file="/org.openhab.core.automation.api/src/main/java/org/eclipse/smarthome/automation/handler/ModuleHandlerFactory.java" 
+    file="/org.openhab.core.automation.api/src/main/java/org/openhab/core/automation/handler/ModuleHandlerFactory.java" 
     binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="580" y="72"/>    
     <display autosize="false" stereotype="false" package="false" initial-value="false" signature="false" 
@@ -25,7 +25,7 @@
   </interface>  
   <class id="3" language="java" name="org.openhab.core.automation.core.ManagedRuleProvider" 
     project="org.openhab.core.automation.core" 
-    file="/org.openhab.core.automation.core/src/main/java/org/eclipse/smarthome/automation/core/ManagedRuleProvider.java" 
+    file="/org.openhab.core.automation.core/src/main/java/org/openhab/core/automation/core/ManagedRuleProvider.java" 
     binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="883" y="29"/>    
     <display autosize="false" stereotype="false" package="false" initial-value="false" signature="false" 
@@ -36,7 +36,7 @@
   </class>  
   <interface id="4" language="java" name="org.openhab.core.automation.handler.ModuleHandler" 
     project="org.openhab.core.automation.api" 
-    file="/org.openhab.core.automation.api/src/main/java/org/eclipse/smarthome/automation/handler/ModuleHandler.java" 
+    file="/org.openhab.core.automation.api/src/main/java/org/openhab/core/automation/handler/ModuleHandler.java" 
     binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="371" y="-60"/>    
     <display autosize="false" stereotype="false" package="false" initial-value="false" signature="false" 
@@ -47,7 +47,7 @@
   </interface>  
   <class id="5" language="java" name="org.openhab.core.automation.core.internal.RuleEngineCallbackImpl.TriggerData" 
     project="org.openhab.core.automation.core" 
-    file="/org.openhab.core.automation.core/src/main/java/org/eclipse/smarthome/automation/core/internal/RuleEngineCallbackImpl.java" 
+    file="/org.openhab.core.automation.core/src/main/java/org/openhab/core/automation/core/internal/RuleEngineCallbackImpl.java" 
     binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="99" y="558"/>    
     <display autosize="false" stereotype="false" package="false" initial-value="false" signature="false" 
@@ -58,7 +58,7 @@
   </class>  
   <class id="6" language="java" name="org.openhab.core.automation.core.internal.RuleEngineCallbackImpl" 
     project="org.openhab.core.automation.core" 
-    file="/org.openhab.core.automation.core/src/main/java/org/eclipse/smarthome/automation/core/internal/RuleEngineCallbackImpl.java" 
+    file="/org.openhab.core.automation.core/src/main/java/org/openhab/core/automation/core/internal/RuleEngineCallbackImpl.java" 
     binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="102" y="257"/>    
     <display autosize="false" stereotype="false" package="false" initial-value="false" signature="false" 
@@ -69,7 +69,7 @@
   </class>  
   <class id="7" language="java" name="org.openhab.core.automation.core.internal.RuleEngineImpl" 
     project="org.openhab.core.automation.core" 
-    file="/org.openhab.core.automation.core/src/main/java/org/eclipse/smarthome/automation/core/internal/RuleEngineImpl.java" 
+    file="/org.openhab.core.automation.core/src/main/java/org/openhab/core/automation/core/internal/RuleEngineImpl.java" 
     binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="345" y="573"/>    
     <display autosize="false" stereotype="false" package="false" initial-value="false" signature="false" 
@@ -80,7 +80,7 @@
   </class>  
   <class id="8" language="java" name="org.openhab.core.automation.core.internal.RuleRegistryImpl" 
     project="org.openhab.core.automation.core" 
-    file="/org.openhab.core.automation.core/src/main/java/org/eclipse/smarthome/automation/core/internal/RuleRegistryImpl.java" 
+    file="/org.openhab.core.automation.core/src/main/java/org/openhab/core/automation/core/internal/RuleRegistryImpl.java" 
     binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="928" y="766"/>    
     <display autosize="false" stereotype="false" package="false" initial-value="false" signature="false" 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ConditionImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ConditionImpl.java
index 06df7ac851c..506a14553db 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ConditionImpl.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ConditionImpl.java
@@ -17,7 +17,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.type.Input;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ModuleImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ModuleImpl.java
index 2b7f647ab6c..dc50dd864e7 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ModuleImpl.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/ModuleImpl.java
@@ -13,8 +13,8 @@
 package org.openhab.core.automation.internal;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.Rule;
 import org.openhab.core.automation.type.Input;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEngineImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEngineImpl.java
index ef4a383e7e4..ee2d4156840 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEngineImpl.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEngineImpl.java
@@ -31,11 +31,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEventFactory.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEventFactory.java
index 16903958c65..4f5f15affac 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEventFactory.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEventFactory.java
@@ -17,9 +17,9 @@
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.events.AbstractEventFactory;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
+import org.openhab.core.events.AbstractEventFactory;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
 import org.openhab.core.automation.Rule;
 import org.openhab.core.automation.RuleStatusInfo;
 import org.openhab.core.automation.dto.RuleDTO;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleImpl.java
index c0cff4888fb..7f25d094d7e 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleImpl.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleImpl.java
@@ -21,8 +21,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleRegistryImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleRegistryImpl.java
index d6366b4c030..3209827f708 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleRegistryImpl.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleRegistryImpl.java
@@ -25,14 +25,14 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.AbstractRegistry;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.AbstractRegistry;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.storage.StorageService;
 import org.openhab.core.automation.ManagedRuleProvider;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.Rule;
@@ -247,21 +247,21 @@ protected void notifyListenersAboutUpdatedElement(Rule oldElement, Rule element)
     }
 
     /**
-     * @see RuleRegistryImpl#postEvent(org.eclipse.smarthome.core.events.Event)
+     * @see RuleRegistryImpl#postEvent(org.openhab.core.events.Event)
      */
     protected void postRuleAddedEvent(Rule rule) {
         postEvent(RuleEventFactory.createRuleAddedEvent(rule, SOURCE));
     }
 
     /**
-     * @see RuleRegistryImpl#postEvent(org.eclipse.smarthome.core.events.Event)
+     * @see RuleRegistryImpl#postEvent(org.openhab.core.events.Event)
      */
     protected void postRuleRemovedEvent(Rule rule) {
         postEvent(RuleEventFactory.createRuleRemovedEvent(rule, SOURCE));
     }
 
     /**
-     * @see RuleRegistryImpl#postEvent(org.eclipse.smarthome.core.events.Event)
+     * @see RuleRegistryImpl#postEvent(org.openhab.core.events.Event)
      */
     protected void postRuleUpdatedEvent(Rule rule, Rule oldRule) {
         postEvent(RuleEventFactory.createRuleUpdatedEvent(rule, oldRule, SOURCE));
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/TriggerImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/TriggerImpl.java
index bd03dffe8e7..bf5fc2a9e34 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/TriggerImpl.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/TriggerImpl.java
@@ -14,7 +14,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Trigger;
 
 /**
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/AbstractCommandProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/AbstractCommandProvider.java
index 23037ac5130..80144a6d340 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/AbstractCommandProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/AbstractCommandProvider.java
@@ -25,7 +25,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.parser.Parser;
 import org.openhab.core.automation.parser.ParsingException;
 import org.openhab.core.automation.template.TemplateProvider;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/AutomationCommandsPluggable.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/AutomationCommandsPluggable.java
index 50fea47e7ff..630766935b9 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/AutomationCommandsPluggable.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/AutomationCommandsPluggable.java
@@ -22,8 +22,8 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.openhab.core.automation.Rule;
 import org.openhab.core.automation.RuleManager;
 import org.openhab.core.automation.RuleRegistry;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/CommandlineModuleTypeProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/CommandlineModuleTypeProvider.java
index 76f994a10cc..b0fef5da08a 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/CommandlineModuleTypeProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/CommandlineModuleTypeProvider.java
@@ -28,7 +28,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.parser.Parser;
 import org.openhab.core.automation.parser.ParsingException;
 import org.openhab.core.automation.parser.ParsingNestedException;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/CommandlineTemplateProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/CommandlineTemplateProvider.java
index bd3b4ebdc06..0bbeb95aa86 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/CommandlineTemplateProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/CommandlineTemplateProvider.java
@@ -26,7 +26,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.parser.Parser;
 import org.openhab.core.automation.parser.ParsingException;
 import org.openhab.core.automation.parser.ParsingNestedException;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/Printer.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/Printer.java
index 9cc6a4ed0ea..6ce895f1d63 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/Printer.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/Printer.java
@@ -19,9 +19,9 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.FilterCriteria;
-import org.eclipse.smarthome.config.core.ParameterOption;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.FilterCriteria;
+import org.openhab.core.config.core.ParameterOption;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/composite/CompositeModuleHandlerFactory.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/composite/CompositeModuleHandlerFactory.java
index 9d6488fa753..9db98d567e2 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/composite/CompositeModuleHandlerFactory.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/composite/CompositeModuleHandlerFactory.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/CoreModuleHandlerFactory.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/CoreModuleHandlerFactory.java
index 3e29e53c03e..e968b66ff43 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/CoreModuleHandlerFactory.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/CoreModuleHandlerFactory.java
@@ -15,8 +15,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.ItemRegistry;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.ItemRegistry;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactory.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactory.java
index 8e34da0f0ac..9bd358bed64 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactory.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/factory/EphemerisModuleHandlerFactory.java
@@ -19,7 +19,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.ephemeris.EphemerisManager;
+import org.openhab.core.ephemeris.EphemerisManager;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.handler.BaseModuleHandlerFactory;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ChannelEventTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ChannelEventTriggerHandler.java
index 9018671c2e6..ba9eeb52e71 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ChannelEventTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ChannelEventTriggerHandler.java
@@ -19,10 +19,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.thing.events.ChannelTriggeredEvent;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.thing.events.ChannelTriggeredEvent;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.handler.BaseTriggerModuleHandler;
 import org.openhab.core.automation.handler.TriggerHandlerCallback;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/CompareConditionHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/CompareConditionHandler.java
index f80cbaa3a85..f250988a6cf 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/CompareConditionHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/CompareConditionHandler.java
@@ -18,8 +18,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.TypeParser;
+import org.openhab.core.types.State;
+import org.openhab.core.types.TypeParser;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.handler.BaseConditionModuleHandler;
 import org.openhab.core.automation.internal.module.exception.UncomparableException;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/EphemerisConditionHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/EphemerisConditionHandler.java
index 6347632efa6..e2cd91fb129 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/EphemerisConditionHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/EphemerisConditionHandler.java
@@ -17,8 +17,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.ephemeris.EphemerisManager;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.ephemeris.EphemerisManager;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.handler.BaseModuleHandler;
 import org.openhab.core.automation.handler.ConditionHandler;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericCronTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericCronTriggerHandler.java
index 38b3b3e419f..17bed011cf1 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericCronTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericCronTriggerHandler.java
@@ -12,13 +12,13 @@
  */
 package org.openhab.core.automation.internal.module.handler;
 
-import org.eclipse.smarthome.core.scheduler.CronScheduler;
-import org.eclipse.smarthome.core.scheduler.SchedulerRunnable;
+import org.openhab.core.scheduler.CronScheduler;
+import org.openhab.core.scheduler.SchedulerRunnable;
 import org.openhab.core.automation.ModuleHandlerCallback;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.handler.BaseTriggerModuleHandler;
 import org.openhab.core.automation.handler.TriggerHandlerCallback;
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventConditionHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventConditionHandler.java
index 011b57c0561..346d830843a 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventConditionHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventConditionHandler.java
@@ -14,7 +14,7 @@
 
 import java.util.Map;
 
-import org.eclipse.smarthome.core.events.Event;
+import org.openhab.core.events.Event;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.handler.BaseConditionModuleHandler;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventTriggerHandler.java
index 4e1c89699c8..78934b88397 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/GenericEventTriggerHandler.java
@@ -21,9 +21,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.handler.BaseTriggerModuleHandler;
 import org.openhab.core.automation.handler.TriggerHandlerCallback;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandActionHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandActionHandler.java
index 2573bad119a..86daa8f2026 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandActionHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandActionHandler.java
@@ -14,14 +14,14 @@
 
 import java.util.Map;
 
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.TypeParser;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.TypeParser;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.handler.BaseActionModuleHandler;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandTriggerHandler.java
index 3338011c09a..014ab9926e3 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemCommandTriggerHandler.java
@@ -19,11 +19,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.types.Command;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.handler.BaseTriggerModuleHandler;
 import org.openhab.core.automation.handler.TriggerHandlerCallback;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateConditionHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateConditionHandler.java
index fc85212fbf8..283de0716ff 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateConditionHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateConditionHandler.java
@@ -14,12 +14,12 @@
 
 import java.util.Map;
 
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.TypeParser;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.TypeParser;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.handler.BaseConditionModuleHandler;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateTriggerHandler.java
index 80dcf5717cb..138f89d1b1e 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ItemStateTriggerHandler.java
@@ -20,13 +20,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.events.GroupItemStateChangedEvent;
-import org.eclipse.smarthome.core.items.events.ItemStateChangedEvent;
-import org.eclipse.smarthome.core.items.events.ItemStateEvent;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.events.GroupItemStateChangedEvent;
+import org.openhab.core.items.events.ItemStateChangedEvent;
+import org.openhab.core.items.events.ItemStateEvent;
+import org.openhab.core.types.State;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.handler.BaseTriggerModuleHandler;
 import org.openhab.core.automation.handler.TriggerHandlerCallback;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/RuleEnablementActionHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/RuleEnablementActionHandler.java
index 5b90fdba4c0..ccc44af25f4 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/RuleEnablementActionHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/RuleEnablementActionHandler.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.RuleRegistry;
 import org.openhab.core.automation.handler.BaseActionModuleHandler;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/RunRuleActionHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/RunRuleActionHandler.java
index b17dec792cb..4cb2ee54d7a 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/RunRuleActionHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/RunRuleActionHandler.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.handler.BaseActionModuleHandler;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ThingStatusTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ThingStatusTriggerHandler.java
index 82a6e6cde79..dc85333e403 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ThingStatusTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/ThingStatusTriggerHandler.java
@@ -21,12 +21,12 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.events.ThingStatusInfoChangedEvent;
-import org.eclipse.smarthome.core.thing.events.ThingStatusInfoEvent;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.events.ThingStatusInfoChangedEvent;
+import org.openhab.core.thing.events.ThingStatusInfoEvent;
 import org.openhab.core.automation.ModuleHandlerCallback;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.handler.BaseTriggerModuleHandler;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimeOfDayConditionHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimeOfDayConditionHandler.java
index 53b726bd971..92a7cef4b4e 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimeOfDayConditionHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimeOfDayConditionHandler.java
@@ -16,7 +16,7 @@
 import java.time.temporal.ChronoUnit;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.handler.BaseConditionModuleHandler;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimeOfDayTriggerHandler.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimeOfDayTriggerHandler.java
index b737de490cb..a48784a7c15 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimeOfDayTriggerHandler.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimeOfDayTriggerHandler.java
@@ -14,9 +14,9 @@
 
 import java.text.MessageFormat;
 
-import org.eclipse.smarthome.core.scheduler.CronScheduler;
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
-import org.eclipse.smarthome.core.scheduler.SchedulerRunnable;
+import org.openhab.core.scheduler.CronScheduler;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.scheduler.SchedulerRunnable;
 import org.openhab.core.automation.ModuleHandlerCallback;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.handler.BaseTriggerModuleHandler;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimerModuleHandlerFactory.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimerModuleHandlerFactory.java
index a973ad25caa..63b18754fad 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimerModuleHandlerFactory.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/handler/TimerModuleHandlerFactory.java
@@ -15,7 +15,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.eclipse.smarthome.core.scheduler.CronScheduler;
+import org.openhab.core.scheduler.CronScheduler;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.Trigger;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/provider/AnnotatedActionModuleTypeProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/provider/AnnotatedActionModuleTypeProvider.java
index 5a77b417162..9e074c439f0 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/provider/AnnotatedActionModuleTypeProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/module/provider/AnnotatedActionModuleTypeProvider.java
@@ -23,8 +23,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.AnnotatedActions;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/gson/AbstractGSONParser.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/gson/AbstractGSONParser.java
index 2ad006c87c1..37307c21bbe 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/gson/AbstractGSONParser.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/parser/gson/AbstractGSONParser.java
@@ -16,9 +16,9 @@
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.ConfigurationDeserializer;
-import org.eclipse.smarthome.config.core.ConfigurationSerializer;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.ConfigurationDeserializer;
+import org.openhab.core.config.core.ConfigurationSerializer;
 import org.openhab.core.automation.parser.Parser;
 import org.openhab.core.automation.type.CompositeActionType;
 import org.openhab.core.automation.type.CompositeConditionType;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AbstractResourceBundleProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AbstractResourceBundleProvider.java
index c63e7b90c2e..ac7399590dc 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AbstractResourceBundleProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AbstractResourceBundleProvider.java
@@ -34,10 +34,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.i18n.ConfigI18nLocalizationService;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.i18n.ConfigI18nLocalizationService;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.Rule;
 import org.openhab.core.automation.parser.Parser;
 import org.openhab.core.automation.parser.ParsingException;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AutomationResourceBundlesTracker.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AutomationResourceBundlesTracker.java
index 8f9fd88d397..9a66914a79e 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AutomationResourceBundlesTracker.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AutomationResourceBundlesTracker.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.eclipse.smarthome.core.common.registry.Provider;
+import org.openhab.core.common.registry.Provider;
 import org.openhab.core.automation.ManagedRuleProvider;
 import org.openhab.core.automation.Rule;
 import org.openhab.core.automation.parser.Parser;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/ModuleTypeResourceBundleProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/ModuleTypeResourceBundleProvider.java
index 7285093325b..bb5d887e787 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/ModuleTypeResourceBundleProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/ModuleTypeResourceBundleProvider.java
@@ -20,8 +20,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.module.provider.i18n.ModuleTypeI18nService;
 import org.openhab.core.automation.parser.Parser;
 import org.openhab.core.automation.type.ModuleType;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/TemplateResourceBundleProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/TemplateResourceBundleProvider.java
index b33f219e7bb..0aa64ea1cdd 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/TemplateResourceBundleProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/TemplateResourceBundleProvider.java
@@ -20,11 +20,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.i18n.ConfigI18nLocalizationService;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.i18n.ConfigI18nLocalizationService;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Trigger;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/file/AbstractFileProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/file/AbstractFileProvider.java
index b7d81dd8d99..df402e4c7f4 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/file/AbstractFileProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/file/AbstractFileProvider.java
@@ -27,9 +27,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.parser.Parser;
 import org.openhab.core.automation.parser.ParsingException;
 import org.openhab.core.automation.template.Template;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/file/AutomationWatchService.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/file/AutomationWatchService.java
index 1fccedb050b..8313d88f09e 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/file/AutomationWatchService.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/file/AutomationWatchService.java
@@ -19,7 +19,7 @@
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchEvent.Kind;
 
-import org.eclipse.smarthome.core.service.AbstractWatchService;
+import org.openhab.core.service.AbstractWatchService;
 
 /**
  * This class is an implementation of {@link AbstractWatchService} which is responsible for tracking changes in file
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleI18nUtil.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleI18nUtil.java
index ec0c3983096..6abf5f64695 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleI18nUtil.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleI18nUtil.java
@@ -18,8 +18,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.I18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.i18n.I18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleTypeI18nServiceImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleTypeI18nServiceImpl.java
index b8c906be562..6a21ccdeed8 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleTypeI18nServiceImpl.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleTypeI18nServiceImpl.java
@@ -19,10 +19,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.i18n.ConfigI18nLocalizationService;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.i18n.ConfigI18nLocalizationService;
+import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Trigger;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleTypeI18nUtil.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleTypeI18nUtil.java
index b54eab9ec61..70c1f8173dc 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleTypeI18nUtil.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/ModuleTypeI18nUtil.java
@@ -18,8 +18,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.I18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.i18n.I18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.automation.type.Input;
 import org.openhab.core.automation.type.Output;
 import org.osgi.framework.Bundle;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/RuleTemplateI18nUtil.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/RuleTemplateI18nUtil.java
index 4ebe14830cd..1abf5c35b7b 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/RuleTemplateI18nUtil.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/i18n/RuleTemplateI18nUtil.java
@@ -16,8 +16,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.I18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.i18n.I18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
 import org.openhab.core.automation.template.RuleTemplate;
 import org.osgi.framework.Bundle;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/template/RuleTemplateRegistry.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/template/RuleTemplateRegistry.java
index af20a29d2d3..c7fb3a2841c 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/template/RuleTemplateRegistry.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/template/RuleTemplateRegistry.java
@@ -23,8 +23,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.AbstractRegistry;
-import org.eclipse.smarthome.core.common.registry.Provider;
+import org.openhab.core.common.registry.AbstractRegistry;
+import org.openhab.core.common.registry.Provider;
 import org.openhab.core.automation.template.RuleTemplate;
 import org.openhab.core.automation.template.RuleTemplateProvider;
 import org.openhab.core.automation.template.TemplateProvider;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/type/ModuleTypeRegistryImpl.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/type/ModuleTypeRegistryImpl.java
index e6e513bce39..db1b5a3d157 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/type/ModuleTypeRegistryImpl.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/type/ModuleTypeRegistryImpl.java
@@ -22,8 +22,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.AbstractRegistry;
-import org.eclipse.smarthome.core.common.registry.Provider;
+import org.openhab.core.common.registry.AbstractRegistry;
+import org.openhab.core.common.registry.Provider;
 import org.openhab.core.automation.type.ActionType;
 import org.openhab.core.automation.type.CompositeActionType;
 import org.openhab.core.automation.type.CompositeConditionType;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/module/provider/AnnotationActionModuleTypeHelper.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/module/provider/AnnotationActionModuleTypeHelper.java
index a0651b8cdc2..b54f55fe7d7 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/module/provider/AnnotationActionModuleTypeHelper.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/module/provider/AnnotationActionModuleTypeHelper.java
@@ -26,11 +26,11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.ParameterOption;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.ParameterOption;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.annotation.ActionInput;
 import org.openhab.core.automation.annotation.ActionOutput;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/RuleTemplate.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/RuleTemplate.java
index 25e365b7943..9ea9a5a8388 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/RuleTemplate.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/RuleTemplate.java
@@ -20,7 +20,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/RuleTemplateProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/RuleTemplateProvider.java
index 761b6aa78c4..d1cb4638474 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/RuleTemplateProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/RuleTemplateProvider.java
@@ -15,8 +15,8 @@
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.common.registry.ProviderChangeListener;
 
 /**
  * This interface provides basic functionality for managing {@link RuleTemplate}s. It can be used for
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/Template.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/Template.java
index d0b10a76fcf..57cb8b77385 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/Template.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/Template.java
@@ -16,7 +16,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
+import org.openhab.core.common.registry.Identifiable;
 import org.openhab.core.automation.Visibility;
 
 /**
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/TemplateProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/TemplateProvider.java
index 722aba75ac1..b30eadb27d1 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/TemplateProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/TemplateProvider.java
@@ -17,7 +17,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Provider;
+import org.openhab.core.common.registry.Provider;
 
 /**
  * This interface has to be implemented by all providers of {@link Template}s.
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/TemplateRegistry.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/TemplateRegistry.java
index 6d4bf0addd6..94b1083bc50 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/TemplateRegistry.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/template/TemplateRegistry.java
@@ -17,7 +17,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Registry;
+import org.openhab.core.common.registry.Registry;
 
 /**
  * This interface provides functionality to get available {@link Template}s. The {@link Template} can be returned
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/thingsupport/AnnotatedThingActionModuleTypeProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/thingsupport/AnnotatedThingActionModuleTypeProvider.java
index 51491038f04..226f4f81c16 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/thingsupport/AnnotatedThingActionModuleTypeProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/thingsupport/AnnotatedThingActionModuleTypeProvider.java
@@ -23,10 +23,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.thing.binding.ThingActions;
-import org.eclipse.smarthome.core.thing.binding.ThingActionsScope;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.thing.binding.ThingActions;
+import org.openhab.core.thing.binding.ThingActionsScope;
+import org.openhab.core.thing.binding.ThingHandler;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.handler.BaseModuleHandlerFactory;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ActionType.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ActionType.java
index e7da7c367f1..85bf9d780ac 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ActionType.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ActionType.java
@@ -17,7 +17,7 @@
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.Visibility;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeActionType.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeActionType.java
index 520336f9fb6..2b09ce948cb 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeActionType.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeActionType.java
@@ -18,7 +18,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Visibility;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeConditionType.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeConditionType.java
index 68903a3e1bb..2aebb9df50f 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeConditionType.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeConditionType.java
@@ -18,7 +18,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Visibility;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeTriggerType.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeTriggerType.java
index 68bebd71845..e5b3d3e0e2b 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeTriggerType.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/CompositeTriggerType.java
@@ -18,7 +18,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.Visibility;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ConditionType.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ConditionType.java
index 81b1f3a9670..057ab02879a 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ConditionType.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ConditionType.java
@@ -17,7 +17,7 @@
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Visibility;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleType.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleType.java
index fff216c92c5..34753bcbf45 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleType.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleType.java
@@ -19,8 +19,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.common.registry.Identifiable;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.Rule;
 import org.openhab.core.automation.Visibility;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleTypeProvider.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleTypeProvider.java
index e47a37a3cb5..761bcc46e9e 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleTypeProvider.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleTypeProvider.java
@@ -17,7 +17,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Provider;
+import org.openhab.core.common.registry.Provider;
 
 /**
  * This interface has to be implemented by all providers of {@link ModuleType}s.
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleTypeRegistry.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleTypeRegistry.java
index ca643bf6382..10ef65319d4 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleTypeRegistry.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/ModuleTypeRegistry.java
@@ -17,7 +17,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Registry;
+import org.openhab.core.common.registry.Registry;
 
 /**
  * This interface provides functionality to get available {@link ModuleType}s. The module types can be returned
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/TriggerType.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/TriggerType.java
index a5abeac2296..4fcfdfa44fa 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/TriggerType.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/type/TriggerType.java
@@ -18,7 +18,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 import org.openhab.core.automation.Trigger;
 import org.openhab.core.automation.Visibility;
 
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ConfigurationNormalizer.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ConfigurationNormalizer.java
index 83b40616144..654cd9ecf34 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ConfigurationNormalizer.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ConfigurationNormalizer.java
@@ -17,9 +17,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigUtil;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigUtil;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Module;
 import org.openhab.core.automation.RuleRegistry;
 import org.openhab.core.automation.internal.ModuleImpl;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ModuleBuilder.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ModuleBuilder.java
index 07bcf287e76..7fb56abe1ab 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ModuleBuilder.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ModuleBuilder.java
@@ -14,7 +14,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ReferenceResolver.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ReferenceResolver.java
index 57f15da5d99..238c25115c1 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ReferenceResolver.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/ReferenceResolver.java
@@ -21,7 +21,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/RuleBuilder.java b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/RuleBuilder.java
index b5417938e67..adf6d69604a 100644
--- a/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/RuleBuilder.java
+++ b/bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/util/RuleBuilder.java
@@ -22,8 +22,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.Configuration;
 import org.openhab.core.automation.Action;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.Rule;
diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ChannelTrigger.json b/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ChannelTrigger.json
index b42e6ebaccd..b58f30b57b5 100644
--- a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ChannelTrigger.json
+++ b/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ChannelTrigger.json
@@ -30,7 +30,7 @@
 			"outputs": [
 				{
 					"name": "event",
-					"type": "org.eclipse.smarthome.core.events.Event",
+					"type": "org.openhab.core.events.Event",
 					"description": "the event of the channel trigger",
 					"label": "Event",
 					"reference": "channelEventTriggerId.event"
diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericConditions.json b/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericConditions.json
index e889747fc9d..d971e8f6c64 100644
--- a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericConditions.json
+++ b/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericConditions.json
@@ -34,7 +34,7 @@
 			"inputs": [
 				{
 					"name": "event",
-					"type": "org.eclipse.smarthome.core.events.Event",
+					"type": "org.openhab.core.events.Event",
 					"label": "Event",
 					"description": "The events which was sent.",
 					"required": true
diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericTriggers.json b/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericTriggers.json
index 700d74889fb..9172fa0ea01 100644
--- a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericTriggers.json
+++ b/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/GenericTriggers.json
@@ -34,7 +34,7 @@
 			"outputs": [
 				{
 					"name": "event",
-					"type": "org.eclipse.smarthome.core.events.Event",
+					"type": "org.openhab.core.events.Event",
 					"label": "Event",
 					"description": "The events which was sent.",
 					"reference": "event"
diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ItemTriggers.json b/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ItemTriggers.json
index a8324169f6d..c05459e799f 100644
--- a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ItemTriggers.json
+++ b/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ItemTriggers.json
@@ -57,7 +57,7 @@
 				},
 				{
 					"name": "event",
-					"type": "org.eclipse.smarthome.core.events.Event",
+					"type": "org.openhab.core.events.Event",
 					"label": "Event",
 					"description": "The event which was sent.",
 					"reference": "event"
@@ -121,7 +121,7 @@
 				},
 				{
 					"name": "event",
-					"type": "org.eclipse.smarthome.core.events.Event",
+					"type": "org.openhab.core.events.Event",
 					"label": "Event",
 					"description": "The event which was sent.",
 					"reference": "event"
@@ -225,7 +225,7 @@
 				},
 				{
 					"name": "event",
-					"type": "org.eclipse.smarthome.core.events.Event",
+					"type": "org.openhab.core.events.Event",
 					"label": "Event",
 					"description": "The event which was sent.",
 					"reference": "event"
diff --git a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ThingTriggers.json b/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ThingTriggers.json
index 417146200cb..c556a338bea 100644
--- a/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ThingTriggers.json
+++ b/bundles/org.openhab.core.automation/src/main/resources/ESH-INF/automation/moduletypes/ThingTriggers.json
@@ -55,13 +55,13 @@
 			"outputs": [
 				{
 					"name": "status",
-					"type": "org.eclipse.smarthome.core.thing.ThingStatus",
+					"type": "org.openhab.core.thing.ThingStatus",
 					"label": "Status",
 					"description": "The status of the thing."
 				},
 				{
 					"name": "event",
-					"type": "org.eclipse.smarthome.core.events.Event",
+					"type": "org.openhab.core.events.Event",
 					"label": "Event",
 					"description": "The event which was sent.",
 					"reference": "event"
@@ -161,19 +161,19 @@
 			"outputs": [
 				{
 					"name": "newStatus",
-					"type": "org.eclipse.smarthome.core.thing.ThingStatus",
+					"type": "org.openhab.core.thing.ThingStatus",
 					"label": "New Status",
 					"description": "The new status of the thing."
 				},
 				{
 					"name": "oldStatus",
-					"type": "org.eclipse.smarthome.core.thing.ThingStatus",
+					"type": "org.openhab.core.thing.ThingStatus",
 					"label": "Old Status",
 					"description": "The old status of the thing."
 				},
 				{
 					"name": "event",
-					"type": "org.eclipse.smarthome.core.events.Event",
+					"type": "org.openhab.core.events.Event",
 					"label": "Event",
 					"description": "The event which was sent.",
 					"reference": "event"
diff --git a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/provider/AnnotationActionModuleTypeProviderTest.java b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/provider/AnnotationActionModuleTypeProviderTest.java
index e8d3b2d0b32..57b9a08a847 100644
--- a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/provider/AnnotationActionModuleTypeProviderTest.java
+++ b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/provider/AnnotationActionModuleTypeProviderTest.java
@@ -22,10 +22,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.openhab.core.automation.AnnotatedActions;
diff --git a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/util/ReferenceResolverUtilTest.java b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/util/ReferenceResolverUtilTest.java
index 5b1e724462a..d0618fd05d9 100644
--- a/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/util/ReferenceResolverUtilTest.java
+++ b/bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/util/ReferenceResolverUtilTest.java
@@ -18,7 +18,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.junit.Assert;
 import org.junit.Test;
 import org.openhab.core.automation.Module;
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoConverter.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoConverter.java
index 5a4f9558a00..8e65bce852f 100644
--- a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoConverter.java
+++ b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoConverter.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.xml.internal;
+package org.openhab.core.binding.xml.internal;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
-import org.eclipse.smarthome.core.binding.BindingInfo;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.xml.util.ConverterAttributeMapValidator;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.xml.util.NodeIterator;
+import org.openhab.core.binding.BindingInfo;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoReader.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoReader.java
index b750e281922..ea9ec9165c8 100644
--- a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoReader.java
+++ b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoReader.java
@@ -10,24 +10,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.xml.internal;
+package org.openhab.core.binding.xml.internal;
 
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup;
-import org.eclipse.smarthome.config.core.FilterCriteria;
-import org.eclipse.smarthome.config.xml.ConfigDescriptionConverter;
-import org.eclipse.smarthome.config.xml.ConfigDescriptionParameterConverter;
-import org.eclipse.smarthome.config.xml.ConfigDescriptionParameterGroupConverter;
-import org.eclipse.smarthome.config.xml.FilterCriteriaConverter;
-import org.eclipse.smarthome.config.xml.util.NodeAttributes;
-import org.eclipse.smarthome.config.xml.util.NodeAttributesConverter;
-import org.eclipse.smarthome.config.xml.util.NodeList;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.config.xml.util.NodeValueConverter;
-import org.eclipse.smarthome.config.xml.util.XmlDocumentReader;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
+import org.openhab.core.config.core.FilterCriteria;
+import org.openhab.core.config.xml.ConfigDescriptionConverter;
+import org.openhab.core.config.xml.ConfigDescriptionParameterConverter;
+import org.openhab.core.config.xml.ConfigDescriptionParameterGroupConverter;
+import org.openhab.core.config.xml.FilterCriteriaConverter;
+import org.openhab.core.config.xml.util.NodeAttributes;
+import org.openhab.core.config.xml.util.NodeAttributesConverter;
+import org.openhab.core.config.xml.util.NodeList;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.config.xml.util.NodeValueConverter;
+import org.openhab.core.config.xml.util.XmlDocumentReader;
 
 import com.thoughtworks.xstream.XStream;
 
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlProvider.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlProvider.java
index aa1fdf3295f..219e9bb3bae 100644
--- a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlProvider.java
+++ b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlProvider.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.xml.internal;
+package org.openhab.core.binding.xml.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.xml.AbstractXmlConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProvider;
-import org.eclipse.smarthome.core.binding.BindingInfo;
-import org.eclipse.smarthome.core.binding.BindingInfoProvider;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.xml.AbstractXmlConfigDescriptionProvider;
+import org.openhab.core.config.xml.osgi.XmlDocumentProvider;
+import org.openhab.core.binding.BindingInfo;
+import org.openhab.core.binding.BindingInfoProvider;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlResult.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlResult.java
index 76bb9617f99..df85722f620 100644
--- a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlResult.java
+++ b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoXmlResult.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.xml.internal;
+package org.openhab.core.binding.xml.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.core.binding.BindingInfo;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.binding.BindingInfo;
 
 /**
  * The {@link BindingInfoXmlResult} is an intermediate XML conversion result object which
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingXmlConfigDescriptionProvider.java
index 9266022d405..3a1b20781ea 100644
--- a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingXmlConfigDescriptionProvider.java
+++ b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingXmlConfigDescriptionProvider.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.xml.internal;
+package org.openhab.core.binding.xml.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.i18n.ConfigI18nLocalizationService;
-import org.eclipse.smarthome.config.xml.AbstractXmlConfigDescriptionProvider;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.i18n.ConfigI18nLocalizationService;
+import org.openhab.core.config.xml.AbstractXmlConfigDescriptionProvider;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/XmlBindingInfoProvider.java b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/XmlBindingInfoProvider.java
index 6fa3982abe4..8487ce877ab 100644
--- a/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/XmlBindingInfoProvider.java
+++ b/bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/XmlBindingInfoProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.xml.internal;
+package org.openhab.core.binding.xml.internal;
 
 import java.util.HashSet;
 import java.util.Locale;
@@ -19,18 +19,18 @@
 import java.util.concurrent.ScheduledExecutorService;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.AbstractXmlBasedProvider;
-import org.eclipse.smarthome.config.xml.AbstractXmlConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentBundleTracker;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProvider;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProviderFactory;
-import org.eclipse.smarthome.config.xml.util.XmlDocumentReader;
-import org.eclipse.smarthome.core.binding.BindingInfo;
-import org.eclipse.smarthome.core.binding.BindingInfoProvider;
-import org.eclipse.smarthome.core.binding.i18n.BindingI18nLocalizationService;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.service.ReadyService;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.xml.AbstractXmlBasedProvider;
+import org.openhab.core.config.xml.AbstractXmlConfigDescriptionProvider;
+import org.openhab.core.config.xml.osgi.XmlDocumentBundleTracker;
+import org.openhab.core.config.xml.osgi.XmlDocumentProvider;
+import org.openhab.core.config.xml.osgi.XmlDocumentProviderFactory;
+import org.openhab.core.config.xml.util.XmlDocumentReader;
+import org.openhab.core.binding.BindingInfo;
+import org.openhab.core.binding.BindingInfoProvider;
+import org.openhab.core.binding.i18n.BindingI18nLocalizationService;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.service.ReadyService;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
diff --git a/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/OpenHAB.java b/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/OpenHAB.java
index 43af9ae2d5c..59af0fe8180 100644
--- a/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/OpenHAB.java
+++ b/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/OpenHAB.java
@@ -18,7 +18,7 @@
 import java.util.Properties;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.config.core.ConfigConstants;
+import org.openhab.core.config.core.ConfigConstants;
 import org.osgi.framework.FrameworkUtil;
 
 /**
diff --git a/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/CoreActivator.java b/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/CoreActivator.java
index 0ad6a352259..15c60b8b77a 100644
--- a/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/CoreActivator.java
+++ b/bundles/org.openhab.core.boot/src/main/java/org/openhab/core/internal/CoreActivator.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.core.internal;
 
-import org.eclipse.smarthome.model.rule.runtime.RuleEngine;
+import org.openhab.core.model.rule.runtime.RuleEngine;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
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 2b129e0f3bb..136a728295a 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
@@ -15,18 +15,18 @@
 import java.util.Collections;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.thing.Channel;
-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.SitemapProvider;
-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.openhab.core.thing.Channel;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.model.core.ModelRepositoryChangeListener;
+import org.openhab.core.model.sitemap.SitemapProvider;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
+import org.openhab.core.model.sitemap.sitemap.SitemapFactory;
+import org.openhab.core.model.sitemap.sitemap.impl.DefaultImpl;
+import org.openhab.core.model.sitemap.sitemap.impl.FrameImpl;
+import org.openhab.core.model.sitemap.sitemap.impl.SitemapImpl;
+import org.openhab.core.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.config.core/src/main/java/org/openhab/core/config/core/ConfigConstants.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigConstants.java
index 2dca8f53cb2..534d6ec4a0b 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigConstants.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigConstants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 /**
  * This class provides constants relevant for the configuration of openHAB
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescription.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescription.java
index 4f138eb9dee..0dd11180a69 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescription.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescription.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.net.URI;
 import java.util.Collections;
@@ -18,7 +18,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.common.registry.Identifiable;
+import org.openhab.core.common.registry.Identifiable;
 
 /**
  * The {@link ConfigDescription} class contains a description for a concrete
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionAliasProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionAliasProvider.java
index bc5f996e540..24ee442dbde 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionAliasProvider.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionAliasProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.net.URI;
 
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionBuilder.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionBuilder.java
index 99bf99d6040..653707cc34b 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionBuilder.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.net.URI;
 import java.util.ArrayList;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameter.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameter.java
index 7779792979b..aa884f3c8be 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameter.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -177,7 +177,7 @@ public ConfigDescriptionParameter(String name, Type type) throws IllegalArgument
      *             <li>if the name is null or empty, or the type is null</li>
      *             <li>if a unit or a unit label is provided for a parameter having type text or boolean</li>
      *             <li>if an invalid unit was given (cp.
-     *             https://www.eclipse.org/smarthome/documentation/development/bindings/xml-reference.html for the list
+     *             https://openhab.org/documentation/development/bindings/xml-reference.html for the list
      *             of valid units)</li>
      *             </ul>
      */
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilder.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilder.java
index 25483b8f43b..9a4ab2dcbaa 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilder.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilder.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
 
 /**
  * The {@link ConfigDescriptionParameterBuilder} class provides a builder for the {@link ConfigDescriptionParameter}
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroup.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroup.java
index 016aebadedd..630f81b0a8d 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroup.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroup.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionProvider.java
index 4ba2d01bafa..a4a831824c3 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionProvider.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.net.URI;
 import java.util.Collection;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionRegistry.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionRegistry.java
index 035bf75c7c6..53b7d0ae63e 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionRegistry.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.net.URI;
 import java.util.ArrayList;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java
index 34416a2a4be..4ad3089e4cc 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigOptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.net.URI;
 import java.util.Collection;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java
index 3bc41921ab8..a3a1dbf50c1 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -24,10 +24,10 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.internal.normalization.Normalizer;
-import org.eclipse.smarthome.config.core.internal.normalization.NormalizerFactory;
-import org.eclipse.smarthome.config.core.validation.ConfigDescriptionValidator;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.internal.normalization.Normalizer;
+import org.openhab.core.config.core.internal.normalization.NormalizerFactory;
+import org.openhab.core.config.core.validation.ConfigDescriptionValidator;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableService.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableService.java
index c9ac1446087..ae1408d6020 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableService.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import org.osgi.framework.Constants;
 import org.osgi.service.component.ComponentConstants;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/Configuration.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/Configuration.java
index 02c7844a717..7ee971fddf6 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/Configuration.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/Configuration.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import static java.util.Collections.*;
-import static org.eclipse.smarthome.config.core.ConfigUtil.normalizeTypes;
+import static org.openhab.core.config.core.ConfigUtil.normalizeTypes;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,7 +24,7 @@
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.internal.ConfigMapper;
+import org.openhab.core.config.core.internal.ConfigMapper;
 
 /**
  * This class is a wrapper for configuration settings of {@link Thing}s.
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationDeserializer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationDeserializer.java
index 85424310536..3d55465f4e7 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationDeserializer.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationDeserializer.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationSerializer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationSerializer.java
index e497a975863..3213eafca37 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationSerializer.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurationSerializer.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import java.lang.reflect.Type;
 import java.util.List;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/FilterCriteria.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/FilterCriteria.java
index 88990ec023f..a8a824621be 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/FilterCriteria.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/FilterCriteria.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 /**
  * The {@link FilterCriteria} specifies a filter for dynamic selection list
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ParameterOption.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ParameterOption.java
index 6bba319054f..d066eafe8f4 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ParameterOption.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ParameterOption.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 /**
  * The {@link ParameterOption} specifies one option of a static selection list.
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTO.java
index 8021679a8b3..515d43cdfb7 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTO.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTO.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.dto;
+package org.openhab.core.config.core.dto;
 
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescription;
 
 /**
  * {@link ConfigDescriptionDTO} is a data transfer object for {@link ConfigDescription}.
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTOMapper.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTOMapper.java
index 382016b81a3..8ea8665e74d 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTOMapper.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionDTOMapper.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.dto;
+package org.openhab.core.config.core.dto;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup;
-import org.eclipse.smarthome.config.core.FilterCriteria;
-import org.eclipse.smarthome.config.core.ParameterOption;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
+import org.openhab.core.config.core.FilterCriteria;
+import org.openhab.core.config.core.ParameterOption;
 
 /**
  * {@link ConfigDescriptionDTOMapper} maps {@link ConfigDescription}s to the data transfer object
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterDTO.java
index 59a04e9ff60..28c8c5a4208 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterDTO.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterDTO.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.dto;
+package org.openhab.core.config.core.dto;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
 
 /**
  * This is a data transfer object that is used to serialize parameter of a
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterGroupDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterGroupDTO.java
index fa2e8b01536..fb10f443c00 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterGroupDTO.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ConfigDescriptionParameterGroupDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.dto;
+package org.openhab.core.config.core.dto;
 
 /**
  * This is a data transfer object that is used to serialize options of a
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/FilterCriteriaDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/FilterCriteriaDTO.java
index f887aa5721b..2f450a7ec9c 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/FilterCriteriaDTO.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/FilterCriteriaDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.dto;
+package org.openhab.core.config.core.dto;
 
 /**
  * This is a data transfer object that is used to serialize filter criteria of a
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ParameterOptionDTO.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ParameterOptionDTO.java
index 25a7bb944bb..5108b81def0 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ParameterOptionDTO.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/dto/ParameterOptionDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.dto;
+package org.openhab.core.config.core.dto;
 
 /**
  * This is a data transfer object that is used to serialize options of a
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/i18n/ConfigI18nLocalizationService.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/i18n/ConfigI18nLocalizationService.java
index 659bf7da97c..9269c733398 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/i18n/ConfigI18nLocalizationService.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/i18n/ConfigI18nLocalizationService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.i18n;
+package org.openhab.core.config.core.i18n;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -19,14 +19,14 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.config.core.internal.i18n.ConfigDescriptionGroupI18nUtil;
-import org.eclipse.smarthome.config.core.internal.i18n.ConfigDescriptionI18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.config.core.internal.i18n.ConfigDescriptionGroupI18nUtil;
+import org.openhab.core.config.core.internal.i18n.ConfigDescriptionI18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java
index 9c5d66e7758..e30a7c70c9b 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/ConfigMapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal;
+package org.openhab.core.config.core.internal;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java
index b2abf035933..71b625baecb 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionGroupI18nUtil.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.i18n;
+package org.openhab.core.config.core.internal.i18n;
 
 import java.net.URI;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.I18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.i18n.I18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionI18nUtil.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionI18nUtil.java
index 433c38eb5a6..b28958e8573 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionI18nUtil.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/ConfigDescriptionI18nUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.i18n;
+package org.openhab.core.config.core.internal.i18n;
 
 import java.net.URI;
 import java.util.Locale;
@@ -18,8 +18,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.I18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.i18n.I18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProvider.java
index e42be19fcb6..daa27c15104 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProvider.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.i18n;
+package org.openhab.core.config.core.internal.i18n;
 
 import java.net.URI;
 import java.time.ZoneId;
@@ -23,8 +23,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.config.core.ConfigOptionProvider;
-import org.eclipse.smarthome.config.core.ParameterOption;
+import org.openhab.core.config.core.ConfigOptionProvider;
+import org.openhab.core.config.core.ParameterOption;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java
index 8b15b10913c..8b3d69224ad 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.metadata;
+package org.openhab.core.config.core.internal.metadata;
 
 import java.net.URI;
 import java.util.Collection;
@@ -22,13 +22,13 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.metadata.MetadataConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.ParameterOption;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.metadata.MetadataConfigDescriptionProvider;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.ParameterOption;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java
index ab392a649df..f629296c993 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.net;
+package org.openhab.core.config.core.internal.net;
 
 import java.net.Inet4Address;
 import java.net.URI;
@@ -21,10 +21,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.ConfigOptionProvider;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.net.CidrAddress;
-import org.eclipse.smarthome.core.net.NetUtil;
+import org.openhab.core.config.core.ConfigOptionProvider;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.net.CidrAddress;
+import org.openhab.core.net.NetUtil;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/AbstractNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/AbstractNormalizer.java
index 0f8c15301b1..100c5d56725 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/AbstractNormalizer.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/AbstractNormalizer.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.normalization;
+package org.openhab.core.config.core.internal.normalization;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/BooleanNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/BooleanNormalizer.java
index 0b6e5dcda0c..d5a9e27a892 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/BooleanNormalizer.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/BooleanNormalizer.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.normalization;
+package org.openhab.core.config.core.internal.normalization;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 
 /**
  * The normalizer for {@link ConfigDescriptionParameter.Type#BOOLEAN}. It tries to convert the given value into a
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/DecimalNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/DecimalNormalizer.java
index 1be5f0c0e8f..046af55bd03 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/DecimalNormalizer.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/DecimalNormalizer.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.normalization;
+package org.openhab.core.config.core.internal.normalization;
 
 import java.math.BigDecimal;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 
 /**
  * The normalizer for {@link ConfigDescriptionParameter.Type#DECIMAL}. It converts all number types to BigDecimal,
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/IntNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/IntNormalizer.java
index 0121f218b3b..d1bb9d292c0 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/IntNormalizer.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/IntNormalizer.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.normalization;
+package org.openhab.core.config.core.internal.normalization;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 
 /**
  * The normalizer for {@link ConfigDescriptionParameter.Type#INTEGER}. All different number formats will get converted
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/ListNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/ListNormalizer.java
index d4fbafb9a94..47eaee813f6 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/ListNormalizer.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/ListNormalizer.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.normalization;
+package org.openhab.core.config.core.internal.normalization;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/Normalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/Normalizer.java
index 009c0661f05..330e51398fb 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/Normalizer.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/Normalizer.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.normalization;
+package org.openhab.core.config.core.internal.normalization;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 
 /**
  * A {@link Normalizer} tries to normalize a given value according to the {@link ConfigDescriptionParameter.Type}
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java
index 45816a5de08..b1a745cf178 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/NormalizerFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.normalization;
+package org.openhab.core.config.core.internal.normalization;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Collections;
@@ -19,8 +19,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
 
 /**
  * The {@link NormalizerFactory} can be used in order to obtain the {@link Normalizer} for any concrete
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/TextNormalizer.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/TextNormalizer.java
index 7d7527e0093..39c2f8c0964 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/TextNormalizer.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/normalization/TextNormalizer.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.normalization;
+package org.openhab.core.config.core.internal.normalization;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 
 /**
  * The normalizer for the {@link ConfigDescriptionParameter.Type#TEXT}. It basically ensures that the given value will
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidator.java
index 1def2d605b8..f396c353f4f 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidator.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidator.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.validation.ConfigValidationMessage;
 
 /**
  * The {@link ConfigDescriptionParameterValidator} can be implemented to provide a specific validation of a
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java
index a892bf801f7..3319e54256d 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionParameterValidatorFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
 /**
  * The {@link ConfigDescriptionParameterValidatorFactory} creates the corresponding
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorImpl.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorImpl.java
index c8661bb1411..2eb0fde35d5 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorImpl.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -21,14 +21,14 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.validation.ConfigDescriptionValidator;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationException;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.validation.ConfigDescriptionValidator;
+import org.openhab.core.config.core.validation.ConfigValidationException;
+import org.openhab.core.config.core.validation.ConfigValidationMessage;
+import org.openhab.core.i18n.TranslationProvider;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MessageKey.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MessageKey.java
index 2e07f22cc51..30165985431 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MessageKey.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MessageKey.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
 /**
  * Utility class providing the {@link MessageKey}s for config description validation. The {@link MessageKey}
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MinMaxValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MinMaxValidator.java
index 15e220eac82..a98e4933fbd 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MinMaxValidator.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/MinMaxValidator.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
 import java.math.BigDecimal;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.internal.validation.TypeIntrospections.TypeIntrospection;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.internal.validation.TypeIntrospections.TypeIntrospection;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.config.core.validation.ConfigValidationMessage;
 
 /**
  * The {@link ConfigDescriptionParameterValidator} for the minimum and maximum attribute of a
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/PatternValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/PatternValidator.java
index b7cefac4d1a..e2f3c2215ad 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/PatternValidator.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/PatternValidator.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.validation.ConfigValidationMessage;
 
 /**
  * The {@link ConfigDescriptionParameterValidator} for the pattern attribute of a
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/RequiredValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/RequiredValidator.java
index d790d988da5..dacb77fe22b 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/RequiredValidator.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/RequiredValidator.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.validation.ConfigValidationMessage;
 
 /**
  * The {@link ConfigDescriptionParameterValidator} for the required attribute of a {@link ConfigDescriptionParameter}.
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java
index 83826a1e546..d2a24f012da 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeIntrospections.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
 import java.math.BigDecimal;
 import java.util.AbstractMap.SimpleEntry;
@@ -20,7 +20,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
 
 /**
  * The {@link TypeIntrospections} provides a corresponding {@link TypeIntrospection} for each config description
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeValidator.java
index d3580a14899..2665ed05263 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeValidator.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/TypeValidator.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.internal.validation.TypeIntrospections.TypeIntrospection;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.internal.validation.TypeIntrospections.TypeIntrospection;
+import org.openhab.core.config.core.validation.ConfigValidationMessage;
 
 /**
  * The {@link TypeValidator} validates if the given value can be assigned to the config description parameter according
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/metadata/MetadataConfigDescriptionProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/metadata/MetadataConfigDescriptionProvider.java
index ae930582d04..b34a621c38c 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/metadata/MetadataConfigDescriptionProvider.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/metadata/MetadataConfigDescriptionProvider.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.metadata;
+package org.openhab.core.config.core.metadata;
 
 import java.util.List;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ParameterOption;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ParameterOption;
 
 /**
  * A {@link MetadataConfigDescriptionProvider} implementation can be registered as an OSGi service in order to give
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusCallback.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusCallback.java
index 48f1924122f..47441229dce 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusCallback.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusCallback.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.status;
+package org.openhab.core.config.core.status;
 
 /**
  * The {@link ConfigStatusCallback} interface is a callback interface to propagate a new configuration status for an
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusInfo.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusInfo.java
index c54a1a609b7..d2f0dcb2075 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusInfo.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusInfo.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.status;
+package org.openhab.core.config.core.status;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -20,7 +20,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.config.core.status.ConfigStatusMessage.Type;
+import org.openhab.core.config.core.status.ConfigStatusMessage.Type;
 
 /**
  * The {@link ConfigStatusInfo} contains {@link ConfigStatusMessage}s to represent the current configuration status of
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusMessage.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusMessage.java
index 264f767cad4..ea1c7aa741e 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusMessage.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusMessage.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.status;
+package org.openhab.core.config.core.status;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusProvider.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusProvider.java
index cb10426217c..e46cbc21bf1 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusProvider.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusProvider.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.status;
+package org.openhab.core.config.core.status;
 
 import java.util.Collection;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 
 /**
  * The {@link ConfigStatusProvider} can be implemented and registered as an <i>OSGi</i> service to provide status
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusService.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusService.java
index 16562ea0916..c43d001a4dd 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusService.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.status;
+package org.openhab.core.config.core.status;
 
 import java.util.Collection;
 import java.util.List;
@@ -18,12 +18,12 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
 
-import org.eclipse.smarthome.config.core.status.events.ConfigStatusInfoEvent;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.util.BundleResolver;
+import org.openhab.core.config.core.status.events.ConfigStatusInfoEvent;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.util.BundleResolver;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusSource.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusSource.java
index c8aae725643..ae16e1ebca4 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusSource.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/ConfigStatusSource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.status;
+package org.openhab.core.config.core.status;
 
 import org.eclipse.jdt.annotation.NonNull;
 
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java
index b35c2767141..a829e14dea4 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusEventFactory.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.status.events;
+package org.openhab.core.config.core.status.events;
 
 import java.util.Collections;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.status.ConfigStatusInfo;
-import org.eclipse.smarthome.core.events.AbstractEventFactory;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
+import org.openhab.core.config.core.status.ConfigStatusInfo;
+import org.openhab.core.events.AbstractEventFactory;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusInfoEvent.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusInfoEvent.java
index 97d09290634..27d18391cba 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusInfoEvent.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/status/events/ConfigStatusInfoEvent.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.status.events;
+package org.openhab.core.config.core.status.events;
 
-import org.eclipse.smarthome.config.core.status.ConfigStatusInfo;
-import org.eclipse.smarthome.core.events.AbstractEvent;
+import org.openhab.core.config.core.status.ConfigStatusInfo;
+import org.openhab.core.events.AbstractEvent;
 
 import com.google.gson.Gson;
 
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigDescriptionValidator.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigDescriptionValidator.java
index 414218f7cbe..00eff78db44 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigDescriptionValidator.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigDescriptionValidator.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.validation;
+package org.openhab.core.config.core.validation;
 
 import java.net.URI;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.Configuration;
 
 /**
  * The {@link ConfigDescriptionValidator} validates a given set of {@link Configuration} parameters against a
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationException.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationException.java
index 4b99a7abfd6..970daa54ff3 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationException.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.validation;
+package org.openhab.core.config.core.validation;
 
 import java.text.MessageFormat;
 import java.util.Collection;
@@ -20,9 +20,9 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.i18n.TranslationProvider;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationMessage.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationMessage.java
index ffeb669d33f..25d8afd5948 100644
--- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationMessage.java
+++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/validation/ConfigValidationMessage.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.validation;
+package org.openhab.core.config.core.validation;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Objects;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
 
 /**
  * The {@link ConfigValidationMessage} is the result of a specific {@link ConfigDescriptionParameter}
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java
index 200fd82aa7a..f6a16c8b7f0 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -20,7 +20,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java
index b0e8e68790f..24c4490d88f 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionParameterBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -18,7 +18,7 @@
 import java.math.BigDecimal;
 import java.util.Arrays;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java
index 8535bc7118b..9cf05c3b228 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigDescriptionRegistryTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -24,7 +24,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java
index e9c34a45a08..9939c2b0072 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigUtilTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
-import static org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type.*;
+import static org.openhab.core.config.core.ConfigDescriptionParameter.Type.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java
index 9cb543e0a6c..049549500a5 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.core.IsCollectionContaining.hasItems;
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProviderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
index ec0c7b0024e..5578671f554 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.i18n;
+package org.openhab.core.config.core.internal.i18n;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -18,7 +18,7 @@
 import java.net.URI;
 import java.util.Locale;
 
-import org.eclipse.smarthome.config.core.ParameterOption;
+import org.openhab.core.config.core.ParameterOption;
 import org.hamcrest.collection.IsEmptyCollection;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
index b3513e4af6b..06f64e71a88 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.metadata;
+package org.openhab.core.config.core.internal.metadata;
 
-import static org.eclipse.smarthome.config.core.internal.metadata.MetadataConfigDescriptionProviderImpl.*;
+import static org.openhab.core.config.core.internal.metadata.MetadataConfigDescriptionProviderImpl.*;
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.when;
@@ -23,13 +23,13 @@
 import java.util.Collection;
 import java.util.Locale;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.config.core.metadata.MetadataConfigDescriptionProvider;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.config.core.metadata.MetadataConfigDescriptionProvider;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/normalization/NormalizerTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/normalization/NormalizerTest.java
index 5342eecba9e..ee99671a0cc 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/normalization/NormalizerTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/normalization/NormalizerTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.normalization;
+package org.openhab.core.config.core.internal.normalization;
 
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.CoreMatchers.*;
@@ -21,8 +21,8 @@
 import java.util.TreeSet;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java
index 520170ff80c..e17d71abe26 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.CoreMatchers.is;
@@ -28,14 +28,14 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.validation.ConfigDescriptionValidator;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationException;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.validation.ConfigDescriptionValidator;
+import org.openhab.core.config.core.validation.ConfigValidationException;
+import org.openhab.core.config.core.validation.ConfigValidationMessage;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java
index 9aaa658ea17..0bd997521f6 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigValidationExceptionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.internal.validation;
+package org.openhab.core.config.core.internal.validation;
 
 import static java.util.Collections.*;
 import static java.util.stream.Collectors.toList;
@@ -25,9 +25,9 @@
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationException;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationMessage;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.config.core.validation.ConfigValidationException;
+import org.openhab.core.config.core.validation.ConfigValidationMessage;
+import org.openhab.core.i18n.TranslationProvider;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.osgi.framework.Bundle;
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java
index bb08929c092..eb65f8c0cb5 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusInfoTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.status;
+package org.openhab.core.config.core.status;
 
 import static java.util.Collections.*;
 import static java.util.stream.Collectors.*;
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.status.ConfigStatusMessage.Type;
+import org.openhab.core.config.core.status.ConfigStatusMessage.Type;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java
index ed5054d9b11..00883d5b934 100644
--- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/status/ConfigStatusServiceTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core.status;
+package org.openhab.core.config.core.status;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -23,12 +23,12 @@
 import java.util.Collection;
 import java.util.Locale;
 
-import org.eclipse.smarthome.config.core.status.ConfigStatusMessage.Type;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.util.BundleResolver;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.config.core.status.ConfigStatusMessage.Type;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.util.BundleResolver;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/MDNSDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/MDNSDiscoveryParticipant.java
index bfae8ea0807..e58d019c54c 100644
--- a/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/MDNSDiscoveryParticipant.java
+++ b/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/MDNSDiscoveryParticipant.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.mdns;
+package org.openhab.core.config.discovery.mdns;
 
 import java.util.Set;
 
@@ -18,10 +18,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.mdns.internal.MDNSDiscoveryService;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.mdns.internal.MDNSDiscoveryService;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * A {@link MDNSDiscoveryParticipant} that is registered as a service is picked up by the {@link MDNSDiscoveryService}
diff --git a/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryService.java b/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryService.java
index 3d730aec28e..297e35e0255 100644
--- a/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryService.java
+++ b/bundles/org.openhab.core.config.discovery.mdns/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.mdns.internal;
+package org.openhab.core.config.discovery.mdns.internal;
 
 import java.time.Duration;
 import java.util.HashSet;
@@ -25,13 +25,13 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.AbstractDiscoveryService;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryService;
-import org.eclipse.smarthome.config.discovery.mdns.MDNSDiscoveryParticipant;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.io.transport.mdns.MDNSClient;
+import org.openhab.core.config.discovery.AbstractDiscoveryService;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.config.discovery.mdns.MDNSDiscoveryParticipant;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.io.transport.mdns.MDNSClient;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Modified;
 import org.osgi.service.component.annotations.Reference;
@@ -55,7 +55,7 @@ public class MDNSDiscoveryService extends AbstractDiscoveryService implements Se
     private final Logger logger = LoggerFactory.getLogger(MDNSDiscoveryService.class);
 
     @Deprecated
-    private final Set<org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant> oldParticipants = new CopyOnWriteArraySet<>();
+    private final Set<org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant> oldParticipants = new CopyOnWriteArraySet<>();
 
     private final Set<MDNSDiscoveryParticipant> participants = new CopyOnWriteArraySet<>();
 
@@ -72,7 +72,7 @@ public void setMDNSClient(MDNSClient mdnsClient) {
             for (MDNSDiscoveryParticipant participant : participants) {
                 mdnsClient.addServiceListener(participant.getServiceType(), this);
             }
-            for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
+            for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
                 mdnsClient.addServiceListener(participant.getServiceType(), this);
             }
         }
@@ -82,7 +82,7 @@ public void unsetMDNSClient(MDNSClient mdnsClient) {
         for (MDNSDiscoveryParticipant participant : participants) {
             mdnsClient.removeServiceListener(participant.getServiceType(), this);
         }
-        for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
+        for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
             mdnsClient.removeServiceListener(participant.getServiceType(), this);
         }
         this.mdnsClient = null;
@@ -99,7 +99,7 @@ protected void startBackgroundDiscovery() {
         for (MDNSDiscoveryParticipant participant : participants) {
             mdnsClient.addServiceListener(participant.getServiceType(), this);
         }
-        for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
+        for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
             mdnsClient.addServiceListener(participant.getServiceType(), this);
         }
         startScan(true);
@@ -110,7 +110,7 @@ protected void stopBackgroundDiscovery() {
         for (MDNSDiscoveryParticipant participant : participants) {
             mdnsClient.removeServiceListener(participant.getServiceType(), this);
         }
-        for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
+        for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
             mdnsClient.removeServiceListener(participant.getServiceType(), this);
         }
     }
@@ -163,7 +163,7 @@ private void scan(boolean isBackground) {
                 }
             }
         }
-        for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
+        for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
             long start = System.currentTimeMillis();
             ServiceInfo[] services;
             if (isBackground) {
@@ -200,7 +200,7 @@ protected void removeMDNSDiscoveryParticipant(MDNSDiscoveryParticipant participa
     @Deprecated
     @Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
     protected void addMDNSDiscoveryParticipant_old(
-            org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant) {
+            org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant) {
         this.oldParticipants.add(participant);
         if (mdnsClient != null && isBackgroundDiscoveryEnabled()) {
             mdnsClient.addServiceListener(participant.getServiceType(), this);
@@ -209,7 +209,7 @@ protected void addMDNSDiscoveryParticipant_old(
 
     @Deprecated
     protected void removeMDNSDiscoveryParticipant_old(
-            org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant) {
+            org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant) {
         this.oldParticipants.remove(participant);
         if (mdnsClient != null) {
             mdnsClient.removeServiceListener(participant.getServiceType(), this);
@@ -222,7 +222,7 @@ public Set<ThingTypeUID> getSupportedThingTypes() {
         for (MDNSDiscoveryParticipant participant : participants) {
             supportedThingTypes.addAll(participant.getSupportedThingTypeUIDs());
         }
-        for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
+        for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
             supportedThingTypes.addAll(participant.getSupportedThingTypeUIDs());
         }
         return supportedThingTypes;
@@ -247,7 +247,7 @@ public void serviceRemoved(ServiceEvent serviceEvent) {
                 }
             }
         }
-        for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
+        for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
             if (participant.getServiceType().equals(serviceEvent.getType())) {
                 try {
                     ThingUID thingUID = participant.getThingUID(serviceEvent.getInfo());
@@ -280,7 +280,7 @@ private void considerService(ServiceEvent serviceEvent) {
                     }
                 }
             }
-            for (org.eclipse.smarthome.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
+            for (org.openhab.core.io.transport.mdns.discovery.MDNSDiscoveryParticipant participant : oldParticipants) {
                 if (participant.getServiceType().equals(serviceEvent.getType())) {
                     try {
                         DiscoveryResult result = participant.createResult(serviceEvent.getInfo());
diff --git a/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/UpnpDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/UpnpDiscoveryParticipant.java
index 65a5befcd3a..3461dbaa33a 100644
--- a/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/UpnpDiscoveryParticipant.java
+++ b/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/UpnpDiscoveryParticipant.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.upnp;
+package org.openhab.core.config.discovery.upnp;
 
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 import org.jupnp.model.meta.RemoteDevice;
 
 /**
diff --git a/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java b/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java
index a53b4b365a1..d0e4b3b891d 100644
--- a/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java
+++ b/bundles/org.openhab.core.config.discovery.upnp/src/main/java/org/openhab/core/config/discovery/upnp/internal/UpnpDiscoveryService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.upnp.internal;
+package org.openhab.core.config.discovery.upnp.internal;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -19,15 +19,15 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.eclipse.smarthome.config.discovery.AbstractDiscoveryService;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryService;
-import org.eclipse.smarthome.config.discovery.upnp.UpnpDiscoveryParticipant;
-import org.eclipse.smarthome.core.net.CidrAddress;
-import org.eclipse.smarthome.core.net.NetworkAddressChangeListener;
-import org.eclipse.smarthome.core.net.NetworkAddressService;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.AbstractDiscoveryService;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.config.discovery.upnp.UpnpDiscoveryParticipant;
+import org.openhab.core.net.CidrAddress;
+import org.openhab.core.net.NetworkAddressChangeListener;
+import org.openhab.core.net.NetworkAddressService;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 import org.jupnp.UpnpService;
 import org.jupnp.model.meta.LocalDevice;
 import org.jupnp.model.meta.RemoteDevice;
@@ -58,7 +58,7 @@ public class UpnpDiscoveryService extends AbstractDiscoveryService
     private final Logger logger = LoggerFactory.getLogger(UpnpDiscoveryService.class);
 
     @Deprecated
-    private final Set<org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant> oldParticipants = new CopyOnWriteArraySet<>();
+    private final Set<org.openhab.core.config.discovery.UpnpDiscoveryParticipant> oldParticipants = new CopyOnWriteArraySet<>();
 
     private final Set<UpnpDiscoveryParticipant> participants = new CopyOnWriteArraySet<>();
 
@@ -120,7 +120,7 @@ protected void removeUpnpDiscoveryParticipant(UpnpDiscoveryParticipant participa
     @Deprecated
     @Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
     protected void addUpnpDiscoveryParticipant_old(
-            org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant participant) {
+            org.openhab.core.config.discovery.UpnpDiscoveryParticipant participant) {
         this.oldParticipants.add(participant);
 
         if (upnpService != null) {
@@ -136,7 +136,7 @@ protected void addUpnpDiscoveryParticipant_old(
 
     @Deprecated
     protected void removeUpnpDiscoveryParticipant_old(
-            org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant participant) {
+            org.openhab.core.config.discovery.UpnpDiscoveryParticipant participant) {
         this.oldParticipants.remove(participant);
     }
 
@@ -146,7 +146,7 @@ public Set<ThingTypeUID> getSupportedThingTypes() {
         for (UpnpDiscoveryParticipant participant : participants) {
             supportedThingTypes.addAll(participant.getSupportedThingTypeUIDs());
         }
-        for (org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) {
+        for (org.openhab.core.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) {
             supportedThingTypes.addAll(participant.getSupportedThingTypeUIDs());
         }
         return supportedThingTypes;
@@ -192,7 +192,7 @@ public void remoteDeviceAdded(Registry registry, RemoteDevice device) {
                 logger.error("Participant '{}' threw an exception", participant.getClass().getName(), e);
             }
         }
-        for (org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) {
+        for (org.openhab.core.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) {
             try {
                 DiscoveryResult result = participant.createResult(device);
                 if (result != null) {
@@ -216,7 +216,7 @@ public void remoteDeviceRemoved(Registry registry, RemoteDevice device) {
                 logger.error("Participant '{}' threw an exception", participant.getClass().getName(), e);
             }
         }
-        for (org.eclipse.smarthome.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) {
+        for (org.openhab.core.config.discovery.UpnpDiscoveryParticipant participant : oldParticipants) {
             try {
                 ThingUID thingUID = participant.getThingUID(device);
                 if (thingUID != null) {
diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java
index 97efe23a7a8..de4a64ee7d6 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java
+++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScanner.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal;
+package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -18,7 +18,7 @@
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
 
 /**
  * Permits to perform repeated scans for USB devices with associated serial port. Keeps the last scan result as internal
diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java
index fc9d81bccd1..f72d20c7aba 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java
+++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScanner.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal;
+package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal;
 
 import static java.lang.Long.parseLong;
 
@@ -26,11 +26,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscovery;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscoveryListener;
-import org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal.DeltaUsbSerialScanner.Delta;
-import org.eclipse.smarthome.core.common.ThreadFactoryBuilder;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDiscovery;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDiscoveryListener;
+import org.openhab.core.config.discovery.usbserial.linuxsysfs.internal.DeltaUsbSerialScanner.Delta;
+import org.openhab.core.common.ThreadFactoryBuilder;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java
index cb664af54b8..cff4b35e5f8 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java
+++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysfsUsbSerialScanner.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal;
+package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal;
 
 import static java.nio.file.Files.*;
 
@@ -26,7 +26,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Modified;
diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java
index 9e426bdc996..22bce2e61de 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java
+++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/UsbSerialScanner.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal;
+package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal;
 
 import java.io.IOException;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
 
 /**
  * Implementations of this interface scan for serial ports provided by USB devices.
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDeviceInformation.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDeviceInformation.java
index f2b24f4c2e6..d5de1e938af 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDeviceInformation.java
+++ b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDeviceInformation.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial;
+package org.openhab.core.config.discovery.usbserial;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscovery.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscovery.java
index 51749ef5622..519cd320d9d 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscovery.java
+++ b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscovery.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial;
+package org.openhab.core.config.discovery.usbserial;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.discovery.usbserial.internal.UsbSerialDiscoveryService;
+import org.openhab.core.config.discovery.usbserial.internal.UsbSerialDiscoveryService;
 
 /**
  * Interface for implementations for discovering serial ports provided by a USB device. An implementation of this
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryListener.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryListener.java
index ce972e930ef..1fb8085506e 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryListener.java
+++ b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial;
+package org.openhab.core.config.discovery.usbserial;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java
index 79e12dfa199..48dd038abf1 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java
+++ b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/UsbSerialDiscoveryParticipant.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial;
+package org.openhab.core.config.discovery.usbserial;
 
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.usbserial.internal.UsbSerialDiscoveryService;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.usbserial.internal.UsbSerialDiscoveryService;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * A {@link UsbSerialDiscoveryParticipant} that is registered as a component is picked up by the
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java
index 8ad2b33d3c5..f565117da0c 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java
+++ b/bundles/org.openhab.core.config.discovery.usbserial/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.internal;
+package org.openhab.core.config.discovery.usbserial.internal;
 
 import static java.util.stream.Collectors.toSet;
 
@@ -22,16 +22,16 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.AbstractDiscoveryService;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder;
-import org.eclipse.smarthome.config.discovery.DiscoveryService;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscovery;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscoveryListener;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscoveryParticipant;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.AbstractDiscoveryService;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultBuilder;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDiscovery;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDiscoveryListener;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDiscoveryParticipant;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java
index d4cae64dd97..4cd9c0eaab7 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/AbstractDiscoveryService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -27,13 +27,13 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.i18n.I18nUtil;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.internal.DiscoveryResultImpl;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.i18n.I18nUtil;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java
index 51cbd62fb01..2ba09452947 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryListener.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import java.util.Collection;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * The {@link DiscoveryListener} interface for receiving discovery events.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResult.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResult.java
index 02705de2646..4570450f6a4 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResult.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResult.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * The {@link DiscoveryResult} is a container for one result of a discovery process.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java
index f806caa3a7b..1335f3c4bae 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.internal.DiscoveryResultImpl;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * The {@link DiscoveryResultBuilder} helps creating a {@link DiscoveryResult} through the builder pattern.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultFlag.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultFlag.java
index e52c4a3fd6b..208fd5800e4 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultFlag.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultFlag.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 /**
  * The {@link DiscoveryResultFlag} class specifies a list of flags
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryService.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryService.java
index add352445df..492c185f5d4 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryService.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryService.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import java.util.Collection;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingTypeUID;
 
 /**
  * The {@link DiscoveryService} is a service interface which each binding can
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceCallback.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceCallback.java
index 4d12cfff713..65b8df24bce 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceCallback.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceCallback.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.inbox.Inbox;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.inbox.Inbox;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * This interface provides helper methods for {@link DiscoveryService}s in order to access core framework capabilities.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistry.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistry.java
index 704fb98b977..af8bc774946 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistry.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistry.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingTypeUID;
 
 /**
  * The {@link DiscoveryServiceRegistry} is a service interface which provides
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ExtendedDiscoveryService.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ExtendedDiscoveryService.java
index 073290dffd2..8e9eda0897d 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ExtendedDiscoveryService.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ExtendedDiscoveryService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ScanListener.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ScanListener.java
index 48188a521ce..4e3f61e3f3d 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ScanListener.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/ScanListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/UpnpDiscoveryParticipant.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/UpnpDiscoveryParticipant.java
index 10f3ba2b9f0..82ad742d3c8 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/UpnpDiscoveryParticipant.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/UpnpDiscoveryParticipant.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 import org.jupnp.model.meta.RemoteDevice;
 
 /**
@@ -26,7 +26,7 @@
  * UPnP scans.
  *
  * @author Kai Kreuzer - Initial contribution
- * @deprecated use org.eclipse.smarthome.config.discovery.upnp.UpnpDiscoveryParticipant instead.
+ * @deprecated use org.openhab.core.config.discovery.upnp.UpnpDiscoveryParticipant instead.
  */
 @Deprecated
 @NonNullByDefault
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTO.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTO.java
index 3ac9f3708d5..8606ba99612 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTO.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTO.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.dto;
+package org.openhab.core.config.discovery.dto;
 
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
 
 /**
  * This is a data transfer object that is used to serialize discovery results.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTOMapper.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTOMapper.java
index 8478cbacbe5..f09cbd333b9 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTOMapper.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/dto/DiscoveryResultDTOMapper.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.dto;
+package org.openhab.core.config.discovery.dto;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultBuilder;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * The {@link DiscoveryResultDTOMapper} is an utility class to map discovery results into discovery result transfer
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/Inbox.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/Inbox.java
index 32758766c40..b18658ea417 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/Inbox.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/Inbox.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox;
+package org.openhab.core.config.discovery.inbox;
 
 import java.util.List;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.config.discovery.DiscoveryService;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * The {@link Inbox} is a service interface providing a container for discovered {@code Thing}s
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxAutoApprovePredicate.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxAutoApprovePredicate.java
index 5b29231fca9..f0b8abcde0c 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxAutoApprovePredicate.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxAutoApprovePredicate.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox;
+package org.openhab.core.config.discovery.inbox;
 
 import java.util.function.Predicate;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.internal.AutomaticInboxProcessor;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.internal.AutomaticInboxProcessor;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxFilterCriteria.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxFilterCriteria.java
index b9a84e04ff7..b328230f15d 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxFilterCriteria.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxFilterCriteria.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox;
+package org.openhab.core.config.discovery.inbox;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * The {@link InboxFilterCriteria} specifies the filter for {@link Inbox} <i>GET</i> requests.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxListener.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxListener.java
index 861700659fc..cce3881170a 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxListener.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxListener.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox;
+package org.openhab.core.config.discovery.inbox;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResult;
 
 /**
  * The {@link InboxListener} interface for receiving {@link Inbox} events.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxPredicates.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxPredicates.java
index 4e6fad68c56..7283e6d73fa 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxPredicates.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/InboxPredicates.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox;
+package org.openhab.core.config.discovery.inbox;
 
 import java.util.function.Predicate;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * Implements static factory methods for {@link Predicate}s to filter in streams of {@link DiscoveryResult}s.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/AbstractInboxEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/AbstractInboxEvent.java
index f376fa4ff87..a5e0ece97f1 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/AbstractInboxEvent.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/AbstractInboxEvent.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox.events;
+package org.openhab.core.config.discovery.inbox.events;
 
-import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO;
-import org.eclipse.smarthome.config.discovery.inbox.Inbox;
-import org.eclipse.smarthome.core.events.AbstractEvent;
+import org.openhab.core.config.discovery.dto.DiscoveryResultDTO;
+import org.openhab.core.config.discovery.inbox.Inbox;
+import org.openhab.core.events.AbstractEvent;
 
 /**
  * Abstract implementation of an inbox event which will be posted by the {@link Inbox} for added, removed
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxAddedEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxAddedEvent.java
index f7725602e95..cdc55b9efd2 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxAddedEvent.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxAddedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox.events;
+package org.openhab.core.config.discovery.inbox.events;
 
-import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO;
+import org.openhab.core.config.discovery.dto.DiscoveryResultDTO;
 
 /**
  * An {@link InboxAddedEvent} notifies subscribers that a discovery result has been added to the inbox.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactory.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactory.java
index d4535232842..196a1f6ee05 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactory.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactory.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox.events;
+package org.openhab.core.config.discovery.inbox.events;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO;
-import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTOMapper;
-import org.eclipse.smarthome.core.events.AbstractEventFactory;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.dto.DiscoveryResultDTO;
+import org.openhab.core.config.discovery.dto.DiscoveryResultDTOMapper;
+import org.openhab.core.events.AbstractEventFactory;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxRemovedEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxRemovedEvent.java
index 055229bdd20..b27199353fc 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxRemovedEvent.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxRemovedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox.events;
+package org.openhab.core.config.discovery.inbox.events;
 
-import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO;
+import org.openhab.core.config.discovery.dto.DiscoveryResultDTO;
 
 /**
  * An {@link InboxRemovedEvent} notifies subscribers that a discovery result has been removed from the inbox.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxUpdatedEvent.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxUpdatedEvent.java
index 682fffe94e3..c25a8124615 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxUpdatedEvent.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/inbox/events/InboxUpdatedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox.events;
+package org.openhab.core.config.discovery.inbox.events;
 
-import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO;
+import org.openhab.core.config.discovery.dto.DiscoveryResultDTO;
 
 /**
  * An {@link InboxUpdatedEvent} notifies subscribers that a discovery result has been updated in the inbox.
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java
index 2b8a3881660..246566a130a 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessor.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.internal;
+package org.openhab.core.config.discovery.internal;
 
-import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.*;
+import static org.openhab.core.config.discovery.inbox.InboxPredicates.*;
 
 import java.util.List;
 import java.util.Map;
@@ -24,23 +24,23 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.config.discovery.inbox.Inbox;
-import org.eclipse.smarthome.config.discovery.inbox.InboxAutoApprovePredicate;
-import org.eclipse.smarthome.config.discovery.inbox.InboxListener;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.events.AbstractTypedEventSubscriber;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.events.ThingStatusInfoChangedEvent;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.config.discovery.inbox.Inbox;
+import org.openhab.core.config.discovery.inbox.InboxAutoApprovePredicate;
+import org.openhab.core.config.discovery.inbox.InboxListener;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.events.AbstractTypedEventSubscriber;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.events.ThingStatusInfoChangedEvent;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeRegistry;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -86,8 +86,8 @@
  * @author Kai Kreuzer - added auto-approve functionality
  * @author Henning Sudbrock - added hook for selectively auto-approving inbox entries
  */
-@Component(immediate = true, configurationPid = "org.eclipse.smarthome.inbox", service = EventSubscriber.class, property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.inbox",
+@Component(immediate = true, configurationPid = "org.openhab.core.inbox", service = EventSubscriber.class, property = {
+        Constants.SERVICE_PID + "=org.openhab.core.inbox",
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system",
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=Inbox",
         ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:inbox" })
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryResultImpl.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryResultImpl.java
index bae92fc388a..275fd6c2912 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryResultImpl.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryResultImpl.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.internal;
+package org.openhab.core.config.discovery.internal;
 
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  *
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java
index 9c9c4929263..baa79a9a222 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/DiscoveryServiceRegistryImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.internal;
+package org.openhab.core.config.discovery.internal;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -29,16 +29,16 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.DiscoveryListener;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryService;
-import org.eclipse.smarthome.config.discovery.DiscoveryServiceCallback;
-import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry;
-import org.eclipse.smarthome.config.discovery.ExtendedDiscoveryService;
-import org.eclipse.smarthome.config.discovery.ScanListener;
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryListener;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.config.discovery.DiscoveryServiceCallback;
+import org.openhab.core.config.discovery.DiscoveryServiceRegistry;
+import org.openhab.core.config.discovery.ExtendedDiscoveryService;
+import org.openhab.core.config.discovery.ScanListener;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java
index dd67f0774df..b009f033bbb 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.internal;
+package org.openhab.core.config.discovery.internal;
 
-import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.forThingUID;
+import static org.openhab.core.config.discovery.inbox.InboxPredicates.forThingUID;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -35,35 +35,35 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.ConfigUtil;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.discovery.DiscoveryListener;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.config.discovery.DiscoveryService;
-import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry;
-import org.eclipse.smarthome.config.discovery.inbox.Inbox;
-import org.eclipse.smarthome.config.discovery.inbox.InboxFilterCriteria;
-import org.eclipse.smarthome.config.discovery.inbox.InboxListener;
-import org.eclipse.smarthome.config.discovery.inbox.events.InboxEventFactory;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingRegistryChangeListener;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.ConfigUtil;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.discovery.DiscoveryListener;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.config.discovery.DiscoveryServiceRegistry;
+import org.openhab.core.config.discovery.inbox.Inbox;
+import org.openhab.core.config.discovery.inbox.InboxFilterCriteria;
+import org.openhab.core.config.discovery.inbox.InboxListener;
+import org.openhab.core.config.discovery.inbox.events.InboxEventFactory;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingRegistryChangeListener;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingFactory;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeRegistry;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java
index 733bc54538d..6f91387a386 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/DiscoveryConsoleCommandExtension.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.internal.console;
+package org.openhab.core.config.discovery.internal.console;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -18,12 +18,12 @@
 import java.util.Hashtable;
 import java.util.List;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryService;
-import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.config.discovery.DiscoveryServiceRegistry;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java
index f4faa911e4f..418447e5671 100644
--- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/console/InboxConsoleCommandExtension.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.internal.console;
+package org.openhab.core.config.discovery.internal.console;
 
-import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.*;
+import static org.openhab.core.config.discovery.inbox.InboxPredicates.*;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -20,15 +20,15 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.config.discovery.inbox.Inbox;
-import org.eclipse.smarthome.config.discovery.internal.PersistentInbox;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.config.discovery.inbox.Inbox;
+import org.openhab.core.config.discovery.internal.PersistentInbox;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java
index a7150949fd2..482d84fbb37 100644
--- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java
+++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/InboxPredicatesTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox;
+package org.openhab.core.config.discovery.inbox;
 
-import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.*;
+import static org.openhab.core.config.discovery.inbox.InboxPredicates.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
@@ -25,11 +25,11 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.config.discovery.internal.DiscoveryResultImpl;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java
index 59c4ed1308e..ed018b7ef56 100644
--- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java
+++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/inbox/events/InboxEventFactoryTest.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox.events;
+package org.openhab.core.config.discovery.inbox.events;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTOMapper;
-import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.dto.DiscoveryResultDTOMapper;
+import org.openhab.core.config.discovery.internal.DiscoveryResultImpl;
+import org.openhab.core.events.Event;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 import org.junit.Test;
 
 import com.google.gson.Gson;
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java
index afc08acd6e5..38e13950bf2 100644
--- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java
+++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/AutomaticInboxProcessorTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.internal;
+package org.openhab.core.config.discovery.internal;
 
-import static org.eclipse.smarthome.config.discovery.inbox.InboxPredicates.withFlag;
+import static org.openhab.core.config.discovery.inbox.InboxPredicates.withFlag;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.*;
@@ -27,27 +27,27 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.events.ThingStatusInfoChangedEvent;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultBuilder;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.config.discovery.DiscoveryServiceRegistry;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.events.ThingStatusInfoChangedEvent;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/DiscoveryResultImplTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/DiscoveryResultImplTest.java
index c288c21175e..dd02a2e80c7 100644
--- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/DiscoveryResultImplTest.java
+++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/DiscoveryResultImplTest.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.internal;
+package org.openhab.core.config.discovery.internal;
 
 import static org.junit.Assert.*;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java
index 50ed2c5ec57..41ee7dda2f8 100644
--- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java
+++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/internal/PersistentInboxTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.internal;
+package org.openhab.core.config.discovery.internal;
 
 import static org.hamcrest.collection.IsMapContaining.hasEntry;
 import static org.junit.Assert.*;
@@ -25,30 +25,30 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder;
-import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry;
-import org.eclipse.smarthome.config.discovery.inbox.events.InboxAddedEvent;
-import org.eclipse.smarthome.config.discovery.inbox.events.InboxUpdatedEvent;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultBuilder;
+import org.openhab.core.config.discovery.DiscoveryServiceRegistry;
+import org.openhab.core.config.discovery.inbox.events.InboxAddedEvent;
+import org.openhab.core.config.discovery.inbox.events.InboxUpdatedEvent;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.thing.type.ThingTypeRegistry;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java b/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java
index f24154b8afa..467cb154c06 100644
--- a/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java
+++ b/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.dispatch.internal;
+package org.openhab.core.config.dispatch.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,7 +33,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigConstants;
+import org.openhab.core.config.core.ConfigConstants;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
@@ -68,11 +68,11 @@
  *
  * <p>
  * In case the pid does not contain any ".", the default service pid namespace is prefixed, which can be defined by the
- * program argument "smarthome.servicepid" (default is "org.eclipse.smarthome").
+ * program argument "smarthome.servicepid" (default is "org.openhab.core").
  *
  * <p>
  * If no pid is defined in the property line, the default pid namespace will be used together with the filename. E.g. if
- * you have a file "security.cfg", the pid that will be used is "org.eclipse.smarthome.security".
+ * you have a file "security.cfg", the pid that will be used is "org.openhab.core.security".
  *
  * <p>
  * Last but not least, a pid can be defined in the first line of a cfg file by prefixing it with "pid:", e.g.
@@ -113,7 +113,7 @@ public class ConfigDispatcher {
     public static final String SERVICECFG_PROG_ARGUMENT = "smarthome.servicecfg";
 
     /** The default namespace for service pids */
-    public static final String SERVICE_PID_NAMESPACE = "org.eclipse.smarthome";
+    public static final String SERVICE_PID_NAMESPACE = "org.openhab.core";
 
     /** The default services configuration filename */
     public static final String SERVICE_CFG_FILE = "smarthome.cfg";
diff --git a/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcher.java b/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcher.java
index e7b7557ffa6..b23dbf5d9ae 100644
--- a/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcher.java
+++ b/bundles/org.openhab.core.config.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcher.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.dispatch.internal;
+package org.openhab.core.config.dispatch.internal;
 
 import static java.nio.file.StandardWatchEventKinds.*;
 
@@ -19,8 +19,8 @@
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchEvent.Kind;
 
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.core.service.AbstractWatchService;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.service.AbstractWatchService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.config.dispatch/src/test/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java b/bundles/org.openhab.core.config.dispatch/src/test/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java
index 793c4b3125b..69430cbd27f 100644
--- a/bundles/org.openhab.core.config.dispatch/src/test/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java
+++ b/bundles/org.openhab.core.config.dispatch/src/test/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherFileWatcherTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.dispatch.internal;
+package org.openhab.core.config.dispatch.internal;
 
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.initMocks;
diff --git a/bundles/org.openhab.core.config.serial/src/main/java/org/openhab/core/config/serial/internal/SerialConfigOptionProvider.java b/bundles/org.openhab.core.config.serial/src/main/java/org/openhab/core/config/serial/internal/SerialConfigOptionProvider.java
index 5cdedfe3cc3..bce52e76940 100644
--- a/bundles/org.openhab.core.config.serial/src/main/java/org/openhab/core/config/serial/internal/SerialConfigOptionProvider.java
+++ b/bundles/org.openhab.core.config.serial/src/main/java/org/openhab/core/config/serial/internal/SerialConfigOptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.serial.internal;
+package org.openhab.core.config.serial.internal;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -18,9 +18,9 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.eclipse.smarthome.config.core.ConfigOptionProvider;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.io.transport.serial.SerialPortManager;
+import org.openhab.core.config.core.ConfigOptionProvider;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.io.transport.serial.SerialPortManager;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java
index 047d6cd5f75..ef001363748 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml;
+package org.openhab.core.config.xml;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -24,8 +24,8 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
-import org.eclipse.smarthome.core.i18n.LocalizedKey;
+import org.openhab.core.common.registry.Identifiable;
+import org.openhab.core.i18n.LocalizedKey;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlConfigDescriptionProvider.java
index 14e6395923f..3c076242056 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlConfigDescriptionProvider.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlConfigDescriptionProvider.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml;
+package org.openhab.core.config.xml;
 
 import java.net.URI;
 import java.util.Collection;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.i18n.ConfigI18nLocalizationService;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.i18n.ConfigI18nLocalizationService;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionConverter.java
index 176b5cc894d..3fd20c276db 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionConverter.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionConverter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml;
+package org.openhab.core.config.xml;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -18,13 +18,13 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup;
-import org.eclipse.smarthome.config.xml.util.ConverterAssertion;
-import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
+import org.openhab.core.config.xml.util.ConverterAssertion;
+import org.openhab.core.config.xml.util.ConverterAttributeMapValidator;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.xml.util.NodeIterator;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterConverter.java
index b7ed0b9aacf..f37cea6fedc 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterConverter.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterConverter.java
@@ -10,22 +10,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml;
+package org.openhab.core.config.xml;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.FilterCriteria;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
-import org.eclipse.smarthome.config.xml.util.ConverterValueMap;
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.FilterCriteria;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.config.xml.util.ConverterAttributeMapValidator;
+import org.openhab.core.config.xml.util.ConverterValueMap;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.xml.util.NodeValue;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterGroupConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterGroupConverter.java
index 09063e5ea9b..39658c322e4 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterGroupConverter.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigDescriptionParameterGroupConverter.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml;
+package org.openhab.core.config.xml;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup;
-import org.eclipse.smarthome.config.xml.util.ConverterValueMap;
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
+import org.openhab.core.config.xml.util.ConverterValueMap;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
 
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java
index 56d06b46814..3e22d57799e 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/ConfigXmlConfigDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml;
+package org.openhab.core.config.xml;
 
 import java.util.List;
 import java.util.concurrent.Future;
@@ -18,17 +18,17 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.i18n.ConfigI18nLocalizationService;
-import org.eclipse.smarthome.config.xml.internal.ConfigDescriptionReader;
-import org.eclipse.smarthome.config.xml.internal.ConfigDescriptionXmlProvider;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentBundleTracker;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProvider;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProviderFactory;
-import org.eclipse.smarthome.config.xml.util.XmlDocumentReader;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.service.ReadyService;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.i18n.ConfigI18nLocalizationService;
+import org.openhab.core.config.xml.internal.ConfigDescriptionReader;
+import org.openhab.core.config.xml.internal.ConfigDescriptionXmlProvider;
+import org.openhab.core.config.xml.osgi.XmlDocumentBundleTracker;
+import org.openhab.core.config.xml.osgi.XmlDocumentProvider;
+import org.openhab.core.config.xml.osgi.XmlDocumentProviderFactory;
+import org.openhab.core.config.xml.util.XmlDocumentReader;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.service.ReadyService;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/FilterCriteriaConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/FilterCriteriaConverter.java
index f12dd089704..bb6a049d458 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/FilterCriteriaConverter.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/FilterCriteriaConverter.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml;
+package org.openhab.core.config.xml;
 
-import org.eclipse.smarthome.config.core.FilterCriteria;
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.core.FilterCriteria;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
 
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java
index 79aa60ec418..638dd2c6b63 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java
@@ -10,25 +10,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.internal;
+package org.openhab.core.config.xml.internal;
 
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup;
-import org.eclipse.smarthome.config.core.FilterCriteria;
-import org.eclipse.smarthome.config.xml.ConfigDescriptionConverter;
-import org.eclipse.smarthome.config.xml.ConfigDescriptionParameterConverter;
-import org.eclipse.smarthome.config.xml.ConfigDescriptionParameterGroupConverter;
-import org.eclipse.smarthome.config.xml.FilterCriteriaConverter;
-import org.eclipse.smarthome.config.xml.util.NodeAttributes;
-import org.eclipse.smarthome.config.xml.util.NodeAttributesConverter;
-import org.eclipse.smarthome.config.xml.util.NodeList;
-import org.eclipse.smarthome.config.xml.util.NodeListConverter;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.config.xml.util.NodeValueConverter;
-import org.eclipse.smarthome.config.xml.util.XmlDocumentReader;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
+import org.openhab.core.config.core.FilterCriteria;
+import org.openhab.core.config.xml.ConfigDescriptionConverter;
+import org.openhab.core.config.xml.ConfigDescriptionParameterConverter;
+import org.openhab.core.config.xml.ConfigDescriptionParameterGroupConverter;
+import org.openhab.core.config.xml.FilterCriteriaConverter;
+import org.openhab.core.config.xml.util.NodeAttributes;
+import org.openhab.core.config.xml.util.NodeAttributesConverter;
+import org.openhab.core.config.xml.util.NodeList;
+import org.openhab.core.config.xml.util.NodeListConverter;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.config.xml.util.NodeValueConverter;
+import org.openhab.core.config.xml.util.XmlDocumentReader;
 
 import com.thoughtworks.xstream.XStream;
 
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionXmlProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionXmlProvider.java
index 2dff49cd9bb..5bc46deea8e 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionXmlProvider.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionXmlProvider.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.internal;
+package org.openhab.core.config.xml.internal;
 
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.AbstractXmlConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProvider;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.xml.AbstractXmlConfigDescriptionProvider;
+import org.openhab.core.config.xml.osgi.XmlDocumentProvider;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentBundleTracker.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentBundleTracker.java
index fedd0f7c360..6cee4eb00ed 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentBundleTracker.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentBundleTracker.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.osgi;
+package org.openhab.core.config.xml.osgi;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -32,11 +32,11 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.config.xml.util.XmlDocumentReader;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.service.ReadyMarker;
-import org.eclipse.smarthome.core.service.ReadyMarkerUtils;
-import org.eclipse.smarthome.core.service.ReadyService;
+import org.openhab.core.config.xml.util.XmlDocumentReader;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.service.ReadyMarker;
+import org.openhab.core.service.ReadyMarkerUtils;
+import org.openhab.core.service.ReadyService;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProvider.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProvider.java
index 1311fb61a45..98f28d894cf 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProvider.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProvider.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.osgi;
+package org.openhab.core.config.xml.osgi;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.xml.internal.ConfigDescriptionReader;
+import org.openhab.core.config.xml.internal.ConfigDescriptionReader;
 
 /**
  * The {@link XmlDocumentProvider} is responsible managing any created objects
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProviderFactory.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProviderFactory.java
index e0cf5cc8173..2a6ee21f19c 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProviderFactory.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/osgi/XmlDocumentProviderFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.osgi;
+package org.openhab.core.config.xml.osgi;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.osgi.framework.Bundle;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAssertion.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAssertion.java
index 4463e9ae0d2..9fa4ebe49fa 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAssertion.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAssertion.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAttributeMapValidator.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAttributeMapValidator.java
index c3bdbc0f999..2bf6b72f05f 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAttributeMapValidator.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterAttributeMapValidator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterValueMap.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterValueMap.java
index 165b9760eeb..1e954778b28 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterValueMap.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/ConverterValueMap.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/GenericUnmarshaller.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/GenericUnmarshaller.java
index 875ac1b199f..e3fe390549d 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/GenericUnmarshaller.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/GenericUnmarshaller.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributes.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributes.java
index 213fb7dacac..7eec9f02846 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributes.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributes.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import java.util.Map;
 
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributesConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributesConverter.java
index bca175d4c73..60ad6a7735e 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributesConverter.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeAttributesConverter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import java.util.Map;
 
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeIterator.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeIterator.java
index 43ffa75874a..f0570f199a9 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeIterator.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeIterator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeList.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeList.java
index d71129859ea..4f313395bfb 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeList.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeList.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeListConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeListConverter.java
index 63c0b5f4e88..e5096986d4f 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeListConverter.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeListConverter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import java.util.List;
 import java.util.Map;
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeName.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeName.java
index 9ddf9269ac7..423fb006bb7 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeName.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeName.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 /**
  * The {@link NodeName} interface defines common features for all {@code Node}* classes.
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValue.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValue.java
index b3ddca832e8..90569a3ebba 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValue.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValue.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import java.util.Map;
 
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValueConverter.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValueConverter.java
index 1ce5886904a..f4585b3d384 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValueConverter.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/NodeValueConverter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import java.util.Map;
 
diff --git a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/XmlDocumentReader.java b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/XmlDocumentReader.java
index cd6a92b4fd2..b042edebd36 100644
--- a/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/XmlDocumentReader.java
+++ b/bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/util/XmlDocumentReader.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.util;
+package org.openhab.core.config.xml.util;
 
 import java.net.URL;
 
diff --git a/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/EphemerisManager.java b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/EphemerisManager.java
index 7217851b746..ab54c858b53 100644
--- a/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/EphemerisManager.java
+++ b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/EphemerisManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.ephemeris;
+package org.openhab.core.ephemeris;
 
 import java.io.FileNotFoundException;
 import java.net.URL;
diff --git a/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java
index bd73ea3caf9..d3898f3687d 100644
--- a/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java
+++ b/bundles/org.openhab.core.ephemeris/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.ephemeris.internal;
+package org.openhab.core.ephemeris.internal;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -41,11 +41,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigOptionProvider;
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.ephemeris.EphemerisManager;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
+import org.openhab.core.config.core.ConfigOptionProvider;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.ephemeris.EphemerisManager;
+import org.openhab.core.i18n.LocaleProvider;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.FrameworkUtil;
diff --git a/bundles/org.openhab.core.extension.sample/src/main/java/org/openhab/core/extension/sample/internal/SampleExtensionService.java b/bundles/org.openhab.core.extension.sample/src/main/java/org/openhab/core/extension/sample/internal/SampleExtensionService.java
index 0375f3f6937..92d306fa409 100644
--- a/bundles/org.openhab.core.extension.sample/src/main/java/org/openhab/core/extension/sample/internal/SampleExtensionService.java
+++ b/bundles/org.openhab.core.extension.sample/src/main/java/org/openhab/core/extension/sample/internal/SampleExtensionService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.extension.sample.internal;
+package org.openhab.core.extension.sample.internal;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -22,12 +22,12 @@
 
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.extension.Extension;
-import org.eclipse.smarthome.core.extension.ExtensionEventFactory;
-import org.eclipse.smarthome.core.extension.ExtensionService;
-import org.eclipse.smarthome.core.extension.ExtensionType;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.extension.Extension;
+import org.openhab.core.extension.ExtensionEventFactory;
+import org.openhab.core.extension.ExtensionService;
+import org.openhab.core.extension.ExtensionType;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java b/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java
index 11f91b782d9..646a5265b16 100644
--- a/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java
+++ b/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.id;
+package org.openhab.core.id;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -21,7 +21,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.config.core.ConfigConstants;
+import org.openhab.core.config.core.ConfigConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/internal/UUIDResource.java b/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/internal/UUIDResource.java
index 538320cb029..4902f276db0 100644
--- a/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/internal/UUIDResource.java
+++ b/bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/internal/UUIDResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.id.internal;
+package org.openhab.core.id.internal;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.GET;
@@ -19,9 +19,9 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.id.InstanceUUID;
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.auth.Role;
+import org.openhab.core.id.InstanceUUID;
+import org.openhab.core.io.rest.RESTResource;
 import org.osgi.service.component.annotations.Component;
 
 import io.swagger.annotations.Api;
diff --git a/bundles/org.openhab.core.id/src/test/java/org/openhab/core/id/UUIDTest.java b/bundles/org.openhab.core.id/src/test/java/org/openhab/core/id/UUIDTest.java
index ec525dbfb6c..5aab995c4dc 100644
--- a/bundles/org.openhab.core.id/src/test/java/org/openhab/core/id/UUIDTest.java
+++ b/bundles/org.openhab.core.id/src/test/java/org/openhab/core/id/UUIDTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.id;
+package org.openhab.core.id;
 
 import static org.junit.Assert.*;
 
@@ -19,7 +19,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.eclipse.smarthome.config.core.ConfigConstants;
+import org.openhab.core.config.core.ConfigConstants;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.io.bin2json/src/main/java/org/openhab/core/io/bin2json/Bin2Json.java b/bundles/org.openhab.core.io.bin2json/src/main/java/org/openhab/core/io/bin2json/Bin2Json.java
index ed2cf71d9e0..94c845c9337 100644
--- a/bundles/org.openhab.core.io.bin2json/src/main/java/org/openhab/core/io/bin2json/Bin2Json.java
+++ b/bundles/org.openhab.core.io.bin2json/src/main/java/org/openhab/core/io/bin2json/Bin2Json.java
@@ -19,7 +19,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.util.HexUtils;
+import org.openhab.core.util.HexUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/ConsoleSupportEclipse.java b/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/ConsoleSupportEclipse.java
index c10055dc07f..4c6d6971dad 100644
--- a/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/ConsoleSupportEclipse.java
+++ b/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/ConsoleSupportEclipse.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.eclipse.internal;
+package org.openhab.core.io.console.eclipse.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,9 +24,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.ConsoleInterpreter;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.ConsoleInterpreter;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/OSGiConsole.java b/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/OSGiConsole.java
index 0e6979a65fe..b262f4c4474 100644
--- a/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/OSGiConsole.java
+++ b/bundles/org.openhab.core.io.console.eclipse/src/main/java/org/openhab/core/io/console/eclipse/internal/OSGiConsole.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.eclipse.internal;
+package org.openhab.core.io.console.eclipse.internal;
 
 import org.eclipse.osgi.framework.console.CommandInterpreter;
-import org.eclipse.smarthome.io.console.Console;
+import org.openhab.core.io.console.Console;
 
 /**
  *
diff --git a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java
index 96aab6536ce..23369c3aff6 100644
--- a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java
+++ b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/CommandWrapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.karaf.internal;
+package org.openhab.core.io.console.karaf.internal;
 
 import java.util.Arrays;
 import java.util.List;
@@ -24,9 +24,9 @@
 import org.apache.karaf.shell.api.console.Parser;
 import org.apache.karaf.shell.api.console.Registry;
 import org.apache.karaf.shell.api.console.Session;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.ConsoleInterpreter;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.ConsoleInterpreter;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 
 /**
  * This class wraps ESH ConsoleCommandExtensions to commands for Apache Karaf
diff --git a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/ConsoleSupportKaraf.java b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/ConsoleSupportKaraf.java
index cdd2ba1982f..4998a5c19c9 100644
--- a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/ConsoleSupportKaraf.java
+++ b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/ConsoleSupportKaraf.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.karaf.internal;
+package org.openhab.core.io.console.karaf.internal;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -20,7 +20,7 @@
 import org.apache.karaf.shell.api.action.lifecycle.Manager;
 import org.apache.karaf.shell.api.console.Registry;
 import org.apache.karaf.shell.api.console.SessionFactory;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/OSGiConsole.java b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/OSGiConsole.java
index 383db323560..0764066e209 100644
--- a/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/OSGiConsole.java
+++ b/bundles/org.openhab.core.io.console.karaf/src/main/java/org/openhab/core/io/console/karaf/internal/OSGiConsole.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.karaf.internal;
+package org.openhab.core.io.console.karaf.internal;
 
-import org.eclipse.smarthome.io.console.Console;
+import org.openhab.core.io.console.Console;
 
 /**
  *
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/CommandWrapper.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/CommandWrapper.java
index db30b560348..0058a006032 100644
--- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/CommandWrapper.java
+++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/CommandWrapper.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.rfc147.internal;
+package org.openhab.core.io.console.rfc147.internal;
 
 import java.util.Arrays;
 
-import org.eclipse.smarthome.io.console.ConsoleInterpreter;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.io.console.ConsoleInterpreter;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 
 /**
  *
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleCommandsContainer.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleCommandsContainer.java
index 4cbfcfcfb3b..3b6ef9a501f 100644
--- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleCommandsContainer.java
+++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleCommandsContainer.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.rfc147.internal;
+package org.openhab.core.io.console.rfc147.internal;
 
 import java.util.Collection;
 
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 
 /**
  *
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleSupportRfc147.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleSupportRfc147.java
index 2eff022d3dd..069a1ab0971 100644
--- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleSupportRfc147.java
+++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/ConsoleSupportRfc147.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.rfc147.internal;
+package org.openhab.core.io.console.rfc147.internal;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -21,8 +21,8 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.rfc147.internal.extension.HelpConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.io.console.rfc147.internal.extension.HelpConsoleCommandExtension;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.ComponentContext;
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/OSGiConsole.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/OSGiConsole.java
index 4aee5cab4e5..5cb55b9a153 100644
--- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/OSGiConsole.java
+++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/OSGiConsole.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.rfc147.internal;
+package org.openhab.core.io.console.rfc147.internal;
 
-import org.eclipse.smarthome.io.console.Console;
+import org.openhab.core.io.console.Console;
 
 /**
  *
diff --git a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java
index 18f92463a1c..82d669a203b 100644
--- a/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console.rfc147/src/main/java/org/openhab/core/io/console/rfc147/internal/extension/HelpConsoleCommandExtension.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.rfc147.internal.extension;
+package org.openhab.core.io.console.rfc147.internal.extension;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.ConsoleInterpreter;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.rfc147.internal.ConsoleCommandsContainer;
-import org.eclipse.smarthome.io.console.rfc147.internal.ConsoleSupportRfc147;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.ConsoleInterpreter;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.rfc147.internal.ConsoleCommandsContainer;
+import org.openhab.core.io.console.rfc147.internal.ConsoleSupportRfc147;
 
 /**
  *
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java
index 00c3b0cb8ac..9ce0b809fbd 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/Console.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console;
+package org.openhab.core.io.console;
 
 /**
  * This interface must be implemented by consoles which want to use the {@link ConsoleInterpreter}.
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/ConsoleInterpreter.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/ConsoleInterpreter.java
index c875a434759..c78e1682d22 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/ConsoleInterpreter.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/ConsoleInterpreter.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console;
+package org.openhab.core.io.console;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java
index e450ad573bb..6f28dce06eb 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/AbstractConsoleCommandExtension.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.extensions;
+package org.openhab.core.io.console.extensions;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.io.console.Console;
+import org.openhab.core.io.console.Console;
 
 /**
  * A base class that should be used by console command extension for better inclusion.
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/ConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/ConsoleCommandExtension.java
index 241937f0d8e..2302d939688 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/ConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/extensions/ConsoleCommandExtension.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.extensions;
+package org.openhab.core.io.console.extensions;
 
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.io.console.Console;
+import org.openhab.core.io.console.Console;
 
 /**
  * Client which provide a console command have to implement this interface
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java
index 4a9ebb419d9..51266f164cd 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/ItemConsoleCommandExtension.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.internal.extension;
+package org.openhab.core.io.console.internal.extension;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -19,13 +19,13 @@
 import java.util.function.Consumer;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.ManagedItemProvider;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.ManagedItemProvider;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/MetadataConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/MetadataConsoleCommandExtension.java
index 4452dbf4598..c0a40c9089c 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/MetadataConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/MetadataConsoleCommandExtension.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.internal.extension;
+package org.openhab.core.io.console.internal.extension;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -19,14 +19,14 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataPredicates;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataPredicates;
+import org.openhab.core.items.MetadataRegistry;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java
index e2e329d8394..f632811d14a 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/SendConsoleCommandExtension.java
@@ -10,23 +10,23 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.internal.extension;
+package org.openhab.core.io.console.internal.extension;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemNotUniqueException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.TypeParser;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemNotUniqueException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.TypeParser;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java
index 288b8f97851..0cace17fa1e 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/StatusConsoleCommandExtension.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.internal.extension;
+package org.openhab.core.io.console.internal.extension;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemNotUniqueException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemNotUniqueException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java
index 091534af9b5..97ed912be6a 100644
--- a/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.io.console/src/main/java/org/openhab/core/io/console/internal/extension/UpdateConsoleCommandExtension.java
@@ -10,23 +10,23 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.console.internal.extension;
+package org.openhab.core.io.console.internal.extension;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemNotUniqueException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.TypeParser;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemNotUniqueException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.types.State;
+import org.openhab.core.types.TypeParser;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicChallengeHandler.java b/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicChallengeHandler.java
index e3c9aa3251a..6b6f208861f 100644
--- a/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicChallengeHandler.java
+++ b/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicChallengeHandler.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.auth.basic.internal;
+package org.openhab.core.io.http.auth.basic.internal;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.smarthome.io.http.Handler;
-import org.eclipse.smarthome.io.http.HandlerContext;
-import org.eclipse.smarthome.io.http.HandlerPriorities;
+import org.openhab.core.io.http.Handler;
+import org.openhab.core.io.http.HandlerContext;
+import org.openhab.core.io.http.HandlerPriorities;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicCredentialsExtractor.java b/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicCredentialsExtractor.java
index 566cdddf248..f90d557b00a 100644
--- a/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicCredentialsExtractor.java
+++ b/bundles/org.openhab.core.io.http.auth.basic/src/main/java/org/openhab/core/io/http/auth/basic/internal/BasicCredentialsExtractor.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.auth.basic.internal;
+package org.openhab.core.io.http.auth.basic.internal;
 
 import java.util.Base64;
 import java.util.Optional;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.eclipse.smarthome.core.auth.Credentials;
-import org.eclipse.smarthome.core.auth.UsernamePasswordCredentials;
-import org.eclipse.smarthome.io.http.auth.CredentialsExtractor;
+import org.openhab.core.auth.Credentials;
+import org.openhab.core.auth.UsernamePasswordCredentials;
+import org.openhab.core.io.http.auth.CredentialsExtractor;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/CredentialsExtractor.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/CredentialsExtractor.java
index 7581f1a81b3..290e2168cbe 100644
--- a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/CredentialsExtractor.java
+++ b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/CredentialsExtractor.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.auth;
+package org.openhab.core.io.http.auth;
 
 import java.util.Optional;
 
-import org.eclipse.smarthome.core.auth.Credentials;
+import org.openhab.core.auth.Credentials;
 
 /**
  * Provider of credentials which works in given context and can provide credentials out of it.
diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java
index 3bcdb178e9f..e754ce96729 100644
--- a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java
+++ b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthenticationHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.auth.internal;
+package org.openhab.core.io.http.auth.internal;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -22,14 +22,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.smarthome.core.auth.Authentication;
-import org.eclipse.smarthome.core.auth.AuthenticationException;
-import org.eclipse.smarthome.core.auth.AuthenticationManager;
-import org.eclipse.smarthome.core.auth.Credentials;
-import org.eclipse.smarthome.io.http.Handler;
-import org.eclipse.smarthome.io.http.HandlerContext;
-import org.eclipse.smarthome.io.http.HandlerPriorities;
-import org.eclipse.smarthome.io.http.auth.CredentialsExtractor;
+import org.openhab.core.auth.Authentication;
+import org.openhab.core.auth.AuthenticationException;
+import org.openhab.core.auth.AuthenticationManager;
+import org.openhab.core.auth.Credentials;
+import org.openhab.core.io.http.Handler;
+import org.openhab.core.io.http.HandlerContext;
+import org.openhab.core.io.http.HandlerPriorities;
+import org.openhab.core.io.http.auth.CredentialsExtractor;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Modified;
@@ -44,7 +44,7 @@
  *
  * @author Łukasz Dywicki - Initial contribution.
  */
-@Component(configurationPid = "org.eclipse.smarthome.auth")
+@Component(configurationPid = "org.openhab.core.auth")
 public class AuthenticationHandler implements Handler {
 
     private static final String AUTHENTICATION_ENABLED = "enabled";
diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/RedirectHandler.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/RedirectHandler.java
index 186677cd7e1..1a2ffb2211b 100644
--- a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/RedirectHandler.java
+++ b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/RedirectHandler.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.auth.internal;
+package org.openhab.core.io.http.auth.internal;
 
 import java.util.Optional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.smarthome.core.auth.Authentication;
-import org.eclipse.smarthome.io.http.Handler;
-import org.eclipse.smarthome.io.http.HandlerContext;
-import org.eclipse.smarthome.io.http.HandlerPriorities;
+import org.openhab.core.auth.Authentication;
+import org.openhab.core.io.http.Handler;
+import org.openhab.core.io.http.HandlerContext;
+import org.openhab.core.io.http.HandlerPriorities;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/Handler.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/Handler.java
index 073f7d5ad24..453fac37e0c 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/Handler.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/Handler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http;
+package org.openhab.core.io.http;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerContext.java
index af3c8c064c1..bcf2a4a1a45 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerContext.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerContext.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http;
+package org.openhab.core.io.http;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerPriorities.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerPriorities.java
index c4c3e842ff2..b6a3b912978 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerPriorities.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HandlerPriorities.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http;
+package org.openhab.core.io.http;
 
 /**
  * Constants for making handlers in proper order.
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HttpContextFactoryService.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HttpContextFactoryService.java
index e729810fb24..e547f6d1e88 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HttpContextFactoryService.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/HttpContextFactoryService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http;
+package org.openhab.core.io.http;
 
 import org.osgi.framework.Bundle;
 import org.osgi.service.http.HttpContext;
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/WrappingHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/WrappingHttpContext.java
index 18ff12d2b3c..c2238eee7f6 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/WrappingHttpContext.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/WrappingHttpContext.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http;
+package org.openhab.core.io.http;
 
 import org.osgi.framework.Bundle;
 import org.osgi.service.http.HttpContext;
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/BundleHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/BundleHttpContext.java
index 594cd0dfa6b..749088985d6 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/BundleHttpContext.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/BundleHttpContext.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.internal;
+package org.openhab.core.io.http.internal;
 
 import java.net.URL;
 
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/CatchHandler.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/CatchHandler.java
index b1e33637279..0bd7defd727 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/CatchHandler.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/CatchHandler.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.internal;
+package org.openhab.core.io.http.internal;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.smarthome.io.http.Handler;
-import org.eclipse.smarthome.io.http.HandlerContext;
+import org.openhab.core.io.http.Handler;
+import org.openhab.core.io.http.HandlerContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DefaultHandlerContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DefaultHandlerContext.java
index 90067c33296..dd9cccfaae7 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DefaultHandlerContext.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DefaultHandlerContext.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.internal;
+package org.openhab.core.io.http.internal;
 
 import java.util.Deque;
 import java.util.Iterator;
@@ -18,8 +18,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.smarthome.io.http.Handler;
-import org.eclipse.smarthome.io.http.HandlerContext;
+import org.openhab.core.io.http.Handler;
+import org.openhab.core.io.http.HandlerContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DelegatingHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DelegatingHttpContext.java
index 98590f5a4d9..e4f954830f5 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DelegatingHttpContext.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/DelegatingHttpContext.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.internal;
+package org.openhab.core.io.http.internal;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImpl.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImpl.java
index 512896d7d84..8259a3def42 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImpl.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImpl.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.internal;
+package org.openhab.core.io.http.internal;
 
-import org.eclipse.smarthome.io.http.HttpContextFactoryService;
-import org.eclipse.smarthome.io.http.WrappingHttpContext;
+import org.openhab.core.io.http.HttpContextFactoryService;
+import org.openhab.core.io.http.WrappingHttpContext;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/SmartHomeHttpContext.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/SmartHomeHttpContext.java
index f0477054465..fc70164878f 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/SmartHomeHttpContext.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/internal/SmartHomeHttpContext.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.internal;
+package org.openhab.core.io.http.internal;
 
 import java.io.IOException;
 import java.net.URL;
@@ -24,8 +24,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.smarthome.io.http.Handler;
-import org.eclipse.smarthome.io.http.WrappingHttpContext;
+import org.openhab.core.io.http.Handler;
+import org.openhab.core.io.http.WrappingHttpContext;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/BaseSmartHomeServlet.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/BaseSmartHomeServlet.java
index 6d36a8a00b1..72292c30327 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/BaseSmartHomeServlet.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/BaseSmartHomeServlet.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.servlet;
+package org.openhab.core.io.http.servlet;
 
 import java.util.Hashtable;
 
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeBundleServlet.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeBundleServlet.java
index fe89f26286c..068db7a1c4d 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeBundleServlet.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeBundleServlet.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.servlet;
+package org.openhab.core.io.http.servlet;
 
-import org.eclipse.smarthome.io.http.HttpContextFactoryService;
+import org.openhab.core.io.http.HttpContextFactoryService;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.http.HttpContext;
diff --git a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeServlet.java b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeServlet.java
index a2f0f6551b3..4a5c19093a8 100644
--- a/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeServlet.java
+++ b/bundles/org.openhab.core.io.http/src/main/java/org/openhab/core/io/http/servlet/SmartHomeServlet.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.servlet;
+package org.openhab.core.io.http.servlet;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.osgi.service.http.HttpContext;
diff --git a/bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java b/bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java
index 7fe21cb4d28..acbe5ed0410 100644
--- a/bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java
+++ b/bundles/org.openhab.core.io.http/src/test/java/org/openhab/core/io/http/internal/HttpContextFactoryServiceImplTest.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.http.internal;
+package org.openhab.core.io.http.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import org.eclipse.smarthome.io.http.WrappingHttpContext;
+import org.openhab.core.io.http.WrappingHttpContext;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java b/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java
index dbdd5df7376..02e1607d5cf 100644
--- a/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java
+++ b/bundles/org.openhab.core.io.monitor/src/main/java/org/openhab/core/io/monitor/internal/EventLogger.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.monitor.internal;
+package org.openhab.core.io.monitor.internal;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/exec/ExecUtil.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/exec/ExecUtil.java
index d2bdeb17432..b4ac6e9ae0b 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/exec/ExecUtil.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/exec/ExecUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.exec;
+package org.openhab.core.io.net.exec;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/ExtensibleTrustManager.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/ExtensibleTrustManager.java
index 7d40ffb5a35..85c9b3e67ec 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/ExtensibleTrustManager.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/ExtensibleTrustManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import javax.net.ssl.TrustManager;
 
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientFactory.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientFactory.java
index c68d9b98381..b3bc90f9f4d 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientFactory.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jetty.client.HttpClient;
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientInitializationException.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientInitializationException.java
index 4e2dbb8246c..a69a48488b1 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientInitializationException.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpClientInitializationException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 /**
  * This exception is thrown, if an unexpected error occurs during initialization of the Jetty client
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpRequestBuilder.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpRequestBuilder.java
index a79057efa73..92f06ee2095 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpRequestBuilder.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpRequestBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpUtil.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpUtil.java
index 29cac658bb6..c119d50538a 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpUtil.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/HttpUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import static org.eclipse.jetty.http.HttpMethod.*;
 
@@ -44,7 +44,7 @@
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.util.B64Code;
 import org.eclipse.jetty.util.StringUtil;
-import org.eclipse.smarthome.core.library.types.RawType;
+import org.openhab.core.library.types.RawType;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsCertificateProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsCertificateProvider.java
index a4432759dd2..4c02dc3f129 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsCertificateProvider.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsCertificateProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import java.net.URL;
 
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsProvider.java
index 5be3f347ce1..72facaf3e42 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsProvider.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsTrustManagerProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsTrustManagerProvider.java
index e6b65f41ae6..09ff11e4eef 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsTrustManagerProvider.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TlsTrustManagerProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import javax.net.ssl.X509ExtendedTrustManager;
 
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustAllTrustMananger.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustAllTrustMananger.java
index 68a97424434..3ca0554363e 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustAllTrustMananger.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustAllTrustMananger.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import java.net.Socket;
 import java.security.cert.CertificateException;
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustManagerProvider.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustManagerProvider.java
index 092900568c0..12b1c13efcb 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustManagerProvider.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/TrustManagerProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import java.util.stream.Stream;
 
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/WebSocketFactory.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/WebSocketFactory.java
index 11c52bf91c1..59ca6a82275 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/WebSocketFactory.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/WebSocketFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImpl.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImpl.java
index 4e41386cb22..7ef81fb4c88 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImpl.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http.internal;
+package org.openhab.core.io.net.http.internal;
 
 import java.net.Socket;
 import java.security.cert.CertificateException;
@@ -29,9 +29,9 @@
 import javax.net.ssl.X509ExtendedTrustManager;
 import javax.security.auth.x500.X500Principal;
 
-import org.eclipse.smarthome.io.net.http.ExtensibleTrustManager;
-import org.eclipse.smarthome.io.net.http.TlsCertificateProvider;
-import org.eclipse.smarthome.io.net.http.TlsTrustManagerProvider;
+import org.openhab.core.io.net.http.ExtensibleTrustManager;
+import org.openhab.core.io.net.http.TlsCertificateProvider;
+import org.openhab.core.io.net.http.TlsTrustManagerProvider;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TlsCertificateTrustManagerAdapter.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TlsCertificateTrustManagerAdapter.java
index 4d80cf52c20..7eb435b52b7 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TlsCertificateTrustManagerAdapter.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TlsCertificateTrustManagerAdapter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http.internal;
+package org.openhab.core.io.net.http.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,8 +25,8 @@
 import javax.net.ssl.X509ExtendedTrustManager;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.io.net.http.TlsCertificateProvider;
-import org.eclipse.smarthome.io.net.http.TlsTrustManagerProvider;
+import org.openhab.core.io.net.http.TlsCertificateProvider;
+import org.openhab.core.io.net.http.TlsTrustManagerProvider;
 
 /**
  * Adapter to use a {@code TlsCertificateProvider} as a {@code TlsTrustManagerProvider}
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TrustManagerUtil.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TrustManagerUtil.java
index 5cd6cff8b34..4d962ddf777 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TrustManagerUtil.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/TrustManagerUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http.internal;
+package org.openhab.core.io.net.http.internal;
 
 import java.security.KeyStore;
 import java.security.KeyStoreException;
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java
index aa6f2f8e66b..27bce6b36ce 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/openhab/core/io/net/http/internal/WebClientFactoryImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http.internal;
+package org.openhab.core.io.net.http.internal;
 
 import java.security.AccessController;
 import java.security.KeyManagementException;
@@ -31,11 +31,11 @@
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
-import org.eclipse.smarthome.io.net.http.ExtensibleTrustManager;
-import org.eclipse.smarthome.io.net.http.HttpClientFactory;
-import org.eclipse.smarthome.io.net.http.HttpClientInitializationException;
-import org.eclipse.smarthome.io.net.http.TrustManagerProvider;
-import org.eclipse.smarthome.io.net.http.WebSocketFactory;
+import org.openhab.core.io.net.http.ExtensibleTrustManager;
+import org.openhab.core.io.net.http.HttpClientFactory;
+import org.openhab.core.io.net.http.HttpClientInitializationException;
+import org.openhab.core.io.net.http.TrustManagerProvider;
+import org.openhab.core.io.net.http.WebSocketFactory;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -53,7 +53,7 @@
  * @author Kai Kreuzer - added web socket support
  * @author Martin van Wingerden - Add support for ESHTrustManager
  */
-@Component(immediate = true, configurationPid = "org.eclipse.smarthome.webclient")
+@Component(immediate = true, configurationPid = "org.openhab.core.webclient")
 @NonNullByDefault
 public class WebClientFactoryImpl implements HttpClientFactory, WebSocketFactory {
 
diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java
index b5bd59a08cd..6297fa09187 100644
--- a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java
+++ b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/BaseHttpUtilTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.when;
diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpRequestBuilderTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpRequestBuilderTest.java
index d5bced4f43e..faa92f08378 100644
--- a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpRequestBuilderTest.java
+++ b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpRequestBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.verify;
diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java
index 8c23873d3bc..d9b560de511 100644
--- a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java
+++ b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/HttpUtilTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http;
+package org.openhab.core.io.net.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.*;
diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImplTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImplTest.java
index 9719595d087..a7b3c69f99e 100644
--- a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImplTest.java
+++ b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/ExtensibleTrustManagerImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http.internal;
+package org.openhab.core.io.net.http.internal;
 
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.initMocks;
@@ -30,7 +30,7 @@
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.commons.lang.reflect.FieldUtils;
-import org.eclipse.smarthome.io.net.http.TlsTrustManagerProvider;
+import org.openhab.core.io.net.http.TlsTrustManagerProvider;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/WebClientFactoryImplTest.java b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/WebClientFactoryImplTest.java
index 11c91084526..b1f878955e8 100644
--- a/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/WebClientFactoryImplTest.java
+++ b/bundles/org.openhab.core.io.net/src/test/java/org/openhab/core/io/net/http/internal/WebClientFactoryImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.net.http.internal;
+package org.openhab.core.io.net.http.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -37,7 +37,7 @@
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
-import org.eclipse.smarthome.io.net.http.TrustManagerProvider;
+import org.openhab.core.io.net.http.TrustManagerProvider;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioMapper.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioMapper.java
index 08bc532e864..f735ea3aa55 100644
--- a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioMapper.java
+++ b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioMapper.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.audio.internal;
+package org.openhab.core.io.rest.audio.internal;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.audio.AudioSource;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioSource;
 
 /**
  * Mapper class that maps {@link AudioSink} and {@link AudioSource} instanced to their respective DTOs.
diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioResource.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioResource.java
index 5e0f17493e8..29cdf1e966f 100644
--- a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioResource.java
+++ b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.audio.internal;
+package org.openhab.core.io.rest.audio.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,13 +29,13 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.audio.AudioSource;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioSource;
+import org.openhab.core.auth.Role;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSinkDTO.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSinkDTO.java
index d6512c2f7f7..fbc5e6e4ab9 100644
--- a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSinkDTO.java
+++ b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSinkDTO.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.audio.internal;
+package org.openhab.core.io.rest.audio.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.audio.AudioSink;
+import org.openhab.core.audio.AudioSink;
 
 /**
  * A DTO that is used on the REST API to provide infos about {@link AudioSink} to UIs.
diff --git a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSourceDTO.java b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSourceDTO.java
index aa9c4f4ee8c..9558784142f 100644
--- a/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSourceDTO.java
+++ b/bundles/org.openhab.core.io.rest.audio/src/main/java/org/openhab/core/io/rest/audio/internal/AudioSourceDTO.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.audio.internal;
+package org.openhab.core.io.rest.audio.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.audio.AudioSource;
+import org.openhab.core.audio.AudioSource;
 
 /**
  * A DTO that is used on the REST API to provide infos about {@link AudioSource} to UIs.
diff --git a/bundles/org.openhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/SmartHomeRestServletConfig.java b/bundles/org.openhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/SmartHomeRestServletConfig.java
index b397a6a6009..1b3fe3d8667 100644
--- a/bundles/org.openhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/SmartHomeRestServletConfig.java
+++ b/bundles/org.openhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/SmartHomeRestServletConfig.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.auth.internal;
+package org.openhab.core.io.rest.auth.internal;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
diff --git a/bundles/org.openhab.core.io.rest.core/bnd.bnd b/bundles/org.openhab.core.io.rest.core/bnd.bnd
index 4913a130f37..8dc18c1b85f 100644
--- a/bundles/org.openhab.core.io.rest.core/bnd.bnd
+++ b/bundles/org.openhab.core.io.rest.core/bnd.bnd
@@ -1,2 +1,2 @@
 Bundle-SymbolicName: ${project.artifactId}
-Bundle-Activator: org.eclipse.smarthome.io.rest.core.internal.RESTCoreActivator
\ No newline at end of file
+Bundle-Activator: org.openhab.core.io.rest.core.internal.RESTCoreActivator
\ No newline at end of file
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/ConfigurationService.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/ConfigurationService.java
index c13f5e99f6c..8562f6f83eb 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/ConfigurationService.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/ConfigurationService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.config;
+package org.openhab.core.io.rest.core.config;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -22,8 +22,8 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.config.core.Configuration;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.cm.ConfigurationAdmin;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java
index 63558b5567d..f10e6f053f5 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapper.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.config;
+package org.openhab.core.io.rest.core.config;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTO;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterGroupDTO;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterGroupDTO;
 
 /**
  * The {@link EnrichedConfigDescriptionDTOMapper} is a utility class to map {@link ConfigDescription}s to config
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java
index 3a116f762b9..a9ffb3fec96 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionParameterDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.config;
+package org.openhab.core.io.rest.core.config;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
@@ -21,10 +21,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
-import org.eclipse.smarthome.config.core.dto.FilterCriteriaDTO;
-import org.eclipse.smarthome.config.core.dto.ParameterOptionDTO;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
+import org.openhab.core.config.core.dto.FilterCriteriaDTO;
+import org.openhab.core.config.core.dto.ParameterOptionDTO;
 
 /**
  * This is an enriched data transfer object that is used to serialize config descriptions parameters with a list of
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/GsonProvider.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/GsonProvider.java
index ee546cef32d..0031b097054 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/GsonProvider.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/GsonProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal;
+package org.openhab.core.io.rest.core.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/RESTCoreActivator.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/RESTCoreActivator.java
index b9c99c696ca..55a2dcb66ad 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/RESTCoreActivator.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/RESTCoreActivator.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal;
+package org.openhab.core.io.rest.core.internal;
 
-import org.eclipse.smarthome.io.rest.JSONResponse;
+import org.openhab.core.io.rest.JSONResponse;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java
index 4570ab10e49..21a90c87f0b 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/binding/BindingResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.binding;
+package org.openhab.core.io.rest.core.internal.binding;
 
 import java.io.IOException;
 import java.net.URI;
@@ -34,18 +34,18 @@
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.ConfigUtil;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.binding.BindingInfo;
-import org.eclipse.smarthome.core.binding.BindingInfoRegistry;
-import org.eclipse.smarthome.core.binding.dto.BindingInfoDTO;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
-import org.eclipse.smarthome.io.rest.core.config.ConfigurationService;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.ConfigUtil;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.auth.Role;
+import org.openhab.core.binding.BindingInfo;
+import org.openhab.core.binding.BindingInfoRegistry;
+import org.openhab.core.binding.dto.BindingInfoDTO;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.Stream2JSONInputStream;
+import org.openhab.core.io.rest.core.config.ConfigurationService;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResource.java
index 6601b526aa5..9e83de0b95d 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.channel;
+package org.openhab.core.io.rest.core.internal.channel;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -30,24 +30,24 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTO;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterGroupDTO;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.thing.dto.ChannelTypeDTO;
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeRegistry;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfileType;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterGroupDTO;
+import org.openhab.core.auth.Role;
+import org.openhab.core.thing.dto.ChannelTypeDTO;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeRegistry;
+import org.openhab.core.thing.profiles.TriggerProfileType;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.Stream2JSONInputStream;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResource.java
index 990d2d9f71f..301ad3dd134 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/config/ConfigDescriptionResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.config;
+package org.openhab.core.io.rest.core.internal.config;
 
 import java.net.URI;
 import java.util.Collection;
@@ -30,15 +30,15 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTO;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
-import org.eclipse.smarthome.io.rest.core.config.EnrichedConfigDescriptionDTOMapper;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTO;
+import org.openhab.core.auth.Role;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.Stream2JSONInputStream;
+import org.openhab.core.io.rest.core.config.EnrichedConfigDescriptionDTOMapper;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/DiscoveryResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/DiscoveryResource.java
index 0b1dcc95d0b..b533d81d86f 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/DiscoveryResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/DiscoveryResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.discovery;
+package org.openhab.core.io.rest.core.internal.discovery;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -26,10 +26,10 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryServiceRegistry;
-import org.eclipse.smarthome.config.discovery.ScanListener;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.config.discovery.DiscoveryServiceRegistry;
+import org.openhab.core.config.discovery.ScanListener;
+import org.openhab.core.auth.Role;
+import org.openhab.core.io.rest.RESTResource;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java
index b097995f4ee..360bfda8ff4 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.discovery;
+package org.openhab.core.io.rest.core.internal.discovery;
 
 import java.util.stream.Stream;
 
@@ -30,16 +30,16 @@
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTO;
-import org.eclipse.smarthome.config.discovery.dto.DiscoveryResultDTOMapper;
-import org.eclipse.smarthome.config.discovery.inbox.Inbox;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.config.discovery.dto.DiscoveryResultDTO;
+import org.openhab.core.config.discovery.dto.DiscoveryResultDTOMapper;
+import org.openhab.core.config.discovery.inbox.Inbox;
+import org.openhab.core.auth.Role;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.Stream2JSONInputStream;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/extensions/ExtensionResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/extensions/ExtensionResource.java
index 66dbd8b0d12..273f5f5a42f 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/extensions/ExtensionResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/extensions/ExtensionResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.extensions;
+package org.openhab.core.io.rest.core.internal.extensions;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -36,18 +36,18 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.extension.Extension;
-import org.eclipse.smarthome.core.extension.ExtensionEventFactory;
-import org.eclipse.smarthome.core.extension.ExtensionService;
-import org.eclipse.smarthome.core.extension.ExtensionType;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
+import org.openhab.core.auth.Role;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.extension.Extension;
+import org.openhab.core.extension.ExtensionEventFactory;
+import org.openhab.core.extension.ExtensionService;
+import org.openhab.core.extension.ExtensionType;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.Stream2JSONInputStream;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java
index b012c878647..77c5896653e 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.item;
+package org.openhab.core.io.rest.core.internal.item;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45,37 +45,37 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemBuilderFactory;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.ManagedItemProvider;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
-import org.eclipse.smarthome.core.items.dto.GroupItemDTO;
-import org.eclipse.smarthome.core.items.dto.ItemDTOMapper;
-import org.eclipse.smarthome.core.items.dto.MetadataDTO;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.items.RollershutterItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.UpDownType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.TypeParser;
-import org.eclipse.smarthome.io.rest.DTOMapper;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
-import org.eclipse.smarthome.io.rest.core.item.EnrichedGroupItemDTO;
-import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTO;
-import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTOMapper;
+import org.openhab.core.auth.Role;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemBuilderFactory;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.ManagedItemProvider;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataRegistry;
+import org.openhab.core.items.dto.GroupItemDTO;
+import org.openhab.core.items.dto.ItemDTOMapper;
+import org.openhab.core.items.dto.MetadataDTO;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.items.RollershutterItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.UpDownType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.TypeParser;
+import org.openhab.core.io.rest.DTOMapper;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.Stream2JSONInputStream;
+import org.openhab.core.io.rest.core.item.EnrichedGroupItemDTO;
+import org.openhab.core.io.rest.core.item.EnrichedItemDTO;
+import org.openhab.core.io.rest.core.item.EnrichedItemDTOMapper;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java
index fda659d0fcc..e2473c3da67 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.item;
+package org.openhab.core.io.rest.core.internal.item;
 
 import static java.util.stream.Collectors.toSet;
 
@@ -25,10 +25,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.core.common.AbstractUID;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.common.AbstractUID;
+import org.openhab.core.items.MetadataRegistry;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResource.java
index 4c5de9b0a4c..594b64704b6 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/link/ItemChannelLinkResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.link;
+package org.openhab.core.io.rest.core.internal.link;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -29,17 +29,17 @@
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.link.AbstractLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.link.ThingLinkManager;
-import org.eclipse.smarthome.core.thing.link.dto.ItemChannelLinkDTO;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.auth.Role;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.link.AbstractLink;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.link.ThingLinkManager;
+import org.openhab.core.thing.link.dto.ItemChannelLinkDTO;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.Stream2JSONInputStream;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java
index 21314d50e5e..221e44ed5c5 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.persistence;
+package org.openhab.core.io.rest.core.internal.persistence;
 
 import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
@@ -35,28 +35,28 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.i18n.TimeZoneProvider;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.OpenClosedType;
-import org.eclipse.smarthome.core.persistence.FilterCriteria;
-import org.eclipse.smarthome.core.persistence.FilterCriteria.Ordering;
-import org.eclipse.smarthome.core.persistence.HistoricItem;
-import org.eclipse.smarthome.core.persistence.ModifiablePersistenceService;
-import org.eclipse.smarthome.core.persistence.PersistenceService;
-import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry;
-import org.eclipse.smarthome.core.persistence.QueryablePersistenceService;
-import org.eclipse.smarthome.core.persistence.dto.ItemHistoryDTO;
-import org.eclipse.smarthome.core.persistence.dto.PersistenceServiceDTO;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.TypeParser;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.auth.Role;
+import org.openhab.core.i18n.TimeZoneProvider;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.OpenClosedType;
+import org.openhab.core.persistence.FilterCriteria;
+import org.openhab.core.persistence.FilterCriteria.Ordering;
+import org.openhab.core.persistence.HistoricItem;
+import org.openhab.core.persistence.ModifiablePersistenceService;
+import org.openhab.core.persistence.PersistenceService;
+import org.openhab.core.persistence.PersistenceServiceRegistry;
+import org.openhab.core.persistence.QueryablePersistenceService;
+import org.openhab.core.persistence.dto.ItemHistoryDTO;
+import org.openhab.core.persistence.dto.PersistenceServiceDTO;
+import org.openhab.core.types.State;
+import org.openhab.core.types.TypeParser;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResource.java
index a077ffd39cd..3c0324f26cd 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.profile;
+package org.openhab.core.io.rest.core.internal.profile;
 
 import java.util.Collection;
 import java.util.Locale;
@@ -28,20 +28,20 @@
 import javax.ws.rs.core.Response;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.items.ItemUtil;
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeRegistry;
-import org.eclipse.smarthome.core.thing.profiles.StateProfileType;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfileType;
-import org.eclipse.smarthome.core.thing.profiles.dto.ProfileTypeDTO;
-import org.eclipse.smarthome.core.thing.profiles.dto.ProfileTypeDTOMapper;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
+import org.openhab.core.auth.Role;
+import org.openhab.core.items.ItemUtil;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeRegistry;
+import org.openhab.core.thing.profiles.StateProfileType;
+import org.openhab.core.thing.profiles.TriggerProfileType;
+import org.openhab.core.thing.profiles.dto.ProfileTypeDTO;
+import org.openhab.core.thing.profiles.dto.ProfileTypeDTOMapper;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.Stream2JSONInputStream;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java
index c993a010b7e..d94d301aedf 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.service;
+package org.openhab.core.io.rest.core.internal.service;
 
 import java.io.IOException;
 import java.net.URI;
@@ -35,17 +35,17 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.ConfigUtil;
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.core.config.ConfigurationService;
-import org.eclipse.smarthome.io.rest.core.internal.RESTCoreActivator;
-import org.eclipse.smarthome.io.rest.core.service.ConfigurableServiceDTO;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.ConfigUtil;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.auth.Role;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.core.config.ConfigurationService;
+import org.openhab.core.io.rest.core.internal.RESTCoreActivator;
+import org.openhab.core.io.rest.core.service.ConfigurableServiceDTO;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingResource.java
index 851c42a09db..8f9c9dfadbf 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.thing;
+package org.openhab.core.io.rest.core.internal.thing;
 
 import java.io.IOException;
 import java.net.URI;
@@ -47,53 +47,53 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.ConfigUtil;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.status.ConfigStatusInfo;
-import org.eclipse.smarthome.config.core.status.ConfigStatusService;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationException;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.items.ItemFactory;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.ManagedItemProvider;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingManager;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.dto.ChannelDTO;
-import org.eclipse.smarthome.core.thing.dto.ChannelDTOMapper;
-import org.eclipse.smarthome.core.thing.dto.StrippedThingTypeDTO;
-import org.eclipse.smarthome.core.thing.dto.ThingDTO;
-import org.eclipse.smarthome.core.thing.dto.ThingDTOMapper;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareRegistry;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareStatusInfo;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateService;
-import org.eclipse.smarthome.core.thing.firmware.dto.FirmwareDTO;
-import org.eclipse.smarthome.core.thing.firmware.dto.FirmwareStatusDTO;
-import org.eclipse.smarthome.core.thing.i18n.ThingStatusInfoI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.link.ManagedItemChannelLinkProvider;
-import org.eclipse.smarthome.core.thing.type.BridgeType;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
-import org.eclipse.smarthome.core.thing.util.ThingHelper;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
-import org.eclipse.smarthome.io.rest.core.thing.EnrichedThingDTO;
-import org.eclipse.smarthome.io.rest.core.thing.EnrichedThingDTOMapper;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.ConfigUtil;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.status.ConfigStatusInfo;
+import org.openhab.core.config.core.status.ConfigStatusService;
+import org.openhab.core.config.core.validation.ConfigValidationException;
+import org.openhab.core.auth.Role;
+import org.openhab.core.items.ItemFactory;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.ManagedItemProvider;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingManager;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.dto.ChannelDTO;
+import org.openhab.core.thing.dto.ChannelDTOMapper;
+import org.openhab.core.thing.dto.StrippedThingTypeDTO;
+import org.openhab.core.thing.dto.ThingDTO;
+import org.openhab.core.thing.dto.ThingDTOMapper;
+import org.openhab.core.thing.firmware.FirmwareRegistry;
+import org.openhab.core.thing.firmware.FirmwareStatusInfo;
+import org.openhab.core.thing.firmware.FirmwareUpdateService;
+import org.openhab.core.thing.firmware.dto.FirmwareDTO;
+import org.openhab.core.thing.firmware.dto.FirmwareStatusDTO;
+import org.openhab.core.thing.i18n.ThingStatusInfoI18nLocalizationService;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.link.ManagedItemChannelLinkProvider;
+import org.openhab.core.thing.type.BridgeType;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.thing.util.ThingHelper;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.Stream2JSONInputStream;
+import org.openhab.core.io.rest.core.thing.EnrichedThingDTO;
+import org.openhab.core.io.rest.core.thing.EnrichedThingDTOMapper;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingTypeResource.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingTypeResource.java
index db90b99b69e..c5a50819d15 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingTypeResource.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/thing/ThingTypeResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.thing;
+package org.openhab.core.io.rest.core.internal.thing;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,31 +27,31 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTO;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTOMapper;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterGroupDTO;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.dto.ChannelDefinitionDTO;
-import org.eclipse.smarthome.core.thing.dto.ChannelGroupDefinitionDTO;
-import org.eclipse.smarthome.core.thing.dto.StrippedThingTypeDTO;
-import org.eclipse.smarthome.core.thing.dto.StrippedThingTypeDTOMapper;
-import org.eclipse.smarthome.core.thing.dto.ThingTypeDTO;
-import org.eclipse.smarthome.core.thing.type.BridgeType;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.Stream2JSONInputStream;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTOMapper;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterGroupDTO;
+import org.openhab.core.auth.Role;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.dto.ChannelDefinitionDTO;
+import org.openhab.core.thing.dto.ChannelGroupDefinitionDTO;
+import org.openhab.core.thing.dto.StrippedThingTypeDTO;
+import org.openhab.core.thing.dto.StrippedThingTypeDTOMapper;
+import org.openhab.core.thing.dto.ThingTypeDTO;
+import org.openhab.core.thing.type.BridgeType;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeRegistry;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.Stream2JSONInputStream;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedGroupItemDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedGroupItemDTO.java
index 950cf112103..9f46d6db3d3 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedGroupItemDTO.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedGroupItemDTO.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.item;
+package org.openhab.core.io.rest.core.item;
 
-import org.eclipse.smarthome.core.items.dto.GroupFunctionDTO;
-import org.eclipse.smarthome.core.items.dto.GroupItemDTO;
-import org.eclipse.smarthome.core.items.dto.ItemDTO;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.items.dto.GroupFunctionDTO;
+import org.openhab.core.items.dto.GroupItemDTO;
+import org.openhab.core.items.dto.ItemDTO;
+import org.openhab.core.types.StateDescription;
 
 /**
  * This is an enriched data transfer object that is used to serialize group items.
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTO.java
index 0b067fbc09c..47512d571e0 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTO.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTO.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.item;
+package org.openhab.core.io.rest.core.item;
 
 import java.util.Map;
 
-import org.eclipse.smarthome.core.items.dto.ItemDTO;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.items.dto.ItemDTO;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.StateDescription;
 
 /**
  * This is an enriched data transfer object that is used to serialize items with dynamic data like the state, the state
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapper.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapper.java
index 0fb2d59ac4d..c3b09ef640d 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapper.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.item;
+package org.openhab.core.io.rest.core.item;
 
 import java.net.URI;
 import java.util.Collection;
@@ -20,16 +20,16 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.dto.ItemDTO;
-import org.eclipse.smarthome.core.items.dto.ItemDTOMapper;
-import org.eclipse.smarthome.core.transform.TransformationException;
-import org.eclipse.smarthome.core.transform.TransformationHelper;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.io.rest.core.internal.RESTCoreActivator;
-import org.eclipse.smarthome.io.rest.core.internal.item.ItemResource;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.dto.ItemDTO;
+import org.openhab.core.items.dto.ItemDTOMapper;
+import org.openhab.core.transform.TransformationException;
+import org.openhab.core.transform.TransformationHelper;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.io.rest.core.internal.RESTCoreActivator;
+import org.openhab.core.io.rest.core.internal.item.ItemResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/ItemHistoryListDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/ItemHistoryListDTO.java
index 6e5bb62a2b7..ad11f8d3c10 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/ItemHistoryListDTO.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/persistence/ItemHistoryListDTO.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.persistence;
+package org.openhab.core.io.rest.core.persistence;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.smarthome.core.persistence.dto.ItemHistoryDTO;
+import org.openhab.core.persistence.dto.ItemHistoryDTO;
 
 /**
  * This is a java bean that is used to serialize item lists.
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/service/ConfigurableServiceDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/service/ConfigurableServiceDTO.java
index fd9b9333be4..e1f00623714 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/service/ConfigurableServiceDTO.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/service/ConfigurableServiceDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.service;
+package org.openhab.core.io.rest.core.service;
 
 /**
  * {@link ConfigurableServiceDTO} is a data transfer object for configurable services.
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedChannelDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedChannelDTO.java
index d032b7bd648..3d7de6999a9 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedChannelDTO.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedChannelDTO.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.thing;
+package org.openhab.core.io.rest.core.thing;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.thing.dto.ChannelDTO;
+import org.openhab.core.thing.dto.ChannelDTO;
 
 /**
  * This is a data transfer object that is used to serialize channels with dynamic data like linked items.
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTO.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTO.java
index 3fc0988709a..2f58a32f44a 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTO.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTO.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.thing;
+package org.openhab.core.io.rest.core.thing;
 
 import java.util.List;
 
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.dto.ChannelDTO;
-import org.eclipse.smarthome.core.thing.dto.ThingDTO;
-import org.eclipse.smarthome.core.thing.firmware.dto.FirmwareStatusDTO;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.dto.ChannelDTO;
+import org.openhab.core.thing.dto.ThingDTO;
+import org.openhab.core.thing.firmware.dto.FirmwareStatusDTO;
 
 /**
  * This is a data transfer object that is used to serialize things with dynamic data like the status.
diff --git a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapper.java b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapper.java
index 16c33648886..ba03f69eed9 100644
--- a/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapper.java
+++ b/bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.thing;
+package org.openhab.core.io.rest.core.thing;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,12 +18,12 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.dto.ChannelDTO;
-import org.eclipse.smarthome.core.thing.dto.ThingDTO;
-import org.eclipse.smarthome.core.thing.dto.ThingDTOMapper;
-import org.eclipse.smarthome.core.thing.firmware.dto.FirmwareStatusDTO;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.dto.ChannelDTO;
+import org.openhab.core.thing.dto.ThingDTO;
+import org.openhab.core.thing.dto.ThingDTOMapper;
+import org.openhab.core.thing.firmware.dto.FirmwareStatusDTO;
 
 /**
  * The {@link EnrichedThingDTOMapper} is an utility class to map things into enriched thing data transfer objects
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java
index 3d6cd2a6520..c9bcbca4dd9 100644
--- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java
+++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/config/EnrichedConfigDescriptionDTOMapperTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.config;
+package org.openhab.core.io.rest.core.config;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -19,12 +19,12 @@
 import java.net.URI;
 import java.util.Arrays;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionDTO;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.dto.ConfigDescriptionDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java
index a6dc8dc83bc..d36d6081ea9 100644
--- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java
+++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/channel/ChannelTypeResourceTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.channel;
+package org.openhab.core.io.rest.core.internal.channel;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -26,14 +26,14 @@
 
 import javax.ws.rs.core.Response;
 
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeRegistry;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfileType;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.io.rest.LocaleServiceImpl;
+import org.openhab.core.thing.profiles.ProfileTypeRegistry;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfileType;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.io.rest.LocaleServiceImpl;
 import org.hamcrest.core.IsCollectionContaining;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcherTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcherTest.java
index d803d65453c..c47bc9432e5 100644
--- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcherTest.java
+++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcherTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.item;
+package org.openhab.core.io.rest.core.internal.item;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -26,10 +26,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionBuilder;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.items.MetadataRegistry;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperTest.java
index 23d101a7864..5a3e5d65df3 100644
--- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperTest.java
+++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperTest.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.item;
+package org.openhab.core.io.rest.core.item;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 import java.net.URI;
 
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapperTest.java b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapperTest.java
index ad3b21083b2..9b33818adf5 100644
--- a/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapperTest.java
+++ b/bundles/org.openhab.core.io.rest.core/src/test/java/org/openhab/core/io/rest/core/thing/EnrichedThingDTOMapperTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.thing;
+package org.openhab.core.io.rest.core.thing;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -26,15 +26,15 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.firmware.dto.FirmwareStatusDTO;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.firmware.dto.FirmwareStatusDTO;
 import org.hamcrest.CoreMatchers;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogConstants.java b/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogConstants.java
index 5ea0046c559..5dd443c4fcb 100644
--- a/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogConstants.java
+++ b/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogConstants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.log.internal;
+package org.openhab.core.io.rest.log.internal;
 
 /**
  * The {@link LogConstants} class defines common constants, which are
diff --git a/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogHandler.java b/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogHandler.java
index eae9db08070..336b98d18ed 100644
--- a/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogHandler.java
+++ b/bundles/org.openhab.core.io.rest.log/src/main/java/org/openhab/core/io/rest/log/internal/LogHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.log.internal;
+package org.openhab.core.io.rest.log.internal;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -32,7 +32,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.io.rest.RESTResource;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java b/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java
index e9b5ed68992..0b17d92ddc0 100644
--- a/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java
+++ b/bundles/org.openhab.core.io.rest.mdns/src/main/java/org/openhab/core/io/rest/mdns/internal/MDNSAnnouncer.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.mdns.internal;
+package org.openhab.core.io.rest.mdns.internal;
 
 import java.util.Hashtable;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.net.HttpServiceUtil;
-import org.eclipse.smarthome.io.rest.RESTConstants;
-import org.eclipse.smarthome.io.transport.mdns.MDNSService;
-import org.eclipse.smarthome.io.transport.mdns.ServiceDescription;
+import org.openhab.core.net.HttpServiceUtil;
+import org.openhab.core.io.rest.RESTConstants;
+import org.openhab.core.io.transport.mdns.MDNSService;
+import org.openhab.core.io.transport.mdns.ServiceDescription;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
@@ -34,8 +34,8 @@
  * @author Kai Kreuzer - Initial contribution
  * @author Markus Rathgeb - Use HTTP service utility functions
  */
-@Component(immediate = true, configurationPid = "org.eclipse.smarthome.mdns", property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.mdns" //
+@Component(immediate = true, configurationPid = "org.openhab.core.mdns", property = {
+        Constants.SERVICE_PID + "=org.openhab.core.mdns" //
 })
 public class MDNSAnnouncer {
 
diff --git a/bundles/org.openhab.core.io.rest.optimize/bnd.bnd b/bundles/org.openhab.core.io.rest.optimize/bnd.bnd
index ab247a0d37f..6680184b53e 100644
--- a/bundles/org.openhab.core.io.rest.optimize/bnd.bnd
+++ b/bundles/org.openhab.core.io.rest.optimize/bnd.bnd
@@ -1,2 +1,2 @@
 Bundle-SymbolicName: ${project.artifactId}
-Bundle-Activator: org.eclipse.smarthome.io.rest.optimize.internal.Activator
\ No newline at end of file
+Bundle-Activator: org.openhab.core.io.rest.optimize.internal.Activator
\ No newline at end of file
diff --git a/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/Activator.java b/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/Activator.java
index 883bc47ec6c..549a17e3294 100644
--- a/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/Activator.java
+++ b/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/Activator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.optimize.internal;
+package org.openhab.core.io.rest.optimize.internal;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/ResourceFilterImpl.java b/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/ResourceFilterImpl.java
index b35173f8212..490cdbec199 100644
--- a/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/ResourceFilterImpl.java
+++ b/bundles/org.openhab.core.io.rest.optimize/src/main/java/org/openhab/core/io/rest/optimize/internal/ResourceFilterImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.optimize.internal;
+package org.openhab.core.io.rest.optimize.internal;
 
 import static com.eclipsesource.jaxrs.publisher.ServiceProperties.PUBLISH;
 
@@ -36,7 +36,7 @@
 /**
  * Provides a filter for all classes/interfaces which are relevant in the context of JAX-RS.
  *
- * By default, this filter will allow every service outside of the org.eclipse.smarthome.**-Namespace to be parsed by
+ * By default, this filter will allow every service outside of the org.openhab.core.**-Namespace to be parsed by
  * the JAXR-RS implementation. To further optimize this, install a fragment which adds a "/res/whitelist.txt" file,
  * containing one service interface or class per line like in the following example:
  *
@@ -65,11 +65,11 @@ public class ResourceFilterImpl implements ResourceFilter {
             // JAX-RS
             "javax.ws.rs.ext.MessageBodyReader", "javax.ws.rs.ext.MessageBodyWriter",
             // openHAB
-            "org.eclipse.smarthome.io.rest.internal.filter.ProxyFilter",
-            "org.eclipse.smarthome.io.rest.internal.resources.RootResource",
-            "org.eclipse.smarthome.io.rest.JSONResponse$ExceptionMapper", "org.eclipse.smarthome.io.rest.RESTResource",
-            "org.eclipse.smarthome.io.rest.sse.internal.async.BlockingAsyncFeature",
-            "org.eclipse.smarthome.io.rest.sse.SseResource",
+            "org.openhab.core.io.rest.internal.filter.ProxyFilter",
+            "org.openhab.core.io.rest.internal.resources.RootResource",
+            "org.openhab.core.io.rest.JSONResponse$ExceptionMapper", "org.openhab.core.io.rest.RESTResource",
+            "org.openhab.core.io.rest.sse.internal.async.BlockingAsyncFeature",
+            "org.openhab.core.io.rest.sse.SseResource",
             // SSE
             "org.glassfish.jersey.media.sse.SseFeature",
             "org.glassfish.jersey.server.monitoring.ApplicationEventListener" };
@@ -97,7 +97,7 @@ private String createFilter(String[] interfaces) {
         List<String> whitelist = loadWhitelistExtension();
         if (whitelist == null) {
             logger.debug("No /res/whitelist.txt file found - scanning all unknown services");
-            builder.append("(!(" + Constants.OBJECTCLASS + "=org.eclipse.smarthome.*))");
+            builder.append("(!(" + Constants.OBJECTCLASS + "=org.openhab.core.*))");
         } else {
             logger.debug("Whitelist /res/whitelist.txt file found - restricting scanning of services");
             whitelist.forEach(entry -> {
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java
index e69446fe80f..d0541a313ac 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/SitemapSubscriptionService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap;
+package org.openhab.core.io.rest.sitemap;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,21 +26,21 @@
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.events.ItemStatePredictedEvent;
-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.SitemapProvider;
-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.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.events.ItemStatePredictedEvent;
+import org.openhab.core.io.rest.sitemap.internal.PageChangeListener;
+import org.openhab.core.io.rest.sitemap.internal.SitemapEvent;
+import org.openhab.core.model.core.EventType;
+import org.openhab.core.model.core.ModelRepositoryChangeListener;
+import org.openhab.core.model.sitemap.SitemapProvider;
+import org.openhab.core.model.sitemap.sitemap.LinkableWidget;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
+import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.ui.items.ItemUIRegistry;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -62,7 +62,7 @@
  * @author Kai Kreuzer - Initial contribution
  */
 @Component(service = { SitemapSubscriptionService.class,
-        EventSubscriber.class }, configurationPid = "org.eclipse.smarthome.sitemapsubscription")
+        EventSubscriber.class }, configurationPid = "org.openhab.core.sitemapsubscription")
 public class SitemapSubscriptionService implements ModelRepositoryChangeListener, EventSubscriber {
 
     private static final String SITEMAP_PAGE_SEPARATOR = "#";
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/MappingDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/MappingDTO.java
index 470e7f9cabb..4b9ea3ad0bf 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/MappingDTO.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/MappingDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 /**
  * This is a data transfer object that is used to serialize command mappings.
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageChangeListener.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageChangeListener.java
index 449def45073..ed7625d6acc 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageChangeListener.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageChangeListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -22,22 +22,22 @@
 import java.util.function.Predicate;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.StateChangeListener;
-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.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;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.StateChangeListener;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.types.State;
+import org.openhab.core.io.rest.core.item.EnrichedItemDTOMapper;
+import org.openhab.core.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback;
+import org.openhab.core.model.sitemap.sitemap.Chart;
+import org.openhab.core.model.sitemap.sitemap.ColorArray;
+import org.openhab.core.model.sitemap.sitemap.Frame;
+import org.openhab.core.model.sitemap.sitemap.VisibilityRule;
+import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.ui.items.ItemUIRegistry;
 
 /**
  * This is a class that listens on item state change events and creates sitemap events for a dedicated sitemap page.
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageDTO.java
index dc4ba6c4b5f..ac1d358ad81 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageDTO.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/PageDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/ServerAliveEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/ServerAliveEvent.java
index 70359524b7c..71780891d10 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/ServerAliveEvent.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/ServerAliveEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 /**
  * Event to notify the browser that the sitemap has been changed
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapChangedEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapChangedEvent.java
index d56da4c1739..3601eaca1e7 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapChangedEvent.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapChangedEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 /**
  * Event to notify the browser that the sitemap has been changed
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapDTO.java
index 1d2c3de22a4..95c2b89faa3 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapDTO.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 /**
  * This is a data transfer object that is used to serialize sitemaps.
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEvent.java
index 210fc9b7e06..0ec2fcddaa1 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEvent.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 /**
  * A general sitemap event, meant to be sub-classed.
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEventOutput.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEventOutput.java
index c8c0768eca4..342461cab3e 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEventOutput.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapEventOutput.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 import java.io.IOException;
 
-import org.eclipse.smarthome.io.rest.sitemap.SitemapSubscriptionService;
+import org.openhab.core.io.rest.sitemap.SitemapSubscriptionService;
 import org.glassfish.jersey.media.sse.EventOutput;
 import org.glassfish.jersey.media.sse.OutboundEvent;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java
index fcb4ed2c3d6..cbe8a6981ba 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -48,39 +48,39 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.StateChangeListener;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.LocaleService;
-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.SitemapProvider;
-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.openhab.core.auth.Role;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.StateChangeListener;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.types.State;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.core.item.EnrichedItemDTOMapper;
+import org.openhab.core.io.rest.sitemap.SitemapSubscriptionService;
+import org.openhab.core.io.rest.sitemap.SitemapSubscriptionService.SitemapSubscriptionCallback;
+import org.openhab.core.model.sitemap.SitemapProvider;
+import org.openhab.core.model.sitemap.sitemap.Chart;
+import org.openhab.core.model.sitemap.sitemap.ColorArray;
+import org.openhab.core.model.sitemap.sitemap.Frame;
+import org.openhab.core.model.sitemap.sitemap.Image;
+import org.openhab.core.model.sitemap.sitemap.LinkableWidget;
+import org.openhab.core.model.sitemap.sitemap.List;
+import org.openhab.core.model.sitemap.sitemap.Mapping;
+import org.openhab.core.model.sitemap.sitemap.Mapview;
+import org.openhab.core.model.sitemap.sitemap.Selection;
+import org.openhab.core.model.sitemap.sitemap.Setpoint;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
+import org.openhab.core.model.sitemap.sitemap.Slider;
+import org.openhab.core.model.sitemap.sitemap.Switch;
+import org.openhab.core.model.sitemap.sitemap.Video;
+import org.openhab.core.model.sitemap.sitemap.VisibilityRule;
+import org.openhab.core.model.sitemap.sitemap.Webview;
+import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.ui.items.ItemUIRegistry;
 import org.glassfish.jersey.media.sse.EventOutput;
 import org.glassfish.jersey.media.sse.OutboundEvent;
 import org.glassfish.jersey.media.sse.SseBroadcaster;
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapWidgetEvent.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapWidgetEvent.java
index cddf47e0c8d..28dd1d5292c 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapWidgetEvent.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/SitemapWidgetEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
-import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTO;
+import org.openhab.core.io.rest.core.item.EnrichedItemDTO;
 
 /**
  * A sitemap event, which provides details about a widget that has changed.
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java
index e224fb0aaaa..f0ae885f986 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/main/java/org/openhab/core/io/rest/sitemap/internal/WidgetDTO.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.smarthome.io.rest.core.item.EnrichedItemDTO;
+import org.openhab.core.io.rest.core.item.EnrichedItemDTO;
 
 /**
  * This is a data transfer object that is used to serialize widgets.
diff --git a/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java b/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java
index 734b49100ca..be00db2c618 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java
+++ b/bundles/org.openhab.core.io.rest.sitemap/src/test/java/org/openhab/core/io/rest/sitemap/internal/SitemapResourceTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sitemap.internal;
+package org.openhab.core.io.rest.sitemap.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -34,21 +34,21 @@
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-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.SitemapProvider;
-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.openhab.core.items.GenericItem;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.model.sitemap.SitemapProvider;
+import org.openhab.core.model.sitemap.sitemap.ColorArray;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
+import org.openhab.core.model.sitemap.sitemap.VisibilityRule;
+import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.test.java.JavaTest;
+import org.openhab.core.ui.items.ItemUIRegistry;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -311,7 +311,7 @@ private EList<Widget> initSitemapWidgets() {
         Widget w1 = mock(Widget.class);
         EClass sliderEClass = mock(EClass.class);
         when(sliderEClass.getName()).thenReturn("slider");
-        when(sliderEClass.getInstanceTypeName()).thenReturn("org.eclipse.smarthome.model.sitemap.Slider");
+        when(sliderEClass.getInstanceTypeName()).thenReturn("org.openhab.core.model.sitemap.Slider");
         when(w1.eClass()).thenReturn(sliderEClass);
         when(w1.getLabel()).thenReturn(WIDGET1_LABEL);
         when(w1.getItem()).thenReturn(ITEM_NAME);
@@ -344,7 +344,7 @@ private EList<Widget> initSitemapWidgets() {
         Widget w2 = mock(Widget.class);
         EClass switchEClass = mock(EClass.class);
         when(switchEClass.getName()).thenReturn("switch");
-        when(switchEClass.getInstanceTypeName()).thenReturn("org.eclipse.smarthome.model.sitemap.Switch");
+        when(switchEClass.getInstanceTypeName()).thenReturn("org.openhab.core.model.sitemap.Switch");
         when(w2.eClass()).thenReturn(switchEClass);
         when(w2.getLabel()).thenReturn(WIDGET2_LABEL);
         when(w2.getItem()).thenReturn(ITEM_NAME);
diff --git a/bundles/org.openhab.core.io.rest.sse/bnd.bnd b/bundles/org.openhab.core.io.rest.sse/bnd.bnd
index 808a6240326..298cb78b283 100644
--- a/bundles/org.openhab.core.io.rest.sse/bnd.bnd
+++ b/bundles/org.openhab.core.io.rest.sse/bnd.bnd
@@ -1,2 +1,2 @@
 Bundle-SymbolicName: ${project.artifactId}
-Bundle-Activator: org.eclipse.smarthome.io.rest.sse.internal.SseActivator
\ No newline at end of file
+Bundle-Activator: org.openhab.core.io.rest.sse.internal.SseActivator
\ No newline at end of file
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java
index 0979c4a33bd..aaa379be5ef 100644
--- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java
+++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sse;
+package org.openhab.core.io.rest.sse;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
@@ -30,10 +30,10 @@
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.io.rest.sse.internal.SseEventOutput;
-import org.eclipse.smarthome.io.rest.sse.internal.util.SseUtil;
+import org.openhab.core.auth.Role;
+import org.openhab.core.events.Event;
+import org.openhab.core.io.rest.sse.internal.SseEventOutput;
+import org.openhab.core.io.rest.sse.internal.util.SseUtil;
 import org.glassfish.jersey.media.sse.EventOutput;
 import org.glassfish.jersey.media.sse.SseBroadcaster;
 import org.glassfish.jersey.media.sse.SseFeature;
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/beans/EventBean.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/beans/EventBean.java
index 55cea4bbbdf..67fe84d3116 100644
--- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/beans/EventBean.java
+++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/beans/EventBean.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sse.beans;
+package org.openhab.core.io.rest.sse.beans;
 
 /**
  * Event bean for broadcasted events.
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseActivator.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseActivator.java
index 8bd8ed0242d..99107ebe370 100644
--- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseActivator.java
+++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseActivator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sse.internal;
+package org.openhab.core.io.rest.sse.internal;
 
 import javax.ws.rs.ext.RuntimeDelegate;
 
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseEventOutput.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseEventOutput.java
index 6aac70d86af..9a43ce2dd8a 100644
--- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseEventOutput.java
+++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/SseEventOutput.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sse.internal;
+package org.openhab.core.io.rest.sse.internal;
 
 import java.io.IOException;
 import java.util.List;
 
-import org.eclipse.smarthome.io.rest.sse.beans.EventBean;
-import org.eclipse.smarthome.io.rest.sse.internal.util.SseUtil;
+import org.openhab.core.io.rest.sse.beans.EventBean;
+import org.openhab.core.io.rest.sse.internal.util.SseUtil;
 import org.glassfish.jersey.media.sse.EventOutput;
 import org.glassfish.jersey.media.sse.OutboundEvent;
 
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java
index 8e3608c873c..916e55c7138 100644
--- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java
+++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/listeners/SseEventSubscriber.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sse.internal.listeners;
+package org.openhab.core.io.rest.sse.internal.listeners;
 
 import java.util.Collections;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.io.rest.sse.SseResource;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.io.rest.sse.SseResource;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/util/SseUtil.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/util/SseUtil.java
index 0e758df1e96..b47222c2e29 100644
--- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/util/SseUtil.java
+++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/internal/util/SseUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sse.internal.util;
+package org.openhab.core.io.rest.sse.internal.util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,8 +19,8 @@
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.io.rest.sse.beans.EventBean;
+import org.openhab.core.events.Event;
+import org.openhab.core.io.rest.sse.beans.EventBean;
 import org.glassfish.jersey.media.sse.OutboundEvent;
 
 /**
diff --git a/bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/util/SseUtilTest.java b/bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/util/SseUtilTest.java
index add90b6328b..ead02bc80ed 100644
--- a/bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/util/SseUtilTest.java
+++ b/bundles/org.openhab.core.io.rest.sse/src/test/java/org/openhab/core/io/rest/sse/internal/util/SseUtilTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.sse.internal.util;
+package org.openhab.core.io.rest.sse.internal.util;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HLIMapper.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HLIMapper.java
index 5e7fed45ccb..94cfa6e3d5d 100644
--- a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HLIMapper.java
+++ b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HLIMapper.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.voice.internal;
+package org.openhab.core.io.rest.voice.internal;
 
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter;
+import org.openhab.core.voice.text.HumanLanguageInterpreter;
 
 /**
  * Mapper class that maps {@link HumanLanguageInterpreter} instanced to their respective DTOs.
diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HumanLanguageInterpreterDTO.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HumanLanguageInterpreterDTO.java
index 02a563922ea..c8c2e9dfa4b 100644
--- a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HumanLanguageInterpreterDTO.java
+++ b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/HumanLanguageInterpreterDTO.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.voice.internal;
+package org.openhab.core.io.rest.voice.internal;
 
 import java.util.Set;
 
-import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter;
+import org.openhab.core.voice.text.HumanLanguageInterpreter;
 
 /**
  * A DTO that is used on the REST API to provide infos about {@link HumanLanguageInterpreter} to UIs.
diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceDTO.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceDTO.java
index bc8424cb9c5..bf2fff99e1d 100644
--- a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceDTO.java
+++ b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceDTO.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.voice.internal;
+package org.openhab.core.io.rest.voice.internal;
 
-import org.eclipse.smarthome.core.voice.Voice;
+import org.openhab.core.voice.Voice;
 
 /**
  * A DTO that is used on the REST API to provide infos about {@link Voice} to UIs.
diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceMapper.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceMapper.java
index c53cf893a6b..6e25fc56f91 100644
--- a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceMapper.java
+++ b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceMapper.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.voice.internal;
+package org.openhab.core.io.rest.voice.internal;
 
-import org.eclipse.smarthome.core.voice.Voice;
+import org.openhab.core.voice.Voice;
 
 /**
  * Mapper class that maps {@link Voice} instanced to their respective DTOs.
diff --git a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceResource.java b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceResource.java
index fa876c71027..dab0a96e234 100644
--- a/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceResource.java
+++ b/bundles/org.openhab.core.io.rest.voice/src/main/java/org/openhab/core/io/rest/voice/internal/VoiceResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.voice.internal;
+package org.openhab.core.io.rest.voice.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,14 +33,14 @@
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.smarthome.core.auth.Role;
-import org.eclipse.smarthome.core.voice.Voice;
-import org.eclipse.smarthome.core.voice.VoiceManager;
-import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter;
-import org.eclipse.smarthome.core.voice.text.InterpretationException;
-import org.eclipse.smarthome.io.rest.JSONResponse;
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.auth.Role;
+import org.openhab.core.voice.Voice;
+import org.openhab.core.voice.VoiceManager;
+import org.openhab.core.voice.text.HumanLanguageInterpreter;
+import org.openhab.core.voice.text.InterpretationException;
+import org.openhab.core.io.rest.JSONResponse;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/DTOMapper.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/DTOMapper.java
index a1904dfe6e0..ab053d6111b 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/DTOMapper.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/DTOMapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest;
+package org.openhab.core.io.rest;
 
 import java.util.stream.Stream;
 
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/JSONResponse.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/JSONResponse.java
index bd3c40421ec..e1ba5727415 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/JSONResponse.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/JSONResponse.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest;
+package org.openhab.core.io.rest;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -25,7 +25,7 @@
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.smarthome.core.library.types.DateTimeType;
+import org.openhab.core.library.types.DateTimeType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleService.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleService.java
index 57e50c4b613..323dae018b9 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleService.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest;
+package org.openhab.core.io.rest;
 
 import java.util.Locale;
 
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleServiceImpl.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleServiceImpl.java
index e610ee7e365..25eb8df4214 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleServiceImpl.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/LocaleServiceImpl.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest;
+package org.openhab.core.io.rest;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
+import org.openhab.core.i18n.LocaleProvider;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTConstants.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTConstants.java
index 0d8585ce737..2778798be59 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTConstants.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTConstants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest;
+package org.openhab.core.io.rest;
 
 /**
  * Public constants for the REST API
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTResource.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTResource.java
index 624f0b5acda..629d30ed9c9 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTResource.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/RESTResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest;
+package org.openhab.core.io.rest;
 
 /**
  * This is a marker interface for REST resource implementations
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/Stream2JSONInputStream.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/Stream2JSONInputStream.java
index 8d9599066f3..78ac82b69e0 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/Stream2JSONInputStream.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/Stream2JSONInputStream.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest;
+package org.openhab.core.io.rest;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -18,7 +18,7 @@
 import java.util.stream.Stream;
 
 import org.apache.commons.io.IOUtils;
-import org.eclipse.smarthome.core.library.types.DateTimeType;
+import org.openhab.core.library.types.DateTimeType;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/Constants.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/Constants.java
index 11510d38f1f..c6e07602e98 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/Constants.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/Constants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.internal;
+package org.openhab.core.io.rest.internal;
 
 /**
  * Utility class for constants.
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/DTOMapperImpl.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/DTOMapperImpl.java
index 76a76e4f8a5..12d2fa842b3 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/DTOMapperImpl.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/DTOMapperImpl.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.internal;
+package org.openhab.core.io.rest.internal;
 
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.io.rest.DTOMapper;
+import org.openhab.core.io.rest.DTOMapper;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java
index 3b590c3ec8c..c0d55587a6c 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.internal.filter;
+package org.openhab.core.io.rest.internal.filter;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -26,7 +26,7 @@
 import javax.ws.rs.ext.Provider;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.io.rest.internal.Constants;
+import org.openhab.core.io.rest.internal.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ConfigurationPolicy;
@@ -45,7 +45,7 @@
  */
 @Provider
 @Component(immediate = true, property = {
-        "service.pid=org.eclipse.smarthome.cors" }, configurationPid = "org.eclipse.smarthome.cors", configurationPolicy = ConfigurationPolicy.REQUIRE)
+        "service.pid=org.openhab.core.cors" }, configurationPid = "org.openhab.core.cors", configurationPolicy = ConfigurationPolicy.REQUIRE)
 public class CorsFilter implements ContainerResponseFilter {
 
     static final String HTTP_HEAD_METHOD = "HEAD";
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java
index 05fad971e9d..7b81dd6efe3 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/ProxyFilter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.internal.filter;
+package org.openhab.core.io.rest.internal.filter;
 
 import java.io.IOException;
 import java.net.URI;
@@ -37,7 +37,7 @@
  */
 @Provider
 @PreMatching
-@Component(configurationPid = "org.eclipse.smarthome.io.rest.proxyfilter", immediate = true, service = ProxyFilter.class)
+@Component(configurationPid = "org.openhab.core.io.rest.proxyfilter", immediate = true, service = ProxyFilter.class)
 public class ProxyFilter implements ContainerRequestFilter {
 
     static final String PROTO_PROXY_HEADER = "x-forwarded-proto";
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilter.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilter.java
index f19c10a21fd..26bad928cec 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilter.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.internal.filter;
+package org.openhab.core.io.rest.internal.filter;
 
 import java.io.IOException;
 import java.util.List;
@@ -22,7 +22,7 @@
 import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.io.rest.RESTResource;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java
index 224e0e4e4a0..1ffdf819742 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/RootResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.internal.resources;
+package org.openhab.core.io.rest.internal.resources;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,10 +27,10 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.smarthome.io.rest.RESTConstants;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.io.rest.internal.Constants;
-import org.eclipse.smarthome.io.rest.internal.resources.beans.RootBean;
+import org.openhab.core.io.rest.RESTConstants;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.io.rest.internal.Constants;
+import org.openhab.core.io.rest.internal.resources.beans.RootBean;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.annotations.Activate;
@@ -54,7 +54,7 @@
  * @author Kai Kreuzer - Initial contribution
  */
 @Path("/")
-@Component(service = RootResource.class, configurationPid = "org.eclipse.smarthome.io.rest.root")
+@Component(service = RootResource.class, configurationPid = "org.openhab.core.io.rest.root")
 public class RootResource {
 
     private final transient Logger logger = LoggerFactory.getLogger(RootResource.class);
diff --git a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/RootBean.java b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/RootBean.java
index cea76cd1b9a..8373a740b58 100644
--- a/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/RootBean.java
+++ b/bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/RootBean.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.internal.resources.beans;
+package org.openhab.core.io.rest.internal.resources.beans;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/JSONResponseTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/JSONResponseTest.java
index be348f5fe3b..9d3b68774eb 100644
--- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/JSONResponseTest.java
+++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/JSONResponseTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest;
+package org.openhab.core.io.rest;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith;
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java
index dbb163a226c..63b9f815413 100644
--- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java
+++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/Stream2JSONInputStreamTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest;
+package org.openhab.core.io.rest;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java
index 20e4d360789..054a6da33e4 100644
--- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java
+++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/CorsFilterTest.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.internal.filter;
+package org.openhab.core.io.rest.internal.filter;
 
 import static java.util.Collections.*;
 import static java.util.stream.Collectors.toList;
-import static org.eclipse.smarthome.io.rest.internal.filter.CorsFilter.*;
+import static org.openhab.core.io.rest.internal.filter.CorsFilter.*;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.when;
 
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java
index fced933c844..0eebd4d941d 100644
--- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java
+++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/ProxyFilterTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.internal.filter;
+package org.openhab.core.io.rest.internal.filter;
 
-import static org.eclipse.smarthome.io.rest.internal.filter.ProxyFilter.*;
+import static org.openhab.core.io.rest.internal.filter.ProxyFilter.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
diff --git a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilterTest.java b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilterTest.java
index 8f9379d16ce..ab857177add 100644
--- a/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilterTest.java
+++ b/bundles/org.openhab.core.io.rest/src/test/java/org/openhab/core/io/rest/internal/filter/SatisfiableResourceFilterTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.internal.filter;
+package org.openhab.core.io.rest.internal.filter;
 
 import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
@@ -24,7 +24,7 @@
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.smarthome.io.rest.RESTResource;
+import org.openhab.core.io.rest.RESTResource;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.io.transport.mdns/bnd.bnd b/bundles/org.openhab.core.io.transport.mdns/bnd.bnd
index 9997614a223..71cf89cd230 100644
--- a/bundles/org.openhab.core.io.transport.mdns/bnd.bnd
+++ b/bundles/org.openhab.core.io.transport.mdns/bnd.bnd
@@ -1,2 +1,2 @@
 Bundle-SymbolicName: ${project.artifactId}
-Bundle-Activator: org.eclipse.smarthome.io.transport.mdns.internal.MDNSActivator
\ No newline at end of file
+Bundle-Activator: org.openhab.core.io.transport.mdns.internal.MDNSActivator
\ No newline at end of file
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSClient.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSClient.java
index 4db206f0b5c..3cc79c1648d 100644
--- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSClient.java
+++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSClient.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mdns;
+package org.openhab.core.io.transport.mdns;
 
 import java.io.IOException;
 import java.time.Duration;
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSService.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSService.java
index cabf4a64d43..578c976fbed 100644
--- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSService.java
+++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/MDNSService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mdns;
+package org.openhab.core.io.transport.mdns;
 
 /**
  * This interface defines how to use JmDNS based service discovery
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/ServiceDescription.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/ServiceDescription.java
index 3ceda81718a..9c9ee2fabaa 100644
--- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/ServiceDescription.java
+++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/ServiceDescription.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mdns;
+package org.openhab.core.io.transport.mdns;
 
 import java.util.Hashtable;
 
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java
index 5d370828efa..bbf6c013703 100644
--- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java
+++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/discovery/MDNSDiscoveryParticipant.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mdns.discovery;
+package org.openhab.core.io.transport.mdns.discovery;
 
 import java.util.Set;
 
 import javax.jmdns.ServiceInfo;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * A {@link MDNSDiscoveryParticipant} that is registered as a service is picked up by the MDNSDiscoveryService
@@ -26,7 +26,7 @@
  * mDNS scans.
  *
  * @author Tobias Bräutigam - Initial contribution
- * @deprecated use org.eclipse.smarthome.config.discovery.mdns.MDNSDiscoveryParticipant instead.
+ * @deprecated use org.openhab.core.config.discovery.mdns.MDNSDiscoveryParticipant instead.
  */
 @Deprecated
 public interface MDNSDiscoveryParticipant {
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSActivator.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSActivator.java
index 6c8a5447ba5..0cb1c323cb3 100644
--- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSActivator.java
+++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSActivator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mdns.internal;
+package org.openhab.core.io.transport.mdns.internal;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java
index 2e9f162eff4..4d809236535 100644
--- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java
+++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSClientImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mdns.internal;
+package org.openhab.core.io.transport.mdns.internal;
 
 import java.io.IOException;
 import java.net.Inet4Address;
@@ -30,11 +30,11 @@
 import javax.jmdns.ServiceInfo;
 import javax.jmdns.ServiceListener;
 
-import org.eclipse.smarthome.core.net.CidrAddress;
-import org.eclipse.smarthome.core.net.NetworkAddressChangeListener;
-import org.eclipse.smarthome.core.net.NetworkAddressService;
-import org.eclipse.smarthome.io.transport.mdns.MDNSClient;
-import org.eclipse.smarthome.io.transport.mdns.ServiceDescription;
+import org.openhab.core.net.CidrAddress;
+import org.openhab.core.net.NetworkAddressChangeListener;
+import org.openhab.core.net.NetworkAddressService;
+import org.openhab.core.io.transport.mdns.MDNSClient;
+import org.openhab.core.io.transport.mdns.ServiceDescription;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSServiceImpl.java b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSServiceImpl.java
index 3c5ebb72fcc..6fb74dae8be 100644
--- a/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSServiceImpl.java
+++ b/bundles/org.openhab.core.io.transport.mdns/src/main/java/org/openhab/core/io/transport/mdns/internal/MDNSServiceImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mdns.internal;
+package org.openhab.core.io.transport.mdns.internal;
 
 import java.io.IOException;
 import java.util.Set;
@@ -18,9 +18,9 @@
 import java.util.concurrent.Executors;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mdns.MDNSClient;
-import org.eclipse.smarthome.io.transport.mdns.MDNSService;
-import org.eclipse.smarthome.io.transport.mdns.ServiceDescription;
+import org.openhab.core.io.transport.mdns.MDNSClient;
+import org.openhab.core.io.transport.mdns.MDNSService;
+import org.openhab.core.io.transport.mdns.ServiceDescription;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttActionCallback.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttActionCallback.java
index 860b25e400e..54067ce2590 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttActionCallback.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttActionCallback.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnection.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnection.java
index 92aad903a79..419c98526fc 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnection.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnection.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -26,16 +26,16 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.internal.ClientCallback;
-import org.eclipse.smarthome.io.transport.mqtt.internal.TopicSubscribers;
-import org.eclipse.smarthome.io.transport.mqtt.internal.client.Mqtt3AsyncClientWrapper;
-import org.eclipse.smarthome.io.transport.mqtt.internal.client.Mqtt5AsyncClientWrapper;
-import org.eclipse.smarthome.io.transport.mqtt.internal.client.MqttAsyncClientWrapper;
-import org.eclipse.smarthome.io.transport.mqtt.reconnect.AbstractReconnectStrategy;
-import org.eclipse.smarthome.io.transport.mqtt.reconnect.PeriodicReconnectStrategy;
-import org.eclipse.smarthome.io.transport.mqtt.ssl.CustomTrustManagerFactory;
-import org.eclipse.smarthome.io.transport.mqtt.sslcontext.CustomSSLContextProvider;
-import org.eclipse.smarthome.io.transport.mqtt.sslcontext.SSLContextProvider;
+import org.openhab.core.io.transport.mqtt.internal.ClientCallback;
+import org.openhab.core.io.transport.mqtt.internal.TopicSubscribers;
+import org.openhab.core.io.transport.mqtt.internal.client.Mqtt3AsyncClientWrapper;
+import org.openhab.core.io.transport.mqtt.internal.client.Mqtt5AsyncClientWrapper;
+import org.openhab.core.io.transport.mqtt.internal.client.MqttAsyncClientWrapper;
+import org.openhab.core.io.transport.mqtt.reconnect.AbstractReconnectStrategy;
+import org.openhab.core.io.transport.mqtt.reconnect.PeriodicReconnectStrategy;
+import org.openhab.core.io.transport.mqtt.ssl.CustomTrustManagerFactory;
+import org.openhab.core.io.transport.mqtt.sslcontext.CustomSSLContextProvider;
+import org.openhab.core.io.transport.mqtt.sslcontext.SSLContextProvider;
 import org.osgi.service.cm.ConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java
index 041a1e4e355..36466ab2deb 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionConfig.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionObserver.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionObserver.java
index aa784961e6f..f7393bc80af 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionObserver.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionObserver.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java
index 46381479fe0..709bec9db66 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttConnectionState.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 /**
  * The connection state of a {@link MqttBrokerConnection}.
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java
index 850e2213a6e..2a7e7a1f96c 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttMessageSubscriber.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttMessageSubscriber.java
index 5bca8443b74..54e55216a44 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttMessageSubscriber.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttMessageSubscriber.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java
index fe87073d313..a1d302c8743 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttService.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.internal.MqttBrokerConnectionServiceInstance;
+import org.openhab.core.io.transport.mqtt.internal.MqttBrokerConnectionServiceInstance;
 
 /**
  * This service allows you to enumerate system-wide configured Mqtt broker connections. You do not need this service
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java
index 56aa87e134c..0126877a1aa 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttServiceObserver.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java
index 2ba3dfec137..43867c0ba03 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/ClientCallback.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/ClientCallback.java
index ebef6861127..61a8123206e 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/ClientCallback.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/ClientCallback.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.internal;
+package org.openhab.core.io.transport.mqtt.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,12 +18,12 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection;
-import org.eclipse.smarthome.io.transport.mqtt.MqttConnectionObserver;
-import org.eclipse.smarthome.io.transport.mqtt.MqttConnectionState;
-import org.eclipse.smarthome.io.transport.mqtt.MqttException;
-import org.eclipse.smarthome.io.transport.mqtt.MqttMessageSubscriber;
-import org.eclipse.smarthome.io.transport.mqtt.reconnect.AbstractReconnectStrategy;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
+import org.openhab.core.io.transport.mqtt.MqttConnectionObserver;
+import org.openhab.core.io.transport.mqtt.MqttConnectionState;
+import org.openhab.core.io.transport.mqtt.MqttException;
+import org.openhab.core.io.transport.mqtt.MqttMessageSubscriber;
+import org.openhab.core.io.transport.mqtt.reconnect.AbstractReconnectStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java
index ccd1bef3794..764ce3bf43c 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstance.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.internal;
+package org.openhab.core.io.transport.mqtt.internal;
 
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnectionConfig;
-import org.eclipse.smarthome.io.transport.mqtt.MqttException;
-import org.eclipse.smarthome.io.transport.mqtt.MqttService;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnectionConfig;
+import org.openhab.core.io.transport.mqtt.MqttException;
+import org.openhab.core.io.transport.mqtt.MqttService;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -41,7 +41,7 @@
  *
  * @author David Graeff - Initial contribution
  */
-@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MqttBrokerConnectionServiceInstance.class, configurationPid = "org.eclipse.smarthome.mqttbroker")
+@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MqttBrokerConnectionServiceInstance.class, configurationPid = "org.openhab.core.mqttbroker")
 @NonNullByDefault
 public class MqttBrokerConnectionServiceInstance {
     private final Logger logger = LoggerFactory.getLogger(MqttBrokerConnectionServiceInstance.class);
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java
index 6a049d073bf..85414eea85c 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttBrokerConnectionServiceInstanceMarker.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.internal;
+package org.openhab.core.io.transport.mqtt.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.ConfigurableService;
+import org.openhab.core.config.core.ConfigurableService;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Component;
 
@@ -24,7 +24,7 @@
  * @author David Graeff - Initial contribution
  */
 @Component(immediate = true, service = MqttBrokerConnectionServiceInstanceMarker.class, property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.mqttbroker",
+        Constants.SERVICE_PID + "=org.openhab.core.mqttbroker",
         ConfigurableService.SERVICE_PROPERTY_FACTORY_SERVICE + "=true",
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=MQTT system broker connection",
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=MQTT",
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java
index 66ebff59570..6831cc22ed5 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.internal;
+package org.openhab.core.io.transport.mqtt.internal;
 
 import java.util.Collections;
 import java.util.List;
@@ -21,12 +21,12 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnectionConfig;
-import org.eclipse.smarthome.io.transport.mqtt.MqttException;
-import org.eclipse.smarthome.io.transport.mqtt.MqttService;
-import org.eclipse.smarthome.io.transport.mqtt.MqttServiceObserver;
-import org.eclipse.smarthome.io.transport.mqtt.MqttWillAndTestament;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnectionConfig;
+import org.openhab.core.io.transport.mqtt.MqttException;
+import org.openhab.core.io.transport.mqtt.MqttService;
+import org.openhab.core.io.transport.mqtt.MqttServiceObserver;
+import org.openhab.core.io.transport.mqtt.MqttWillAndTestament;
 import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.component.annotations.Component;
@@ -40,8 +40,8 @@
  * @author David Graeff - Added/Removed observer interface, Add/Remove/Enumerate broker connections.
  * @author Markus Rathgeb - Synchronize access to broker connections
  */
-@Component(immediate = true, service = MqttService.class, configurationPid = "org.eclipse.smarthome.mqtt", property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.mqtt" })
+@Component(immediate = true, service = MqttService.class, configurationPid = "org.openhab.core.mqtt", property = {
+        Constants.SERVICE_PID + "=org.openhab.core.mqtt" })
 @NonNullByDefault
 public class MqttServiceImpl implements MqttService {
     private final Logger logger = LoggerFactory.getLogger(MqttServiceImpl.class);
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscribers.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscribers.java
index a770f8b9315..bafcf198450 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscribers.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscribers.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.internal;
+package org.openhab.core.io.transport.mqtt.internal;
 
 import java.util.ArrayList;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.io.transport.mqtt.MqttMessageSubscriber;
+import org.openhab.core.io.transport.mqtt.MqttMessageSubscriber;
 
 /**
  * A list of all subscribers for a given topic. This object also stores a regex pattern for the topic, where
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java
index f9e3b979cae..2fc010f9a59 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt3AsyncClientWrapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.internal.client;
+package org.openhab.core.io.transport.mqtt.internal.client;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -19,10 +19,10 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection.ConnectionCallback;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection.Protocol;
-import org.eclipse.smarthome.io.transport.mqtt.MqttWillAndTestament;
-import org.eclipse.smarthome.io.transport.mqtt.internal.ClientCallback;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.ConnectionCallback;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.Protocol;
+import org.openhab.core.io.transport.mqtt.MqttWillAndTestament;
+import org.openhab.core.io.transport.mqtt.internal.ClientCallback;
 
 import com.hivemq.client.mqtt.MqttClientState;
 import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java
index f1e75b1414f..9d8038329db 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/Mqtt5AsyncClientWrapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.internal.client;
+package org.openhab.core.io.transport.mqtt.internal.client;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -19,10 +19,10 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection.ConnectionCallback;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection.Protocol;
-import org.eclipse.smarthome.io.transport.mqtt.MqttWillAndTestament;
-import org.eclipse.smarthome.io.transport.mqtt.internal.ClientCallback;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.ConnectionCallback;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.Protocol;
+import org.openhab.core.io.transport.mqtt.MqttWillAndTestament;
+import org.openhab.core.io.transport.mqtt.internal.ClientCallback;
 
 import com.hivemq.client.mqtt.MqttClientState;
 import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java
index e711d1d31d7..cc9b7e2d56d 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/client/MqttAsyncClientWrapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.internal.client;
+package org.openhab.core.io.transport.mqtt.internal.client;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -18,8 +18,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.MqttWillAndTestament;
-import org.eclipse.smarthome.io.transport.mqtt.internal.ClientCallback;
+import org.openhab.core.io.transport.mqtt.MqttWillAndTestament;
+import org.openhab.core.io.transport.mqtt.internal.ClientCallback;
 
 import com.hivemq.client.mqtt.MqttClientState;
 import com.hivemq.client.mqtt.datatypes.MqttQos;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java
index eef7d63623e..19fbe436324 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/AbstractReconnectStrategy.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.reconnect;
+package org.openhab.core.io.transport.mqtt.reconnect;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection;
-import org.eclipse.smarthome.io.transport.mqtt.MqttConnectionObserver;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
+import org.openhab.core.io.transport.mqtt.MqttConnectionObserver;
 
 /**
  * Implement this class to provide a strategy for (re)establishing a lost
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java
index 028a5166f19..6f86cc9c5fb 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/reconnect/PeriodicReconnectStrategy.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.reconnect;
+package org.openhab.core.io.transport.mqtt.reconnect;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -19,7 +19,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/ssl/CustomTrustManagerFactory.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/ssl/CustomTrustManagerFactory.java
index 27d732f9034..8a8c53ac913 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/ssl/CustomTrustManagerFactory.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/ssl/CustomTrustManagerFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.ssl;
+package org.openhab.core.io.transport.mqtt.ssl;
 
 import java.lang.reflect.Field;
 import java.security.KeyStore;
@@ -22,7 +22,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.sslcontext.SSLContextProvider;
+import org.openhab.core.io.transport.mqtt.sslcontext.SSLContextProvider;
 import org.osgi.service.cm.ConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java
index 196edd911c8..3e9d2fc5820 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/AcceptAllCertificatesSSLContext.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.sslcontext;
+package org.openhab.core.io.transport.mqtt.sslcontext;
 
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java
index 29b7973c2a6..1d4fbeb4563 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/CustomSSLContextProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.sslcontext;
+package org.openhab.core.io.transport.mqtt.sslcontext;
 
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/SSLContextProvider.java b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/SSLContextProvider.java
index 1f158bd7fd8..e60bd1086fb 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/SSLContextProvider.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/sslcontext/SSLContextProvider.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.sslcontext;
+package org.openhab.core.io.transport.mqtt.sslcontext;
 
 import javax.net.ssl.SSLContext;
 
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
 import org.osgi.service.cm.ConfigurationException;
 
 /**
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java
index 271bf2079cd..5c1a78ab4c8 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionEx.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -20,7 +20,7 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.internal.client.MqttAsyncClientWrapper;
+import org.openhab.core.io.transport.mqtt.internal.client.MqttAsyncClientWrapper;
 
 import com.hivemq.client.mqtt.MqttClientState;
 
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java
index 49e25238a7a..a2f4f38b04d 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt;
+package org.openhab.core.io.transport.mqtt;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -28,10 +28,10 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.mqtt.internal.client.MqttAsyncClientWrapper;
-import org.eclipse.smarthome.io.transport.mqtt.reconnect.AbstractReconnectStrategy;
-import org.eclipse.smarthome.io.transport.mqtt.reconnect.PeriodicReconnectStrategy;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.io.transport.mqtt.internal.client.MqttAsyncClientWrapper;
+import org.openhab.core.io.transport.mqtt.reconnect.AbstractReconnectStrategy;
+import org.openhab.core.io.transport.mqtt.reconnect.PeriodicReconnectStrategy;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Test;
 import org.osgi.service.cm.ConfigurationException;
 
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceTests.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceTests.java
index baa7ffc3de7..08ea065b560 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceTests.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/MqttServiceTests.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.internal;
+package org.openhab.core.io.transport.mqtt.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnection;
-import org.eclipse.smarthome.io.transport.mqtt.MqttBrokerConnectionEx;
-import org.eclipse.smarthome.io.transport.mqtt.MqttService;
-import org.eclipse.smarthome.io.transport.mqtt.MqttServiceObserver;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
+import org.openhab.core.io.transport.mqtt.MqttBrokerConnectionEx;
+import org.openhab.core.io.transport.mqtt.MqttService;
+import org.openhab.core.io.transport.mqtt.MqttServiceObserver;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.osgi.service.cm.ConfigurationException;
diff --git a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscriberTests.java b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscriberTests.java
index 0b057328fec..3d59715ca56 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscriberTests.java
+++ b/bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/internal/TopicSubscriberTests.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.mqtt.internal;
+package org.openhab.core.io.transport.mqtt.internal;
 
 import static org.junit.Assert.*;
 
diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/JavaCommPortProvider.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/JavaCommPortProvider.java
index 77f24032165..3d62db2da18 100644
--- a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/JavaCommPortProvider.java
+++ b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/JavaCommPortProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal;
+package org.openhab.core.io.transport.serial.internal;
 
 import java.net.URI;
 import java.util.Enumeration;
@@ -24,10 +24,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.serial.ProtocolType;
-import org.eclipse.smarthome.io.transport.serial.ProtocolType.PathType;
-import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier;
-import org.eclipse.smarthome.io.transport.serial.SerialPortProvider;
+import org.openhab.core.io.transport.serial.ProtocolType;
+import org.openhab.core.io.transport.serial.ProtocolType.PathType;
+import org.openhab.core.io.transport.serial.SerialPortIdentifier;
+import org.openhab.core.io.transport.serial.SerialPortProvider;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java
index 5a414919656..9ca3dbccdc1 100644
--- a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java
+++ b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal;
+package org.openhab.core.io.transport.serial.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.io.transport.serial.SerialPortEvent;
+import org.openhab.core.io.transport.serial.SerialPortEvent;
 
 /**
  * Specific serial port event implementation.
diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
index 0b61277115e..fd229296920 100644
--- a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
+++ b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal;
+package org.openhab.core.io.transport.serial.internal;
 
 import javax.comm.CommPort;
 import javax.comm.CommPortIdentifier;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.serial.PortInUseException;
-import org.eclipse.smarthome.io.transport.serial.SerialPort;
-import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier;
+import org.openhab.core.io.transport.serial.PortInUseException;
+import org.openhab.core.io.transport.serial.SerialPort;
+import org.openhab.core.io.transport.serial.SerialPortIdentifier;
 
 /**
  * Specific serial port identifier implementation.
diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortImpl.java b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortImpl.java
index 955a3176297..8f71bdc2593 100644
--- a/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortImpl.java
+++ b/bundles/org.openhab.core.io.transport.serial.javacomm/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal;
+package org.openhab.core.io.transport.serial.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,9 +21,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.serial.SerialPort;
-import org.eclipse.smarthome.io.transport.serial.SerialPortEventListener;
-import org.eclipse.smarthome.io.transport.serial.UnsupportedCommOperationException;
+import org.openhab.core.io.transport.serial.SerialPort;
+import org.openhab.core.io.transport.serial.SerialPortEventListener;
+import org.openhab.core.io.transport.serial.UnsupportedCommOperationException;
 
 /**
  * Specific serial port implementation.
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java
index e5878c75fb9..fe5e87162f5 100644
--- a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java
+++ b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/RFC2217PortProvider.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.rxtx.rfc2217.internal;
+package org.openhab.core.io.transport.serial.rxtx.rfc2217.internal;
 
 import java.net.URI;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.serial.ProtocolType;
-import org.eclipse.smarthome.io.transport.serial.ProtocolType.PathType;
-import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier;
-import org.eclipse.smarthome.io.transport.serial.SerialPortProvider;
+import org.openhab.core.io.transport.serial.ProtocolType;
+import org.openhab.core.io.transport.serial.ProtocolType.PathType;
+import org.openhab.core.io.transport.serial.SerialPortIdentifier;
+import org.openhab.core.io.transport.serial.SerialPortProvider;
 import org.osgi.service.component.annotations.Component;
 
 import gnu.io.rfc2217.TelnetSerialPort;
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java
index 678b3ffe0c2..22a8f518aee 100644
--- a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java
+++ b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/src/main/java/org/openhab/core/io/transport/serial/rxtx/rfc2217/internal/SerialPortIdentifierImpl.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.rxtx.rfc2217.internal;
+package org.openhab.core.io.transport.serial.rxtx.rfc2217.internal;
 
 import java.net.URI;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.serial.PortInUseException;
-import org.eclipse.smarthome.io.transport.serial.SerialPort;
-import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier;
-import org.eclipse.smarthome.io.transport.serial.rxtx.RxTxSerialPort;
+import org.openhab.core.io.transport.serial.PortInUseException;
+import org.openhab.core.io.transport.serial.SerialPort;
+import org.openhab.core.io.transport.serial.SerialPortIdentifier;
+import org.openhab.core.io.transport.serial.rxtx.RxTxSerialPort;
 
 import gnu.io.rfc2217.TelnetSerialPort;
 
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/RxTxPortProvider.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/RxTxPortProvider.java
index eace4107b30..45a9d7f30b8 100644
--- a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/RxTxPortProvider.java
+++ b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/RxTxPortProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal;
+package org.openhab.core.io.transport.serial.internal;
 
 import java.net.URI;
 import java.util.Map;
@@ -21,10 +21,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.serial.ProtocolType;
-import org.eclipse.smarthome.io.transport.serial.ProtocolType.PathType;
-import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier;
-import org.eclipse.smarthome.io.transport.serial.SerialPortProvider;
+import org.openhab.core.io.transport.serial.ProtocolType;
+import org.openhab.core.io.transport.serial.ProtocolType.PathType;
+import org.openhab.core.io.transport.serial.SerialPortIdentifier;
+import org.openhab.core.io.transport.serial.SerialPortProvider;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java
index 75a3405cf3e..636eb799aea 100644
--- a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java
+++ b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortEventImpl.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal;
+package org.openhab.core.io.transport.serial.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.io.transport.serial.SerialPortEvent;
+import org.openhab.core.io.transport.serial.SerialPortEvent;
 
 /**
  * Specific serial port event implementation.
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
index 57417b19327..7b30ab4fb1d 100644
--- a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
+++ b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortIdentifierImpl.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal;
+package org.openhab.core.io.transport.serial.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.serial.PortInUseException;
-import org.eclipse.smarthome.io.transport.serial.SerialPort;
-import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier;
-import org.eclipse.smarthome.io.transport.serial.rxtx.RxTxSerialPort;
+import org.openhab.core.io.transport.serial.PortInUseException;
+import org.openhab.core.io.transport.serial.SerialPort;
+import org.openhab.core.io.transport.serial.SerialPortIdentifier;
+import org.openhab.core.io.transport.serial.rxtx.RxTxSerialPort;
 
 import gnu.io.CommPort;
 import gnu.io.CommPortIdentifier;
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java
index 579a11e3457..03abf5e12bb 100644
--- a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java
+++ b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal;
+package org.openhab.core.io.transport.serial.internal;
 
 import java.io.File;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/rxtx/RxTxSerialPort.java b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/rxtx/RxTxSerialPort.java
index 4f1f5bbc7cc..0fac0ca1af2 100644
--- a/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/rxtx/RxTxSerialPort.java
+++ b/bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/rxtx/RxTxSerialPort.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.rxtx;
+package org.openhab.core.io.transport.serial.rxtx;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,10 +19,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.serial.SerialPort;
-import org.eclipse.smarthome.io.transport.serial.SerialPortEventListener;
-import org.eclipse.smarthome.io.transport.serial.UnsupportedCommOperationException;
-import org.eclipse.smarthome.io.transport.serial.internal.SerialPortEventImpl;
+import org.openhab.core.io.transport.serial.SerialPort;
+import org.openhab.core.io.transport.serial.SerialPortEventListener;
+import org.openhab.core.io.transport.serial.UnsupportedCommOperationException;
+import org.openhab.core.io.transport.serial.internal.SerialPortEventImpl;
 
 import gnu.io.SerialPortEvent;
 
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java
index f1898ed635f..68e721dbd73 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/PortInUseException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial;
+package org.openhab.core.io.transport.serial;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/ProtocolType.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/ProtocolType.java
index 5fbfe7a8666..0bbc6f7c7aa 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/ProtocolType.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/ProtocolType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial;
+package org.openhab.core.io.transport.serial;
 
 import java.net.URI;
 
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPort.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPort.java
index b32a12a3083..2ebbfc51f15 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPort.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPort.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial;
+package org.openhab.core.io.transport.serial;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEvent.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEvent.java
index c0c75a5a794..bf601c508bc 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEvent.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial;
+package org.openhab.core.io.transport.serial;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEventListener.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEventListener.java
index ec1f018362e..31f56b06592 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEventListener.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortEventListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial;
+package org.openhab.core.io.transport.serial;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortIdentifier.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortIdentifier.java
index 22c5265dbd8..99ed7625e15 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortIdentifier.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortIdentifier.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial;
+package org.openhab.core.io.transport.serial;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortManager.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortManager.java
index 3f7fdf745f9..f08899e316c 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortManager.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial;
+package org.openhab.core.io.transport.serial;
 
 import java.util.Optional;
 import java.util.stream.Stream;
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortProvider.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortProvider.java
index 74a7642e877..456d0e7c29a 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortProvider.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/SerialPortProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial;
+package org.openhab.core.io.transport.serial;
 
 import java.net.URI;
 import java.util.stream.Stream;
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/UnsupportedCommOperationException.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/UnsupportedCommOperationException.java
index 70801dc16e5..9a518c6c18b 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/UnsupportedCommOperationException.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/UnsupportedCommOperationException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial;
+package org.openhab.core.io.transport.serial;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortManagerImpl.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortManagerImpl.java
index 7c34d6029a5..2d63ebe680b 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortManagerImpl.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortManagerImpl.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal;
+package org.openhab.core.io.transport.serial.internal;
 
 import java.net.URI;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier;
-import org.eclipse.smarthome.io.transport.serial.SerialPortManager;
-import org.eclipse.smarthome.io.transport.serial.SerialPortProvider;
+import org.openhab.core.io.transport.serial.SerialPortIdentifier;
+import org.openhab.core.io.transport.serial.SerialPortManager;
+import org.openhab.core.io.transport.serial.SerialPortProvider;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortRegistry.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortRegistry.java
index de29a85a4bd..91a43a85582 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortRegistry.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal;
+package org.openhab.core.io.transport.serial.internal;
 
 import java.net.URI;
 import java.util.Collection;
@@ -20,8 +20,8 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.io.transport.serial.ProtocolType.PathType;
-import org.eclipse.smarthome.io.transport.serial.SerialPortProvider;
+import org.openhab.core.io.transport.serial.ProtocolType.PathType;
+import org.openhab.core.io.transport.serial.SerialPortProvider;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/console/SerialCommandExtension.java b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/console/SerialCommandExtension.java
index 527da4b2d4f..359ef5384c5 100644
--- a/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/console/SerialCommandExtension.java
+++ b/bundles/org.openhab.core.io.transport.serial/src/main/java/org/openhab/core/io/transport/serial/internal/console/SerialCommandExtension.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.serial.internal.console;
+package org.openhab.core.io.transport.serial.internal.console;
 
 import java.util.Arrays;
 import java.util.Deque;
@@ -19,12 +19,12 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
-import org.eclipse.smarthome.io.transport.serial.SerialPortIdentifier;
-import org.eclipse.smarthome.io.transport.serial.SerialPortManager;
-import org.eclipse.smarthome.io.transport.serial.internal.SerialPortRegistry;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.io.transport.serial.SerialPortIdentifier;
+import org.openhab.core.io.transport.serial.SerialPortManager;
+import org.openhab.core.io.transport.serial.internal.SerialPortRegistry;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOParticipant.java b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOParticipant.java
index 68c0b81846f..0e21d77adef 100644
--- a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOParticipant.java
+++ b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOParticipant.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.upnp;
+package org.openhab.core.io.transport.upnp;
 
 /**
  * The {@link UpnpIOParticipant} is an interface that needs to
diff --git a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOService.java b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOService.java
index 930b3e776fa..7ec2307a676 100644
--- a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOService.java
+++ b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/UpnpIOService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.upnp;
+package org.openhab.core.io.transport.upnp;
 
 import java.net.URL;
 import java.util.Map;
diff --git a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java
index 746ac3c04bf..2d678711b8f 100644
--- a/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java
+++ b/bundles/org.openhab.core.io.transport.upnp/src/main/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.upnp.internal;
+package org.openhab.core.io.transport.upnp.internal;
 
 import java.net.URL;
 import java.util.HashMap;
@@ -23,9 +23,9 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.io.transport.upnp.UpnpIOParticipant;
-import org.eclipse.smarthome.io.transport.upnp.UpnpIOService;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.io.transport.upnp.UpnpIOParticipant;
+import org.openhab.core.io.transport.upnp.UpnpIOService;
 import org.jupnp.UpnpService;
 import org.jupnp.controlpoint.ActionCallback;
 import org.jupnp.controlpoint.ControlPoint;
diff --git a/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java b/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java
index a9d79abb295..4ff9efed3c2 100644
--- a/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java
+++ b/bundles/org.openhab.core.io.transport.upnp/src/test/java/org/openhab/core/io/transport/upnp/internal/UpnpIOServiceTest.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.transport.upnp.internal;
+package org.openhab.core.io.transport.upnp.internal;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import org.eclipse.smarthome.io.transport.upnp.UpnpIOParticipant;
+import org.openhab.core.io.transport.upnp.UpnpIOParticipant;
 import org.junit.Before;
 import org.junit.Test;
 import org.jupnp.UpnpService;
diff --git a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java
index de8388f04d4..ec124050bf6 100644
--- a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java
+++ b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/FeatureInstaller.java
@@ -38,11 +38,11 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.karaf.features.Feature;
 import org.apache.karaf.features.FeaturesService;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.extension.ExtensionEventFactory;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.extension.ExtensionEventFactory;
 import org.openhab.core.OpenHAB;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
diff --git a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java
index 50d92d897dc..219b2caee34 100644
--- a/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java
+++ b/bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/KarafExtensionService.java
@@ -24,9 +24,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.karaf.features.Feature;
 import org.apache.karaf.features.FeaturesService;
-import org.eclipse.smarthome.core.extension.Extension;
-import org.eclipse.smarthome.core.extension.ExtensionService;
-import org.eclipse.smarthome.core.extension.ExtensionType;
+import org.openhab.core.extension.Extension;
+import org.openhab.core.extension.ExtensionService;
+import org.openhab.core.extension.ExtensionType;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.model.codegen/1 Generate Items Model.launch b/bundles/org.openhab.core.model.codegen/1 Generate Items Model.launch
index a032eea5b55..33daeeed65a 100644
--- a/bundles/org.openhab.core.model.codegen/1 Generate Items Model.launch	
+++ b/bundles/org.openhab.core.model.codegen/1 Generate Items Model.launch	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.item&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.item.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.item.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.item.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.item.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.item&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.item.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.item.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.item.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.item.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.smarthome.model.codegen"/>
+<listEntry value="/org.openhab.core.model.codegen"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
@@ -10,7 +10,7 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.eclipse.smarthome.model.item/src/org/eclipse/smarthome/model/GenerateItems.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.smarthome.model.codegen"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.openhab.core.model.codegen"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 </launchConfiguration>
diff --git a/bundles/org.openhab.core.model.codegen/2 Generate Sitemap Model.launch b/bundles/org.openhab.core.model.codegen/2 Generate Sitemap Model.launch
index 24a72fcc992..9c52a0bd809 100644
--- a/bundles/org.openhab.core.model.codegen/2 Generate Sitemap Model.launch	
+++ b/bundles/org.openhab.core.model.codegen/2 Generate Sitemap Model.launch	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.sitemap&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.sitemap.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.sitemap.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.sitemap.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.sitemap&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.sitemap.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.sitemap.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.sitemap.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.smarthome.model.codegen"/>
+<listEntry value="/org.openhab.core.model.codegen"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
@@ -10,7 +10,7 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.eclipse.smarthome.model.sitemap/src/org/eclipse/smarthome/model/GenerateSitemap.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.smarthome.model.codegen"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.openhab.core.model.sitemap/src/org/openhab/core/model/GenerateSitemap.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.openhab.core.model.codegen"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 </launchConfiguration>
diff --git a/bundles/org.openhab.core.model.codegen/3 Generate Script Model.launch b/bundles/org.openhab.core.model.codegen/3 Generate Script Model.launch
index 55fc80d7aa7..835b7bf31ea 100644
--- a/bundles/org.openhab.core.model.codegen/3 Generate Script Model.launch	
+++ b/bundles/org.openhab.core.model.codegen/3 Generate Script Model.launch	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.script&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.script.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.script.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.script.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.script.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.script&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.script.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.script.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.script.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.script.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.smarthome.model.codegen"/>
+<listEntry value="/org.openhab.core.model.codegen"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
@@ -10,7 +10,7 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.eclipse.smarthome.model.script/src/org/eclipse/smarthome/model/script/GenerateScript.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.smarthome.model.codegen"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.openhab.core.model.codegen"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 </launchConfiguration>
diff --git a/bundles/org.openhab.core.model.codegen/4 Generate Rule Model.launch b/bundles/org.openhab.core.model.codegen/4 Generate Rule Model.launch
index 0f96aea7cd1..7827b441e0f 100644
--- a/bundles/org.openhab.core.model.codegen/4 Generate Rule Model.launch	
+++ b/bundles/org.openhab.core.model.codegen/4 Generate Rule Model.launch	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.rule&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.rule.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.rule.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.rule.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.rule.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.rule&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.rule.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.rule.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.rule.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.rule.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.smarthome.model.codegen"/>
+<listEntry value="/org.openhab.core.model.codegen"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
@@ -10,7 +10,7 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.eclipse.smarthome.model.rule/src/org/eclipse/smarthome/model/rule/GenerateRules.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.smarthome.model.codegen"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.openhab.core.model.codegen"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 </launchConfiguration>
diff --git a/bundles/org.openhab.core.model.codegen/5 Generate Persistence Model.launch b/bundles/org.openhab.core.model.codegen/5 Generate Persistence Model.launch
index 2ef94feca34..bbb535badfa 100644
--- a/bundles/org.openhab.core.model.codegen/5 Generate Persistence Model.launch	
+++ b/bundles/org.openhab.core.model.codegen/5 Generate Persistence Model.launch	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.persistence&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.persistence.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.persistence.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.persistence.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.persistence.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.persistence&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.persistence.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.persistence.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.persistence.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.persistence.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.smarthome.model.codegen"/>
+<listEntry value="/org.openhab.core.model.codegen"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
@@ -10,6 +10,6 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.eclipse.smarthome.model.persistence/src/org/eclipse/smarthome/model/persistence/GeneratePersistence.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.smarthome.model.codegen"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.openhab.core.model.codegen"/>
 </launchConfiguration>
diff --git a/bundles/org.openhab.core.model.codegen/6 Generate Thing Model.launch b/bundles/org.openhab.core.model.codegen/6 Generate Thing Model.launch
index ad2c56786c6..c9a4af0abb8 100644
--- a/bundles/org.openhab.core.model.codegen/6 Generate Thing Model.launch	
+++ b/bundles/org.openhab.core.model.codegen/6 Generate Thing Model.launch	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="bad_container_name" value="/org.eclipse.smarthome.model.codegen/6 Generate Thing Model.launch"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.thing&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.thing.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.thing.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.thing.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.smarthome.model.thing.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="bad_container_name" value="/org.openhab.core.model.codegen/6 Generate Thing Model.launch"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.thing&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.thing.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.thing.runtime&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.thing.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/org.openhab.core.model.thing.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.smarthome.model.codegen"/>
+<listEntry value="/org.openhab.core.model.codegen"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
@@ -11,7 +11,7 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.eclipse.smarthome.model.thing/src/org/eclipse/smarthome/model/thing/GenerateThing.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.smarthome.model.codegen"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="../org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.openhab.core.model.codegen"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 </launchConfiguration>
diff --git a/bundles/org.openhab.core.model.core/bnd.bnd b/bundles/org.openhab.core.model.core/bnd.bnd
index 76a40d922a8..416ab2045a2 100644
--- a/bundles/org.openhab.core.model.core/bnd.bnd
+++ b/bundles/org.openhab.core.model.core/bnd.bnd
@@ -1,2 +1,2 @@
 Bundle-SymbolicName: ${project.artifactId}
-Bundle-Activator: org.eclipse.smarthome.model.core.internal.ModelCoreActivator
\ No newline at end of file
+Bundle-Activator: org.openhab.core.model.core.internal.ModelCoreActivator
\ No newline at end of file
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/EventType.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/EventType.java
index 5bb6f9f5f30..57b1dc85c8a 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/EventType.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/EventType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core;
+package org.openhab.core.model.core;
 
 /**
  * These are the event types that can occur as model repository changes 
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelCoreConstants.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelCoreConstants.java
index 8321f763e74..dc282f3d859 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelCoreConstants.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelCoreConstants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core;
+package org.openhab.core.model.core;
 
 /**
  * This class holds all important constants relevant for this bundle.
@@ -19,6 +19,6 @@
  */
 public class ModelCoreConstants {
 
-    /** The service pid used for the managed service (without the "org.eclipse.smarthome" prefix */
+    /** The service pid used for the managed service (without the "org.openhab.core" prefix */
     public static final String SERVICE_PID = "folder";
 }
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelParser.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelParser.java
index a5522799c51..ca11ad9fc0e 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelParser.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelParser.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core;
+package org.openhab.core.model.core;
 
 /**
  * This interface has to be implemented by services that register an EMF model parser
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepository.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepository.java
index 802ef932a98..523200560a5 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepository.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepository.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core;
+package org.openhab.core.model.core;
 
 import java.io.InputStream;
 import java.util.Set;
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepositoryChangeListener.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepositoryChangeListener.java
index 98a44689926..f363fa25584 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepositoryChangeListener.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/ModelRepositoryChangeListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core;
+package org.openhab.core.model.core;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/SafeEMF.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/SafeEMF.java
index 058594e16ee..63933d60db2 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/SafeEMF.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/SafeEMF.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core;
+package org.openhab.core.model.core;
 
 import java.util.function.Supplier;
 
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelCoreActivator.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelCoreActivator.java
index a1ba6709001..a19da80b873 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelCoreActivator.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelCoreActivator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core.internal;
+package org.openhab.core.model.core.internal;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java
index 6ddac7ec2c1..9476fe3dcd4 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core.internal;
+package org.openhab.core.model.core.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -35,10 +35,10 @@
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.Diagnostician;
-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.core.SafeEMF;
+import org.openhab.core.model.core.EventType;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.core.ModelRepositoryChangeListener;
+import org.openhab.core.model.core.SafeEMF;
 import org.eclipse.xtext.resource.SynchronizedXtextResourceSet;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/SafeEMFImpl.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/SafeEMFImpl.java
index 954cf1a0960..2cce4683630 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/SafeEMFImpl.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/SafeEMFImpl.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core.internal;
+package org.openhab.core.model.core.internal;
 
 import java.util.function.Supplier;
 
-import org.eclipse.smarthome.model.core.SafeEMF;
+import org.openhab.core.model.core.SafeEMF;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java
index 8ad9e37b6cf..13bb6e2e194 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core.internal.folder;
+package org.openhab.core.model.core.internal.folder;
 
 import static java.nio.file.StandardWatchEventKinds.*;
 
@@ -35,10 +35,10 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.core.service.AbstractWatchService;
-import org.eclipse.smarthome.model.core.ModelParser;
-import org.eclipse.smarthome.model.core.ModelRepository;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.service.AbstractWatchService;
+import org.openhab.core.model.core.ModelParser;
+import org.openhab.core.model.core.ModelRepository;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -56,7 +56,7 @@
  * @author Fabio Marini - Refactoring to use WatchService
  * @author Ana Dimova - reduce to a single watch thread for all class instances
  */
-@Component(name = "org.eclipse.smarthome.folder", immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE)
+@Component(name = "org.openhab.core.folder", immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE)
 public class FolderObserver extends AbstractWatchService {
 
     public FolderObserver() {
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/util/MathUtils.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/util/MathUtils.java
index 2923ade8a28..d28f12bea34 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/util/MathUtils.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/util/MathUtils.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core.internal.util;
+package org.openhab.core.model.core.internal.util;
 
 /**
  * This class provides a few mathematical helper functions that are required by
diff --git a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/valueconverter/ValueTypeToStringConverter.java b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/valueconverter/ValueTypeToStringConverter.java
index bbc01153d1d..91418eba299 100644
--- a/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/valueconverter/ValueTypeToStringConverter.java
+++ b/bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/valueconverter/ValueTypeToStringConverter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core.valueconverter;
+package org.openhab.core.model.core.valueconverter;
 
 import java.math.BigDecimal;
 
diff --git a/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeModule.xtend b/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeModule.xtend
index 24eb5110045..14c29a5b299 100644
--- a/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeModule.xtend
+++ b/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeModule.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.ide
+package org.openhab.core.model.ide
 
 
 /**
diff --git a/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeSetup.xtend b/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeSetup.xtend
index dcc300240fd..67c904d27ee 100644
--- a/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeSetup.xtend
+++ b/bundles/org.openhab.core.model.item.ide/src/org/openhab/core/model/ide/ItemsIdeSetup.xtend
@@ -13,11 +13,11 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.ide
+package org.openhab.core.model.ide
 
 import com.google.inject.Guice
-import org.eclipse.smarthome.model.ItemsRuntimeModule
-import org.eclipse.smarthome.model.ItemsStandaloneSetup
+import org.openhab.core.model.ItemsRuntimeModule
+import org.openhab.core.model.ItemsStandaloneSetup
 import org.eclipse.xtext.util.Modules2
 
 /**
diff --git a/bundles/org.openhab.core.model.item.runtime/src/org/openhab/core/model/item/runtime/internal/ItemRuntimeActivator.java b/bundles/org.openhab.core.model.item.runtime/src/org/openhab/core/model/item/runtime/internal/ItemRuntimeActivator.java
index f64f845d7a6..ab2db512658 100644
--- a/bundles/org.openhab.core.model.item.runtime/src/org/openhab/core/model/item/runtime/internal/ItemRuntimeActivator.java
+++ b/bundles/org.openhab.core.model.item.runtime/src/org/openhab/core/model/item/runtime/internal/ItemRuntimeActivator.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.item.runtime.internal;
+package org.openhab.core.model.item.runtime.internal;
 
-import org.eclipse.smarthome.model.ItemsStandaloneSetup;
-import org.eclipse.smarthome.model.core.ModelParser;
+import org.openhab.core.model.ItemsStandaloneSetup;
+import org.openhab.core.model.core.ModelParser;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.model.item/bnd.bnd b/bundles/org.openhab.core.model.item/bnd.bnd
index cbe06521d99..f69851a9ba2 100644
--- a/bundles/org.openhab.core.model.item/bnd.bnd
+++ b/bundles/org.openhab.core.model.item/bnd.bnd
@@ -1,33 +1,33 @@
 Bundle-SymbolicName: ${project.artifactId}
-Export-Package: org.eclipse.smarthome.model,\
- org.eclipse.smarthome.model.formatting,\
- org.eclipse.smarthome.model.generator,\
- org.eclipse.smarthome.model.item,\
- org.eclipse.smarthome.model.items,\
- org.eclipse.smarthome.model.items.impl,\
- org.eclipse.smarthome.model.items.util,\
- 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.validation
+Export-Package: org.openhab.core.model,\
+ org.openhab.core.model.formatting,\
+ org.openhab.core.model.generator,\
+ org.openhab.core.model.item,\
+ org.openhab.core.model.items,\
+ org.openhab.core.model.items.impl,\
+ org.openhab.core.model.items.util,\
+ org.openhab.core.model.parser.antlr,\
+ org.openhab.core.model.parser.antlr.internal,\
+ org.openhab.core.model.scoping,\
+ org.openhab.core.model.serializer,\
+ org.openhab.core.model.services,\
+ org.openhab.core.model.validation
 Import-Package: javax.measure,\
  javax.measure.quantity,\
  org.apache.log4j,\
  org.eclipse.jdt.annotation;resolution:=optional,\
- org.eclipse.smarthome.config.core,\
- org.eclipse.smarthome.core.common.registry,\
- org.eclipse.smarthome.core.i18n,\
- org.eclipse.smarthome.core.items,\
- org.eclipse.smarthome.core.items.dto,\
- org.eclipse.smarthome.core.library.items,\
- org.eclipse.smarthome.core.library.types,\
- org.eclipse.smarthome.core.thing.util,\
- org.eclipse.smarthome.core.types,\
- org.eclipse.smarthome.core.types.util,\
- org.eclipse.smarthome.model.core,\
- org.eclipse.smarthome.model.core.valueconverter,\
+ org.openhab.core.config.core,\
+ org.openhab.core.common.registry,\
+ org.openhab.core.i18n,\
+ org.openhab.core.items,\
+ org.openhab.core.items.dto,\
+ org.openhab.core.library.items,\
+ org.openhab.core.library.types,\
+ org.openhab.core.thing.util,\
+ org.openhab.core.types,\
+ org.openhab.core.types.util,\
+ org.openhab.core.model.core,\
+ org.openhab.core.model.core.valueconverter,\
  org.eclipse.xtext.xbase.lib,\
  org.osgi.framework,\
  org.slf4j
diff --git a/bundles/org.openhab.core.model.item/plugin.xml b/bundles/org.openhab.core.model.item/plugin.xml
index 4cdc8b1b252..f27808feaf1 100644
--- a/bundles/org.openhab.core.model.item/plugin.xml
+++ b/bundles/org.openhab.core.model.item/plugin.xml
@@ -5,8 +5,8 @@
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
-       uri = "http://www.eclipse.org/smarthome/model/Items" 
-       class = "org.eclipse.smarthome.model.items.ItemsPackage"
+       uri = "https://openhab.org/model/Items" 
+       class = "org.openhab.core.model.items.ItemsPackage"
        genModel = "model/generated/Items.genmodel" /> 
 	
   </extension>
diff --git a/bundles/org.openhab.core.model.item/plugin.xml_gen b/bundles/org.openhab.core.model.item/plugin.xml_gen
index e56a604d399..5d54f62152d 100644
--- a/bundles/org.openhab.core.model.item/plugin.xml_gen
+++ b/bundles/org.openhab.core.model.item/plugin.xml_gen
@@ -3,8 +3,8 @@
 <plugin>
 	<extension point="org.eclipse.emf.ecore.generated_package">
 		<package 
-			uri = "http://www.eclipse.org/smarthome/model/Items"
-			class = "org.eclipse.smarthome.model.items.ItemsPackage"
+			uri = "https://openhab.org/model/Items"
+			class = "org.openhab.core.model.items.ItemsPackage"
 			genModel = "model/generated/Items.genmodel" />
 	</extension>
 </plugin>
diff --git a/bundles/org.openhab.core.model.item/pom.xml b/bundles/org.openhab.core.model.item/pom.xml
index beaee9ce317..8c1fc4edf87 100644
--- a/bundles/org.openhab.core.model.item/pom.xml
+++ b/bundles/org.openhab.core.model.item/pom.xml
@@ -51,7 +51,7 @@
           <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <arguments>
-            <argument>file://${project.basedir}/src/org/eclipse/smarthome/model/GenerateItems.mwe2</argument>
+            <argument>file://${project.basedir}/src/org/openhab/core/model/GenerateItems.mwe2</argument>
             <argument>-p</argument>
             <argument>rootPath=/${project.basedir}/..</argument>
           </arguments>
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2 b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2
index a754808d747..971f21536dd 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/GenerateItems.mwe2
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-module org.eclipse.smarthome.model.GenerateItems
+module org.openhab.core.model.GenerateItems
 
 import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
@@ -19,7 +19,7 @@ var rootPath = ".."
 
 var fileExtensions = "items"
 var projectName = "org.openhab.core.model.item"
-var languageName = "org.eclipse.smarthome.model.Items"
+var languageName = "org.openhab.core.model.Items"
 var generateXtendStub = true
 var encoding = "UTF-8"
 
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext
index 347d1c90725..492bac7408a 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext
@@ -1,4 +1,4 @@
-grammar org.eclipse.smarthome.model.Items
+grammar org.openhab.core.model.Items
 
 // disabled due to conflicts between the custom ID rule and the common INT rule
 // with org.eclipse.xtext.common.Terminals
@@ -7,7 +7,7 @@ hidden(WS, ML_COMMENT, SL_COMMENT)
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 
-generate items "http://www.eclipse.org/smarthome/model/Items"
+generate items "https://openhab.org/model/Items"
 
 ItemModel :
 	{ItemModel} (items+=ModelItem)*
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsRuntimeModule.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsRuntimeModule.xtend
index 0dea5d3eec0..7bcd906a3f4 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsRuntimeModule.xtend
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsRuntimeModule.xtend
@@ -14,11 +14,11 @@ package
 /*
  * generated by Xtext
  */
-org.eclipse.smarthome.model
+org.openhab.core.model
 
 import com.google.inject.Binder
 import com.google.inject.name.Names
-import org.eclipse.smarthome.model.internal.valueconverter.ItemValueConverters
+import org.openhab.core.model.internal.valueconverter.ItemValueConverters
 import org.eclipse.xtext.conversion.IValueConverterService
 import org.eclipse.xtext.linking.lazy.LazyURIEncoder
 
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsStandaloneSetup.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsStandaloneSetup.xtend
index 90afa1a9dfd..5c5876c094f 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsStandaloneSetup.xtend
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/ItemsStandaloneSetup.xtend
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model
+package org.openhab.core.model
 
 import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.resource.Resource
@@ -26,7 +26,7 @@ class ItemsStandaloneSetup extends ItemsStandaloneSetupGenerated {
     }
     
     def static void unregister() {
-        EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Items");
+        EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Items");
         Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("items");
         IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("items");
     }
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/formatting/ItemsFormatter.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/formatting/ItemsFormatter.xtend
index cb3cae7d7a8..615d828f9b5 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/formatting/ItemsFormatter.xtend
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/formatting/ItemsFormatter.xtend
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.formatting
+package org.openhab.core.model.formatting
 
 import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter
 import org.eclipse.xtext.formatting.impl.FormattingConfig
 import com.google.inject.Inject
-import org.eclipse.smarthome.model.services.ItemsGrammarAccess
+import org.openhab.core.model.services.ItemsGrammarAccess
 
 /**
  * This class contains custom formatting description.
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/generator/ItemsGenerator.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/generator/ItemsGenerator.xtend
index 851e20b5fe2..0b6013e136f 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/generator/ItemsGenerator.xtend
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/generator/ItemsGenerator.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.generator
+package org.openhab.core.model.generator
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.xtext.generator.AbstractGenerator
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/internal/valueconverter/ItemValueConverters.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/internal/valueconverter/ItemValueConverters.java
index dc3989309fc..58af9e271da 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/internal/valueconverter/ItemValueConverters.java
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/internal/valueconverter/ItemValueConverters.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.internal.valueconverter;
+package org.openhab.core.model.internal.valueconverter;
 
-import org.eclipse.smarthome.model.core.valueconverter.ValueTypeToStringConverter;
+import org.openhab.core.model.core.valueconverter.ValueTypeToStringConverter;
 import org.eclipse.xtext.common.services.DefaultTerminalConverters;
 import org.eclipse.xtext.conversion.IValueConverter;
 import org.eclipse.xtext.conversion.ValueConverter;
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigParseException.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigParseException.java
index 3d04f78382b..e799c9efe34 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigParseException.java
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigParseException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.item;
+package org.openhab.core.model.item;
 
 /**
  * This exception is used by {@link BindingConfigReader} instances if parsing configurations fails
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigReader.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigReader.java
index ea4bc1a0be8..78b8b1a13eb 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigReader.java
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/BindingConfigReader.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.item;
+package org.openhab.core.model.item;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.model.item.internal.GenericItemProvider;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.model.item.internal.GenericItemProvider;
 
 /**
  * This interface must be implemented by services, which can parse the generic
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java
index 04d2af058dc..5f241780ed1 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.item.internal;
+package org.openhab.core.model.item.internal;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,31 +27,31 @@
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.AbstractProvider;
-import org.eclipse.smarthome.core.items.ActiveItem;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemFactory;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.dto.GroupFunctionDTO;
-import org.eclipse.smarthome.core.items.dto.ItemDTOMapper;
-import org.eclipse.smarthome.core.types.StateDescriptionFragment;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentProvider;
-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.item.BindingConfigParseException;
-import org.eclipse.smarthome.model.item.BindingConfigReader;
-import org.eclipse.smarthome.model.items.ItemModel;
-import org.eclipse.smarthome.model.items.ModelBinding;
-import org.eclipse.smarthome.model.items.ModelGroupFunction;
-import org.eclipse.smarthome.model.items.ModelGroupItem;
-import org.eclipse.smarthome.model.items.ModelItem;
-import org.eclipse.smarthome.model.items.ModelNormalItem;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.AbstractProvider;
+import org.openhab.core.items.ActiveItem;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemFactory;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.dto.GroupFunctionDTO;
+import org.openhab.core.items.dto.ItemDTOMapper;
+import org.openhab.core.types.StateDescriptionFragment;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.StateDescriptionFragmentProvider;
+import org.openhab.core.model.core.EventType;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.core.ModelRepositoryChangeListener;
+import org.openhab.core.model.item.BindingConfigParseException;
+import org.openhab.core.model.item.BindingConfigReader;
+import org.openhab.core.model.items.ItemModel;
+import org.openhab.core.model.items.ModelBinding;
+import org.openhab.core.model.items.ModelGroupFunction;
+import org.openhab.core.model.items.ModelGroupItem;
+import org.openhab.core.model.items.ModelItem;
+import org.openhab.core.model.items.ModelNormalItem;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericMetadataProvider.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericMetadataProvider.java
index 10ebf810660..ebf865d4cfe 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericMetadataProvider.java
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericMetadataProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.item.internal;
+package org.openhab.core.model.item.internal;
 
 import static java.util.stream.Collectors.toSet;
 
@@ -25,11 +25,11 @@
 import org.eclipse.emf.codegen.ecore.templates.edit.ItemProvider;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.AbstractProvider;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataPredicates;
-import org.eclipse.smarthome.core.items.MetadataProvider;
+import org.openhab.core.common.registry.AbstractProvider;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataPredicates;
+import org.openhab.core.items.MetadataProvider;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/scoping/ItemsScopeProvider.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/scoping/ItemsScopeProvider.xtend
index e8ab0081422..72790579667 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/scoping/ItemsScopeProvider.xtend
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/scoping/ItemsScopeProvider.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.scoping
+package org.openhab.core.model.scoping
 
 /**
  * This class contains custom scoping description.
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSemanticSequencer.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSemanticSequencer.xtend
index 5ca657e3624..b2e11f88337 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSemanticSequencer.xtend
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSemanticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.serializer
+package org.openhab.core.model.serializer
 
 
 class ItemsSemanticSequencer extends AbstractItemsSemanticSequencer {
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSyntacticSequencer.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSyntacticSequencer.xtend
index 9da0c266eba..c302985f4af 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSyntacticSequencer.xtend
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/serializer/ItemsSyntacticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.serializer
+package org.openhab.core.model.serializer
 
 
 class ItemsSyntacticSequencer extends AbstractItemsSyntacticSequencer {
diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/validation/ItemsValidator.xtend b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/validation/ItemsValidator.xtend
index f8f99bec7a0..943ee70a206 100644
--- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/validation/ItemsValidator.xtend
+++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/validation/ItemsValidator.xtend
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.validation
+package org.openhab.core.model.validation
 
-import org.eclipse.smarthome.model.items.ModelItem
+import org.openhab.core.model.items.ModelItem
 import org.eclipse.xtext.validation.Check
-import org.eclipse.smarthome.model.items.ItemsPackage
-import org.eclipse.smarthome.core.types.util.UnitUtils
+import org.openhab.core.model.items.ItemsPackage
+import org.openhab.core.types.util.UnitUtils
 
 /**
  * Custom validation rules. 
diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java
index 63c6d7c4ab0..0a1d06337a9 100644
--- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java
+++ b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/GlobalResourceSet.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.lazygen;
+package org.openhab.core.model.lazygen;
 
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.resource.XtextResourceSet;
diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java
index 28d4a6f5ed3..e5eda863199 100644
--- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java
+++ b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyGenerator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.lazygen;
+package org.openhab.core.model.lazygen;
 
 import org.eclipse.emf.mwe.core.WorkflowContext;
 import org.eclipse.emf.mwe.core.issues.Issues;
diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java
index 253a2549b77..f8557797b9a 100644
--- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java
+++ b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyLanguageConfig.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.lazygen;
+package org.openhab.core.model.lazygen;
 
 import static org.eclipse.xtext.util.Strings.equal;
 
diff --git a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java
index 2e1be78f620..a1a7fce3ead 100644
--- a/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java
+++ b/bundles/org.openhab.core.model.lazygen/src/main/java/org/openhab/core/model/lazygen/LazyStandaloneSetup.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.lazygen;
+package org.openhab.core.model.lazygen;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java
index 173dc7db34f..29c92694a64 100644
--- a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java
+++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.lsp.internal;
+package org.openhab.core.model.lsp.internal;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java
index 2cc36db640a..aa501277eda 100644
--- a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java
+++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/ModelServer.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.lsp.internal;
+package org.openhab.core.model.lsp.internal;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -23,10 +23,10 @@
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.launch.LSPLauncher;
 import org.eclipse.lsp4j.services.LanguageClient;
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.model.script.ScriptServiceUtil;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.model.script.ScriptServiceUtil;
+import org.openhab.core.model.script.engine.ScriptEngine;
 import org.eclipse.xtext.ide.server.LanguageServerImpl;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
@@ -51,7 +51,7 @@
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=misc" })
 public class ModelServer {
 
-    static final String CONFIG_PID = "org.eclipse.smarthome.lsp";
+    static final String CONFIG_PID = "org.openhab.core.lsp";
     private static final String KEY_PORT = "port";
     private static final int DEFAULT_PORT = 5007;
     private final ExecutorService pool = ThreadPoolManager.getPool("lsp");
diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RegistryProvider.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RegistryProvider.java
index bfee755ba27..0f1de734b1f 100644
--- a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RegistryProvider.java
+++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RegistryProvider.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.lsp.internal;
+package org.openhab.core.model.lsp.internal;
 
 import org.eclipse.emf.ecore.EPackage;
 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.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.openhab.core.model.ide.ItemsIdeSetup;
+import org.openhab.core.model.persistence.ide.PersistenceIdeSetup;
+import org.openhab.core.model.rule.ide.RulesIdeSetup;
+import org.openhab.core.model.script.ScriptServiceUtil;
+import org.openhab.core.model.script.engine.ScriptEngine;
+import org.openhab.core.model.script.ide.ScriptIdeSetup;
+import org.openhab.core.model.sitemap.ide.SitemapIdeSetup;
+import org.openhab.core.model.thing.ide.ThingIdeSetup;
 import org.eclipse.xtext.XtextPackage;
 import org.eclipse.xtext.resource.FileExtensionProvider;
 import org.eclipse.xtext.resource.IResourceFactory;
diff --git a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java
index 5254ca1429b..9f11ced58b1 100644
--- a/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java
+++ b/bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/RuntimeServerModule.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.lsp.internal;
+package org.openhab.core.model.lsp.internal;
 
 import java.util.concurrent.ExecutorService;
 
 import org.eclipse.lsp4j.services.LanguageServer;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.model.script.ScriptServiceUtil;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.model.script.ScriptServiceUtil;
+import org.openhab.core.model.script.engine.ScriptEngine;
 import org.eclipse.xtext.ide.ExecutorServiceProvider;
 import org.eclipse.xtext.ide.server.DefaultProjectDescriptionFactory;
 import org.eclipse.xtext.ide.server.ILanguageServerShutdownAndExitHandler;
diff --git a/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java b/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java
index 8efd66592c3..f9fd3706d2a 100644
--- a/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java
+++ b/bundles/org.openhab.core.model.lsp/src/test/java/org/openhab/core/model/lsp/internal/MappingUriExtensionsTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.lsp.internal;
+package org.openhab.core.model.lsp.internal;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeModule.xtend b/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeModule.xtend
index 9fce910d596..276b2a58dbe 100644
--- a/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeModule.xtend
+++ b/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeModule.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.persistence.ide
+package org.openhab.core.model.persistence.ide
 
 
 /**
diff --git a/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeSetup.xtend b/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeSetup.xtend
index c9f110cdca2..9fda2ba9132 100644
--- a/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeSetup.xtend
+++ b/bundles/org.openhab.core.model.persistence.ide/src/org/openhab/core/model/persistence/ide/PersistenceIdeSetup.xtend
@@ -13,11 +13,11 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.persistence.ide
+package org.openhab.core.model.persistence.ide
 
 import com.google.inject.Guice
-import org.eclipse.smarthome.model.persistence.PersistenceRuntimeModule
-import org.eclipse.smarthome.model.persistence.PersistenceStandaloneSetup
+import org.openhab.core.model.persistence.PersistenceRuntimeModule
+import org.openhab.core.model.persistence.PersistenceStandaloneSetup
 import org.eclipse.xtext.util.Modules2
 
 /**
diff --git a/bundles/org.openhab.core.model.persistence.runtime/src/org/openhab/core/model/persistence/runtime/internal/PersistenceRuntimeActivator.java b/bundles/org.openhab.core.model.persistence.runtime/src/org/openhab/core/model/persistence/runtime/internal/PersistenceRuntimeActivator.java
index dd055eab493..bb2b04a74cb 100644
--- a/bundles/org.openhab.core.model.persistence.runtime/src/org/openhab/core/model/persistence/runtime/internal/PersistenceRuntimeActivator.java
+++ b/bundles/org.openhab.core.model.persistence.runtime/src/org/openhab/core/model/persistence/runtime/internal/PersistenceRuntimeActivator.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.persistence.runtime.internal;
+package org.openhab.core.model.persistence.runtime.internal;
 
-import org.eclipse.smarthome.model.core.ModelParser;
-import org.eclipse.smarthome.model.persistence.PersistenceStandaloneSetup;
+import org.openhab.core.model.core.ModelParser;
+import org.openhab.core.model.persistence.PersistenceStandaloneSetup;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.model.persistence/bnd.bnd b/bundles/org.openhab.core.model.persistence/bnd.bnd
index 72d9b372a84..11af558adad 100644
--- a/bundles/org.openhab.core.model.persistence/bnd.bnd
+++ b/bundles/org.openhab.core.model.persistence/bnd.bnd
@@ -1,28 +1,28 @@
 Bundle-SymbolicName: ${project.artifactId}
-Export-Package: org.eclipse.smarthome.model.persistence,\
- org.eclipse.smarthome.model.persistence.extensions,\
- org.eclipse.smarthome.model.persistence.formatting,\
- org.eclipse.smarthome.model.persistence.generator,\
- org.eclipse.smarthome.model.persistence.parser.antlr,\
- org.eclipse.smarthome.model.persistence.parser.antlr.internal,\
- org.eclipse.smarthome.model.persistence.persistence,\
- org.eclipse.smarthome.model.persistence.persistence.impl,\
- org.eclipse.smarthome.model.persistence.persistence.util,\
- org.eclipse.smarthome.model.persistence.scoping,\
- org.eclipse.smarthome.model.persistence.serializer,\
- org.eclipse.smarthome.model.persistence.services,\
- org.eclipse.smarthome.model.persistence.validation
+Export-Package: org.openhab.core.model.persistence,\
+ org.openhab.core.model.persistence.extensions,\
+ org.openhab.core.model.persistence.formatting,\
+ org.openhab.core.model.persistence.generator,\
+ org.openhab.core.model.persistence.parser.antlr,\
+ org.openhab.core.model.persistence.parser.antlr.internal,\
+ org.openhab.core.model.persistence.persistence,\
+ org.openhab.core.model.persistence.persistence.impl,\
+ org.openhab.core.model.persistence.persistence.util,\
+ org.openhab.core.model.persistence.scoping,\
+ org.openhab.core.model.persistence.serializer,\
+ org.openhab.core.model.persistence.services,\
+ org.openhab.core.model.persistence.validation
 Import-Package: \
- org.eclipse.smarthome.core.common.registry,\
- org.eclipse.smarthome.core.events,\
- org.eclipse.smarthome.core.i18n,\
- org.eclipse.smarthome.core.items,\
- org.eclipse.smarthome.core.library.types,\
- org.eclipse.smarthome.core.persistence,\
- org.eclipse.smarthome.core.persistence.config,\
- org.eclipse.smarthome.core.persistence.strategy,\
- org.eclipse.smarthome.core.types,\
- org.eclipse.smarthome.model.core,\
+ org.openhab.core.common.registry,\
+ org.openhab.core.events,\
+ org.openhab.core.i18n,\
+ org.openhab.core.items,\
+ org.openhab.core.library.types,\
+ org.openhab.core.persistence,\
+ org.openhab.core.persistence.config,\
+ org.openhab.core.persistence.strategy,\
+ org.openhab.core.types,\
+ org.openhab.core.model.core,\
  com.google.common.*;version="14",\
  org.apache.*,\
  org.eclipse.jdt.annotation;resolution:=optional,\
diff --git a/bundles/org.openhab.core.model.persistence/plugin.xml b/bundles/org.openhab.core.model.persistence/plugin.xml
index e4803220f03..e5616dc8428 100644
--- a/bundles/org.openhab.core.model.persistence/plugin.xml
+++ b/bundles/org.openhab.core.model.persistence/plugin.xml
@@ -5,8 +5,8 @@
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
-       uri = "http://www.eclipse.org/smarthome/model/Persistence" 
-       class = "org.eclipse.smarthome.model.persistence.persistence.PersistencePackage"
+       uri = "https://openhab.org/model/Persistence" 
+       class = "org.openhab.core.model.persistence.persistence.PersistencePackage"
        genModel = "model/generated/Persistence.genmodel" /> 
 	
   </extension>
diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml
index 9ab0920e64d..5befe6d3c8e 100644
--- a/bundles/org.openhab.core.model.persistence/pom.xml
+++ b/bundles/org.openhab.core.model.persistence/pom.xml
@@ -56,7 +56,7 @@
           <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <arguments>
-            <argument>file://${project.basedir}/src/org/eclipse/smarthome/model/persistence/GeneratePersistence.mwe2</argument>
+            <argument>file://${project.basedir}/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2</argument>
             <argument>-p</argument>
             <argument>rootPath=/${project.basedir}/..</argument>
           </arguments>
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2 b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2
index 5b19174320c..eaa25c6d2c8 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/GeneratePersistence.mwe2
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-module org.eclipse.smarthome.model.persistence.GeneratePersistence
+module org.openhab.core.model.persistence.GeneratePersistence
 
 import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
 
 var rootPath = ".."
 var projectName = "org.openhab.core.model.persistence"
-var languageName = "org.eclipse.smarthome.model.persistence.Persistence"
+var languageName = "org.openhab.core.model.persistence.Persistence"
 var fileExtensions = "persist"
 var generateXtendStub = true
 var encoding = "UTF-8"
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext
index 62736305815..9bdb11e1137 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/Persistence.xtext
@@ -1,8 +1,8 @@
-grammar org.eclipse.smarthome.model.persistence.Persistence with org.eclipse.xtext.common.Terminals
+grammar org.openhab.core.model.persistence.Persistence with org.eclipse.xtext.common.Terminals
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 
-generate persistence "http://www.eclipse.org/smarthome/model/Persistence"
+generate persistence "https://openhab.org/model/Persistence"
 
 PersistenceModel:
 	{PersistenceModel}
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceRuntimeModule.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceRuntimeModule.xtend
index ec3dbaebaca..a3cd9ffd2a6 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceRuntimeModule.xtend
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceRuntimeModule.xtend
@@ -14,11 +14,11 @@ package
 /*
  * generated by Xtext
  */
-org.eclipse.smarthome.model.persistence
+org.openhab.core.model.persistence
 
 import com.google.inject.Binder
 import com.google.inject.name.Names
-import org.eclipse.smarthome.model.persistence.scoping.PersistenceGlobalScopeProvider
+import org.openhab.core.model.persistence.scoping.PersistenceGlobalScopeProvider
 import org.eclipse.xtext.linking.lazy.LazyURIEncoder
 import org.eclipse.xtext.scoping.IGlobalScopeProvider
 
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceStandaloneSetup.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceStandaloneSetup.xtend
index 893ed1caa0e..1578d3b1b30 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceStandaloneSetup.xtend
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/PersistenceStandaloneSetup.xtend
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.persistence
+package org.openhab.core.model.persistence
 
 import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.resource.Resource
@@ -26,7 +26,7 @@ class PersistenceStandaloneSetup extends PersistenceStandaloneSetupGenerated {
     }
     
     def static void unregister() {
-        EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Persistence");
+        EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Persistence");
         Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("persist");
         IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("persist");
     }
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/extensions/PersistenceExtensions.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/extensions/PersistenceExtensions.java
index 6c4fe5a67ea..3afc31062f6 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/extensions/PersistenceExtensions.java
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/extensions/PersistenceExtensions.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.persistence.extensions;
+package org.openhab.core.model.persistence.extensions;
 
 import java.math.BigDecimal;
 import java.math.MathContext;
@@ -20,16 +20,16 @@
 import java.util.Date;
 import java.util.Iterator;
 
-import org.eclipse.smarthome.core.i18n.TimeZoneProvider;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.persistence.FilterCriteria;
-import org.eclipse.smarthome.core.persistence.FilterCriteria.Ordering;
-import org.eclipse.smarthome.core.persistence.HistoricItem;
-import org.eclipse.smarthome.core.persistence.PersistenceService;
-import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry;
-import org.eclipse.smarthome.core.persistence.QueryablePersistenceService;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.i18n.TimeZoneProvider;
+import org.openhab.core.items.Item;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.persistence.FilterCriteria;
+import org.openhab.core.persistence.FilterCriteria.Ordering;
+import org.openhab.core.persistence.HistoricItem;
+import org.openhab.core.persistence.PersistenceService;
+import org.openhab.core.persistence.PersistenceServiceRegistry;
+import org.openhab.core.persistence.QueryablePersistenceService;
+import org.openhab.core.types.State;
 import org.joda.time.DateTime;
 import org.joda.time.base.AbstractInstant;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/formatting/PersistenceFormatter.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/formatting/PersistenceFormatter.xtend
index 763e47cdb33..4cbe8485a75 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/formatting/PersistenceFormatter.xtend
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/formatting/PersistenceFormatter.xtend
@@ -13,12 +13,12 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.persistence.formatting
+package org.openhab.core.model.persistence.formatting
 
 import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter
 import org.eclipse.xtext.formatting.impl.FormattingConfig
 // import com.google.inject.Inject;
-// import org.eclipse.smarthome.model.persistence.services.PersistenceGrammarAccess
+// import org.openhab.core.model.persistence.services.PersistenceGrammarAccess
 
 /**
  * This class contains custom formatting description.
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/generator/PersistenceGenerator.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/generator/PersistenceGenerator.xtend
index 0e679983aec..d2b5cea585a 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/generator/PersistenceGenerator.xtend
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/generator/PersistenceGenerator.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.persistence.generator
+package org.openhab.core.model.persistence.generator
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.xtext.generator.AbstractGenerator
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/internal/PersistenceModelManager.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/internal/PersistenceModelManager.java
index d2360a46c93..e33807d121a 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/internal/PersistenceModelManager.java
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/internal/PersistenceModelManager.java
@@ -10,34 +10,34 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.persistence.internal;
+package org.openhab.core.model.persistence.internal;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.smarthome.core.persistence.PersistenceManager;
-import org.eclipse.smarthome.core.persistence.PersistenceService;
-import org.eclipse.smarthome.core.persistence.PersistenceServiceConfiguration;
-import org.eclipse.smarthome.core.persistence.SimpleFilter;
-import org.eclipse.smarthome.core.persistence.SimpleItemConfiguration;
-import org.eclipse.smarthome.core.persistence.config.SimpleAllConfig;
-import org.eclipse.smarthome.core.persistence.config.SimpleConfig;
-import org.eclipse.smarthome.core.persistence.config.SimpleGroupConfig;
-import org.eclipse.smarthome.core.persistence.config.SimpleItemConfig;
-import org.eclipse.smarthome.core.persistence.strategy.SimpleCronStrategy;
-import org.eclipse.smarthome.core.persistence.strategy.SimpleStrategy;
-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.persistence.persistence.AllConfig;
-import org.eclipse.smarthome.model.persistence.persistence.CronStrategy;
-import org.eclipse.smarthome.model.persistence.persistence.Filter;
-import org.eclipse.smarthome.model.persistence.persistence.GroupConfig;
-import org.eclipse.smarthome.model.persistence.persistence.ItemConfig;
-import org.eclipse.smarthome.model.persistence.persistence.PersistenceConfiguration;
-import org.eclipse.smarthome.model.persistence.persistence.PersistenceModel;
-import org.eclipse.smarthome.model.persistence.persistence.Strategy;
+import org.openhab.core.persistence.PersistenceManager;
+import org.openhab.core.persistence.PersistenceService;
+import org.openhab.core.persistence.PersistenceServiceConfiguration;
+import org.openhab.core.persistence.SimpleFilter;
+import org.openhab.core.persistence.SimpleItemConfiguration;
+import org.openhab.core.persistence.config.SimpleAllConfig;
+import org.openhab.core.persistence.config.SimpleConfig;
+import org.openhab.core.persistence.config.SimpleGroupConfig;
+import org.openhab.core.persistence.config.SimpleItemConfig;
+import org.openhab.core.persistence.strategy.SimpleCronStrategy;
+import org.openhab.core.persistence.strategy.SimpleStrategy;
+import org.openhab.core.model.core.EventType;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.core.ModelRepositoryChangeListener;
+import org.openhab.core.model.persistence.persistence.AllConfig;
+import org.openhab.core.model.persistence.persistence.CronStrategy;
+import org.openhab.core.model.persistence.persistence.Filter;
+import org.openhab.core.model.persistence.persistence.GroupConfig;
+import org.openhab.core.model.persistence.persistence.ItemConfig;
+import org.openhab.core.model.persistence.persistence.PersistenceConfiguration;
+import org.openhab.core.model.persistence.persistence.PersistenceModel;
+import org.openhab.core.model.persistence.persistence.Strategy;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java
index cb5ec1241c2..c85d83bd54c 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.persistence.scoping;
+package org.openhab.core.model.persistence.scoping;
 
-import org.eclipse.smarthome.model.persistence.persistence.Strategy;
-import org.eclipse.smarthome.model.persistence.persistence.impl.StrategyImpl;
+import org.openhab.core.model.persistence.persistence.Strategy;
+import org.openhab.core.model.persistence.persistence.impl.StrategyImpl;
 
 /**
  * This class defines a few persistence strategies that are globally available to
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceGlobalScopeProvider.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceGlobalScopeProvider.java
index 37c5a8839e2..8da134f424b 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceGlobalScopeProvider.java
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceGlobalScopeProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.persistence.scoping;
+package org.openhab.core.model.persistence.scoping;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.smarthome.model.persistence.persistence.Strategy;
+import org.openhab.core.model.persistence.persistence.Strategy;
 import org.eclipse.xtext.resource.EObjectDescription;
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.scoping.IScope;
@@ -34,7 +34,7 @@ public class PersistenceGlobalScopeProvider extends AbstractGlobalScopeProvider
     static protected Resource res = new ResourceImpl();
 
     static {
-        res.setURI(URI.createURI("virtual://eclipse.org/smarthome/persistence/strategy.global"));
+        res.setURI(URI.createURI("virtual://openhab.org/persistence/strategy.global"));
         res.getContents().add(GlobalStrategies.UPDATE);
         res.getContents().add(GlobalStrategies.CHANGE);
         res.getContents().add(GlobalStrategies.RESTORE);
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceScopeProvider.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceScopeProvider.xtend
index d2b67557313..92bc589b76c 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceScopeProvider.xtend
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/PersistenceScopeProvider.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.persistence.scoping
+package org.openhab.core.model.persistence.scoping
 
 /**
  * This class contains custom scoping description.
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSemanticSequencer.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSemanticSequencer.xtend
index bcc33897e87..b8a645184bf 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSemanticSequencer.xtend
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSemanticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.persistence.serializer
+package org.openhab.core.model.persistence.serializer
 
 
 class PersistenceSemanticSequencer extends AbstractPersistenceSemanticSequencer {
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSyntacticSequencer.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSyntacticSequencer.xtend
index d907c0e548c..296183784ac 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSyntacticSequencer.xtend
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/serializer/PersistenceSyntacticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.persistence.serializer
+package org.openhab.core.model.persistence.serializer
 
 
 class PersistenceSyntacticSequencer extends AbstractPersistenceSyntacticSequencer {
diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/validation/PersistenceValidator.xtend b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/validation/PersistenceValidator.xtend
index 8ad095b3c2c..ebb23ac367c 100644
--- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/validation/PersistenceValidator.xtend
+++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/validation/PersistenceValidator.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.persistence.validation
+package org.openhab.core.model.persistence.validation
 //import org.eclipse.xtext.validation.Check
 
 /**
diff --git a/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeModule.xtend b/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeModule.xtend
index bf51b1baf15..eefeb170bc6 100644
--- a/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeModule.xtend
+++ b/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeModule.xtend
@@ -13,10 +13,10 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.rule.ide
+package org.openhab.core.model.rule.ide
 
 import org.eclipse.xtext.xbase.typesystem.internal.IFeatureScopeTracker
-import org.eclipse.smarthome.model.script.OptimizingFeatureScopeTrackerProvider2
+import org.openhab.core.model.script.OptimizingFeatureScopeTrackerProvider2
 
 /**
  * Use this class to register ide components.
diff --git a/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeSetup.xtend b/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeSetup.xtend
index 24c5ff288af..3673720747e 100644
--- a/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeSetup.xtend
+++ b/bundles/org.openhab.core.model.rule.ide/src/org/openhab/core/model/rule/ide/RulesIdeSetup.xtend
@@ -13,12 +13,12 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.rule.ide
+package org.openhab.core.model.rule.ide
 
 import com.google.inject.Guice
-import org.eclipse.smarthome.model.rule.RulesRuntimeModule
-import org.eclipse.smarthome.model.rule.RulesStandaloneSetup
-import org.eclipse.smarthome.model.script.ServiceModule
+import org.openhab.core.model.rule.RulesRuntimeModule
+import org.openhab.core.model.rule.RulesStandaloneSetup
+import org.openhab.core.model.script.ServiceModule
 import org.eclipse.xtext.util.Modules2
 
 /**
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/RuleEngine.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/RuleEngine.java
index e1d76dd4980..1f53b9ed074 100644
--- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/RuleEngine.java
+++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/RuleEngine.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.runtime;
+package org.openhab.core.model.rule.runtime;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleRuntimeActivator.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleRuntimeActivator.java
index 265fe36da3e..4a401ccf365 100644
--- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleRuntimeActivator.java
+++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleRuntimeActivator.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.runtime.internal;
+package org.openhab.core.model.rule.runtime.internal;
 
-import org.eclipse.smarthome.model.core.ModelParser;
-import org.eclipse.smarthome.model.rule.RulesStandaloneSetup;
-import org.eclipse.smarthome.model.script.ScriptServiceUtil;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
+import org.openhab.core.model.core.ModelParser;
+import org.openhab.core.model.rule.RulesStandaloneSetup;
+import org.openhab.core.model.script.ScriptServiceUtil;
+import org.openhab.core.model.script.engine.ScriptEngine;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/ExecuteRuleJob.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/ExecuteRuleJob.java
index fad8bedc0a9..1c005f97897 100644
--- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/ExecuteRuleJob.java
+++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/ExecuteRuleJob.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.runtime.internal.engine;
+package org.openhab.core.model.rule.runtime.internal.engine;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.rule.rules.Rule;
-import org.eclipse.smarthome.model.rule.rules.RuleModel;
-import org.eclipse.smarthome.model.script.engine.Script;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
-import org.eclipse.smarthome.model.script.engine.ScriptExecutionException;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.rule.rules.Rule;
+import org.openhab.core.model.rule.rules.RuleModel;
+import org.openhab.core.model.script.engine.Script;
+import org.openhab.core.model.script.engine.ScriptEngine;
+import org.openhab.core.model.script.engine.ScriptExecutionException;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java
index 39c99bad993..dcba9c6ad5d 100644
--- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java
+++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/GuiceAwareJobFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.runtime.internal.engine;
+package org.openhab.core.model.rule.runtime.internal.engine;
 
 import org.quartz.Job;
 import org.quartz.Scheduler;
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleContextHelper.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleContextHelper.java
index ffcd4bf7377..fd29483251b 100644
--- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleContextHelper.java
+++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleContextHelper.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.runtime.internal.engine;
+package org.openhab.core.model.rule.runtime.internal.engine;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.smarthome.model.rule.rules.Rule;
-import org.eclipse.smarthome.model.rule.rules.RuleModel;
-import org.eclipse.smarthome.model.rule.rules.VariableDeclaration;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
-import org.eclipse.smarthome.model.script.engine.ScriptExecutionException;
+import org.openhab.core.model.rule.rules.Rule;
+import org.openhab.core.model.rule.rules.RuleModel;
+import org.openhab.core.model.rule.rules.VariableDeclaration;
+import org.openhab.core.model.script.engine.ScriptEngine;
+import org.openhab.core.model.script.engine.ScriptExecutionException;
 import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.xbase.interpreter.IEvaluationContext;
 import org.slf4j.Logger;
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEngineImpl.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEngineImpl.java
index 2e65b75ccf8..4dd79485c7c 100644
--- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEngineImpl.java
+++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEngineImpl.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.runtime.internal.engine;
+package org.openhab.core.model.rule.runtime.internal.engine;
 
-import static org.eclipse.smarthome.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes.*;
+import static org.openhab.core.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes.*;
 
 import java.util.Collection;
 import java.util.Set;
@@ -23,35 +23,35 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.ItemRegistryChangeListener;
-import org.eclipse.smarthome.core.items.StateChangeListener;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemStateEvent;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.events.ChannelTriggeredEvent;
-import org.eclipse.smarthome.core.thing.events.ThingStatusInfoChangedEvent;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-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.rule.RulesStandaloneSetup;
-import org.eclipse.smarthome.model.rule.jvmmodel.RulesJvmModelInferrer;
-import org.eclipse.smarthome.model.rule.rules.Rule;
-import org.eclipse.smarthome.model.rule.rules.RuleModel;
-import org.eclipse.smarthome.model.rule.runtime.RuleEngine;
-import org.eclipse.smarthome.model.rule.runtime.internal.RuleRuntimeActivator;
-import org.eclipse.smarthome.model.script.engine.Script;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
-import org.eclipse.smarthome.model.script.engine.ScriptExecutionException;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.ItemRegistryChangeListener;
+import org.openhab.core.items.StateChangeListener;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemStateEvent;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.events.ChannelTriggeredEvent;
+import org.openhab.core.thing.events.ThingStatusInfoChangedEvent;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.model.core.EventType;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.core.ModelRepositoryChangeListener;
+import org.openhab.core.model.rule.RulesStandaloneSetup;
+import org.openhab.core.model.rule.jvmmodel.RulesJvmModelInferrer;
+import org.openhab.core.model.rule.rules.Rule;
+import org.openhab.core.model.rule.rules.RuleModel;
+import org.openhab.core.model.rule.runtime.RuleEngine;
+import org.openhab.core.model.rule.runtime.internal.RuleRuntimeActivator;
+import org.openhab.core.model.script.engine.Script;
+import org.openhab.core.model.script.engine.ScriptEngine;
+import org.openhab.core.model.script.engine.ScriptExecutionException;
 import org.eclipse.xtext.naming.QualifiedName;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEvaluationContext.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEvaluationContext.java
index 03f0b1c5e00..fa0b13e25de 100644
--- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEvaluationContext.java
+++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleEvaluationContext.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.runtime.internal.engine;
+package org.openhab.core.model.rule.runtime.internal.engine;
 
 import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.xbase.interpreter.IEvaluationContext;
diff --git a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerManager.java b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerManager.java
index a589048a78d..edd58ca026b 100644
--- a/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerManager.java
+++ b/bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerManager.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.runtime.internal.engine;
+package org.openhab.core.model.rule.runtime.internal.engine;
 
-import static org.eclipse.smarthome.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes.*;
+import static org.openhab.core.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes.*;
 import static org.quartz.JobBuilder.newJob;
 import static org.quartz.TriggerBuilder.newTrigger;
 
@@ -28,27 +28,27 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.Type;
-import org.eclipse.smarthome.core.types.TypeParser;
-import org.eclipse.smarthome.model.rule.rules.ChangedEventTrigger;
-import org.eclipse.smarthome.model.rule.rules.CommandEventTrigger;
-import org.eclipse.smarthome.model.rule.rules.EventEmittedTrigger;
-import org.eclipse.smarthome.model.rule.rules.EventTrigger;
-import org.eclipse.smarthome.model.rule.rules.GroupMemberChangedEventTrigger;
-import org.eclipse.smarthome.model.rule.rules.GroupMemberCommandEventTrigger;
-import org.eclipse.smarthome.model.rule.rules.GroupMemberUpdateEventTrigger;
-import org.eclipse.smarthome.model.rule.rules.Rule;
-import org.eclipse.smarthome.model.rule.rules.RuleModel;
-import org.eclipse.smarthome.model.rule.rules.SystemOnShutdownTrigger;
-import org.eclipse.smarthome.model.rule.rules.SystemOnStartupTrigger;
-import org.eclipse.smarthome.model.rule.rules.ThingStateChangedEventTrigger;
-import org.eclipse.smarthome.model.rule.rules.ThingStateUpdateEventTrigger;
-import org.eclipse.smarthome.model.rule.rules.TimerTrigger;
-import org.eclipse.smarthome.model.rule.rules.UpdateEventTrigger;
+import org.openhab.core.items.Item;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.Type;
+import org.openhab.core.types.TypeParser;
+import org.openhab.core.model.rule.rules.ChangedEventTrigger;
+import org.openhab.core.model.rule.rules.CommandEventTrigger;
+import org.openhab.core.model.rule.rules.EventEmittedTrigger;
+import org.openhab.core.model.rule.rules.EventTrigger;
+import org.openhab.core.model.rule.rules.GroupMemberChangedEventTrigger;
+import org.openhab.core.model.rule.rules.GroupMemberCommandEventTrigger;
+import org.openhab.core.model.rule.rules.GroupMemberUpdateEventTrigger;
+import org.openhab.core.model.rule.rules.Rule;
+import org.openhab.core.model.rule.rules.RuleModel;
+import org.openhab.core.model.rule.rules.SystemOnShutdownTrigger;
+import org.openhab.core.model.rule.rules.SystemOnStartupTrigger;
+import org.openhab.core.model.rule.rules.ThingStateChangedEventTrigger;
+import org.openhab.core.model.rule.rules.ThingStateUpdateEventTrigger;
+import org.openhab.core.model.rule.rules.TimerTrigger;
+import org.openhab.core.model.rule.rules.UpdateEventTrigger;
 import org.quartz.CronScheduleBuilder;
 import org.quartz.Job;
 import org.quartz.JobDetail;
diff --git a/bundles/org.openhab.core.model.rule/bnd.bnd b/bundles/org.openhab.core.model.rule/bnd.bnd
index 73b3740ae39..ca4564ba3fa 100644
--- a/bundles/org.openhab.core.model.rule/bnd.bnd
+++ b/bundles/org.openhab.core.model.rule/bnd.bnd
@@ -1,34 +1,34 @@
 Bundle-SymbolicName: ${project.artifactId}
-Export-Package: org.eclipse.smarthome.model.rule,\
- org.eclipse.smarthome.model.rule.formatting,\
- org.eclipse.smarthome.model.rule.jvmmodel,\
- org.eclipse.smarthome.model.rule.parser.antlr,\
- org.eclipse.smarthome.model.rule.parser.antlr.internal,\
- org.eclipse.smarthome.model.rule.rules,\
- org.eclipse.smarthome.model.rule.rules.impl,\
- org.eclipse.smarthome.model.rule.rules.util,\
- org.eclipse.smarthome.model.rule.scoping,\
- org.eclipse.smarthome.model.rule.serializer,\
- org.eclipse.smarthome.model.rule.services,\
- org.eclipse.smarthome.model.rule.validation
+Export-Package: org.openhab.core.model.rule,\
+ org.openhab.core.model.rule.formatting,\
+ org.openhab.core.model.rule.jvmmodel,\
+ org.openhab.core.model.rule.parser.antlr,\
+ org.openhab.core.model.rule.parser.antlr.internal,\
+ org.openhab.core.model.rule.rules,\
+ org.openhab.core.model.rule.rules.impl,\
+ org.openhab.core.model.rule.rules.util,\
+ org.openhab.core.model.rule.scoping,\
+ org.openhab.core.model.rule.serializer,\
+ org.openhab.core.model.rule.services,\
+ org.openhab.core.model.rule.validation
 Import-Package: \
- org.eclipse.smarthome.core.common.registry,\
- org.eclipse.smarthome.core.events,\
- org.eclipse.smarthome.core.items,\
- org.eclipse.smarthome.core.library.items,\
- org.eclipse.smarthome.core.library.types,\
- org.eclipse.smarthome.core.library.unit,\
- org.eclipse.smarthome.core.persistence,\
- org.eclipse.smarthome.core.service,\
- org.eclipse.smarthome.core.thing,\
- org.eclipse.smarthome.core.thing.binding,\
- org.eclipse.smarthome.core.thing.events,\
- org.eclipse.smarthome.core.types,\
- org.eclipse.smarthome.model.core,\
- org.eclipse.smarthome.model.items,\
- org.eclipse.smarthome.model.persistence.extensions,\
- org.eclipse.smarthome.model.script,\
- org.eclipse.smarthome.model.script.engine.action,\
+ org.openhab.core.common.registry,\
+ org.openhab.core.events,\
+ org.openhab.core.items,\
+ org.openhab.core.library.items,\
+ org.openhab.core.library.types,\
+ org.openhab.core.library.unit,\
+ org.openhab.core.persistence,\
+ org.openhab.core.service,\
+ org.openhab.core.thing,\
+ org.openhab.core.thing.binding,\
+ org.openhab.core.thing.events,\
+ org.openhab.core.types,\
+ org.openhab.core.model.core,\
+ org.openhab.core.model.items,\
+ org.openhab.core.model.persistence.extensions,\
+ org.openhab.core.model.script,\
+ org.openhab.core.model.script.engine.action,\
  com.google.common.base;version="14",\
  javax.measure,\
  org.apache.commons.io,\
diff --git a/bundles/org.openhab.core.model.rule/plugin.xml b/bundles/org.openhab.core.model.rule/plugin.xml
index f2193240b9a..8ebfd2b2cea 100644
--- a/bundles/org.openhab.core.model.rule/plugin.xml
+++ b/bundles/org.openhab.core.model.rule/plugin.xml
@@ -5,8 +5,8 @@
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
-       uri = "http://www.eclipse.org/smarthome/model/Rules" 
-       class = "org.eclipse.smarthome.model.rule.rules.RulesPackage"
+       uri = "https://openhab.org/model/Rules" 
+       class = "org.openhab.core.model.rule.rules.RulesPackage"
        genModel = "model/generated/Rules.genmodel" /> 
 	
   </extension>
diff --git a/bundles/org.openhab.core.model.rule/pom.xml b/bundles/org.openhab.core.model.rule/pom.xml
index c2c04465fb3..55ee774cf1e 100644
--- a/bundles/org.openhab.core.model.rule/pom.xml
+++ b/bundles/org.openhab.core.model.rule/pom.xml
@@ -51,7 +51,7 @@
           <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <arguments>
-            <argument>file://${project.basedir}/src/org/eclipse/smarthome/model/rule/GenerateRules.mwe2</argument>
+            <argument>file://${project.basedir}/src/org/openhab/core/model/rule/GenerateRules.mwe2</argument>
             <argument>-p</argument>
             <argument>rootPath=/${project.basedir}/..</argument>
           </arguments>
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2 b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2
index 374b0b44d05..08dd77abe9a 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/GenerateRules.mwe2
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-module org.eclipse.smarthome.model.rule.GenerateRules
+module org.openhab.core.model.rule.GenerateRules
 
 import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
@@ -18,7 +18,7 @@ import org.eclipse.xtext.xtext.generator.model.project.*
 var rootPath = ".."
 var fileExtensions = "rules"
 var projectName = "org.openhab.core.model.rule"
-var languageName = "org.eclipse.smarthome.model.rule.Rules"
+var languageName = "org.openhab.core.model.rule.Rules"
 var generateXtendStub = true
 var encoding = "UTF-8"
 
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/Rules.xtext b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/Rules.xtext
index f7aaeaf91c4..271788eaea8 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/Rules.xtext
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/Rules.xtext
@@ -1,10 +1,10 @@
-grammar org.eclipse.smarthome.model.rule.Rules with org.eclipse.smarthome.model.script.Script
+grammar org.openhab.core.model.rule.Rules with org.openhab.core.model.script.Script
 
 import "http://www.eclipse.org/xtext/xbase/Xbase" as xbase
 import "http://www.eclipse.org/xtext/common/JavaVMTypes" as types
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 
-generate rules "http://www.eclipse.org/smarthome/model/Rules"
+generate rules "https://openhab.org/model/Rules"
 
 RuleModel:
 	importSection = XImportSection?
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend
index fd49a3dbe77..9838bea2f6d 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesRuntimeModule.xtend
@@ -14,16 +14,16 @@ package
 /*
  * generated by Xtext
  */
-org.eclipse.smarthome.model.rule
+org.openhab.core.model.rule
 
 import com.google.inject.Binder
 import com.google.inject.name.Names
-import org.eclipse.smarthome.model.rule.scoping.RulesImplicitlyImportedTypes
-import org.eclipse.smarthome.model.script.interpreter.ScriptInterpreter
-import org.eclipse.smarthome.model.script.jvmmodel.ScriptTypeComputer
-import org.eclipse.smarthome.model.script.scoping.ActionClassLoader
-import org.eclipse.smarthome.model.script.scoping.ScriptImportSectionNamespaceScopeProvider
-import org.eclipse.smarthome.model.script.scoping.StateAndCommandProvider
+import org.openhab.core.model.rule.scoping.RulesImplicitlyImportedTypes
+import org.openhab.core.model.script.interpreter.ScriptInterpreter
+import org.openhab.core.model.script.jvmmodel.ScriptTypeComputer
+import org.openhab.core.model.script.scoping.ActionClassLoader
+import org.openhab.core.model.script.scoping.ScriptImportSectionNamespaceScopeProvider
+import org.openhab.core.model.script.scoping.StateAndCommandProvider
 import org.eclipse.xtext.common.types.access.IJvmTypeProvider
 import org.eclipse.xtext.common.types.access.reflect.ReflectionTypeProviderFactory
 import org.eclipse.xtext.common.types.access.reflect.ReflectionTypeScopeProvider
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesStandaloneSetup.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesStandaloneSetup.xtend
index 0d4ab6398f8..5efdf0abc8a 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesStandaloneSetup.xtend
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/RulesStandaloneSetup.xtend
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule
+package org.openhab.core.model.rule
 
 import com.google.inject.Guice
 import com.google.inject.Injector
 import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.smarthome.model.script.ScriptServiceUtil
-import org.eclipse.smarthome.model.script.ScriptStandaloneSetup
-import org.eclipse.smarthome.model.script.ServiceModule
+import org.openhab.core.model.script.ScriptServiceUtil
+import org.openhab.core.model.script.ScriptStandaloneSetup
+import org.openhab.core.model.script.ServiceModule
 import org.eclipse.xtext.resource.IResourceServiceProvider
-import org.eclipse.smarthome.model.script.engine.ScriptEngine
+import org.openhab.core.model.script.engine.ScriptEngine
 
 /** 
  * Initialization support for running Xtext languages
@@ -74,7 +74,7 @@ class RulesStandaloneSetup extends RulesStandaloneSetupGenerated {
     }
     
     def static unregister() {
-        EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Rules");
+        EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Rules");
         Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("rules");
         IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("rules");
         
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/formatting/RulesFormatter.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/formatting/RulesFormatter.xtend
index 7c520caf7c7..a30553c3cd1 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/formatting/RulesFormatter.xtend
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/formatting/RulesFormatter.xtend
@@ -13,12 +13,12 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.rule.formatting
+package org.openhab.core.model.rule.formatting
 
 import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter
 import org.eclipse.xtext.formatting.impl.FormattingConfig
 // import com.google.inject.Inject;
-// import org.eclipse.smarthome.model.rule.services.RulesGrammarAccess
+// import org.openhab.core.model.rule.services.RulesGrammarAccess
 
 /**
  * This class contains custom formatting description.
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesItemRefresher.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesItemRefresher.java
index 31bae9f6547..f3794e5ad74 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesItemRefresher.java
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesItemRefresher.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.jvmmodel;
+package org.openhab.core.model.rule.jvmmodel;
 
 import java.util.Collection;
 
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.ItemRegistryChangeListener;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.ItemRegistryChangeListener;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend
index f8ef24567d9..59f17ebb099 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesJvmModelInferrer.xtend
@@ -10,29 +10,29 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.jvmmodel
+package org.openhab.core.model.rule.jvmmodel
 
 import com.google.inject.Inject
 import java.util.Set
-import org.eclipse.smarthome.core.items.Item
-import org.eclipse.smarthome.core.items.ItemRegistry
-import org.eclipse.smarthome.core.thing.ThingRegistry
-import org.eclipse.smarthome.core.thing.events.ChannelTriggeredEvent
-import org.eclipse.smarthome.core.types.Command
-import org.eclipse.smarthome.core.types.State
-import org.eclipse.smarthome.model.rule.rules.ChangedEventTrigger
-import org.eclipse.smarthome.model.rule.rules.CommandEventTrigger
-import org.eclipse.smarthome.model.rule.rules.EventEmittedTrigger
-import org.eclipse.smarthome.model.rule.rules.EventTrigger
-import org.eclipse.smarthome.model.rule.rules.GroupMemberChangedEventTrigger
-import org.eclipse.smarthome.model.rule.rules.GroupMemberCommandEventTrigger
-import org.eclipse.smarthome.model.rule.rules.GroupMemberUpdateEventTrigger
-import org.eclipse.smarthome.model.rule.rules.Rule
-import org.eclipse.smarthome.model.rule.rules.RuleModel
-import org.eclipse.smarthome.model.rule.rules.ThingStateChangedEventTrigger
-import org.eclipse.smarthome.model.rule.rules.UpdateEventTrigger
-import org.eclipse.smarthome.model.script.jvmmodel.ScriptJvmModelInferrer
-import org.eclipse.smarthome.model.script.scoping.StateAndCommandProvider
+import org.openhab.core.items.Item
+import org.openhab.core.items.ItemRegistry
+import org.openhab.core.thing.ThingRegistry
+import org.openhab.core.thing.events.ChannelTriggeredEvent
+import org.openhab.core.types.Command
+import org.openhab.core.types.State
+import org.openhab.core.model.rule.rules.ChangedEventTrigger
+import org.openhab.core.model.rule.rules.CommandEventTrigger
+import org.openhab.core.model.rule.rules.EventEmittedTrigger
+import org.openhab.core.model.rule.rules.EventTrigger
+import org.openhab.core.model.rule.rules.GroupMemberChangedEventTrigger
+import org.openhab.core.model.rule.rules.GroupMemberCommandEventTrigger
+import org.openhab.core.model.rule.rules.GroupMemberUpdateEventTrigger
+import org.openhab.core.model.rule.rules.Rule
+import org.openhab.core.model.rule.rules.RuleModel
+import org.openhab.core.model.rule.rules.ThingStateChangedEventTrigger
+import org.openhab.core.model.rule.rules.UpdateEventTrigger
+import org.openhab.core.model.script.jvmmodel.ScriptJvmModelInferrer
+import org.openhab.core.model.script.scoping.StateAndCommandProvider
 import org.eclipse.xtext.naming.IQualifiedNameProvider
 import org.eclipse.xtext.xbase.jvmmodel.IJvmDeclaredTypeAcceptor
 import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesRefresher.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesRefresher.java
index d5fb16d9e6c..b196bcdb4b4 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesRefresher.java
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesRefresher.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.jvmmodel;
+package org.openhab.core.model.rule.jvmmodel;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesThingRefresher.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesThingRefresher.java
index bca9873bde8..addf29ba9fa 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesThingRefresher.java
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/jvmmodel/RulesThingRefresher.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.jvmmodel;
+package org.openhab.core.model.rule.jvmmodel;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingRegistryChangeListener;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingRegistryChangeListener;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesImplicitlyImportedTypes.java b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesImplicitlyImportedTypes.java
index 099cfde7044..7297c6d5d7a 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesImplicitlyImportedTypes.java
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesImplicitlyImportedTypes.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.scoping;
+package org.openhab.core.model.rule.scoping;
 
-import org.eclipse.smarthome.model.script.scoping.ScriptImplicitlyImportedTypes;
+import org.openhab.core.model.script.scoping.ScriptImplicitlyImportedTypes;
 
 import com.google.inject.Singleton;
 
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesScopeProvider.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesScopeProvider.xtend
index a6b949eda07..bfd28bc772e 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesScopeProvider.xtend
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/scoping/RulesScopeProvider.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.rule.scoping
+package org.openhab.core.model.rule.scoping
 
 
 /**
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSemanticSequencer.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSemanticSequencer.xtend
index b6b6f31f6fb..0b712de0c73 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSemanticSequencer.xtend
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSemanticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.rule.serializer
+package org.openhab.core.model.rule.serializer
 
 
 class RulesSemanticSequencer extends AbstractRulesSemanticSequencer {
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSyntacticSequencer.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSyntacticSequencer.xtend
index 5df5952dd51..9c6486ef3d0 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSyntacticSequencer.xtend
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/serializer/RulesSyntacticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.rule.serializer
+package org.openhab.core.model.rule.serializer
 
 
 class RulesSyntacticSequencer extends AbstractRulesSyntacticSequencer {
diff --git a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/validation/RulesValidator.xtend b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/validation/RulesValidator.xtend
index 7bef66da69f..4f9eba1dd0b 100644
--- a/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/validation/RulesValidator.xtend
+++ b/bundles/org.openhab.core.model.rule/src/org/openhab/core/model/rule/validation/RulesValidator.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.rule.validation
+package org.openhab.core.model.rule.validation
 //import org.eclipse.xtext.validation.Check
 
 /**
diff --git a/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeModule.xtend b/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeModule.xtend
index 13275c8a625..fea745d4117 100644
--- a/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeModule.xtend
+++ b/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeModule.xtend
@@ -13,9 +13,9 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.script.ide
+package org.openhab.core.model.script.ide
 
-import org.eclipse.smarthome.model.script.OptimizingFeatureScopeTrackerProvider2
+import org.openhab.core.model.script.OptimizingFeatureScopeTrackerProvider2
 import org.eclipse.xtext.xbase.typesystem.internal.IFeatureScopeTracker
 
 /**
diff --git a/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeSetup.xtend b/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeSetup.xtend
index 2b81921a946..e4ebc4cc866 100644
--- a/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeSetup.xtend
+++ b/bundles/org.openhab.core.model.script.ide/src/org/openhab/core/model/script/ide/ScriptIdeSetup.xtend
@@ -13,12 +13,12 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.script.ide
+package org.openhab.core.model.script.ide
 
 import com.google.inject.Guice
-import org.eclipse.smarthome.model.script.ScriptRuntimeModule
-import org.eclipse.smarthome.model.script.ScriptStandaloneSetup
-import org.eclipse.smarthome.model.script.ServiceModule
+import org.openhab.core.model.script.ScriptRuntimeModule
+import org.openhab.core.model.script.ScriptStandaloneSetup
+import org.openhab.core.model.script.ServiceModule
 import org.eclipse.xtext.util.Modules2
 
 /**
diff --git a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/ScriptRuntime.java b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/ScriptRuntime.java
index f1f402e36f1..34b09683bb6 100644
--- a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/ScriptRuntime.java
+++ b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/ScriptRuntime.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.runtime;
+package org.openhab.core.model.script.runtime;
 
 /**
  * This is a marker interface for Script Runtimes.
diff --git a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptEngineImpl.java b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptEngineImpl.java
index d424e906298..aff7b7b07a1 100644
--- a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptEngineImpl.java
+++ b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptEngineImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.runtime.internal.engine;
+package org.openhab.core.model.script.runtime.internal.engine;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -23,14 +23,14 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.smarthome.model.core.ModelParser;
-import org.eclipse.smarthome.model.script.ScriptServiceUtil;
-import org.eclipse.smarthome.model.script.ScriptStandaloneSetup;
-import org.eclipse.smarthome.model.script.engine.Script;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
-import org.eclipse.smarthome.model.script.engine.ScriptExecutionException;
-import org.eclipse.smarthome.model.script.engine.ScriptParsingException;
-import org.eclipse.smarthome.model.script.runtime.ScriptRuntime;
+import org.openhab.core.model.core.ModelParser;
+import org.openhab.core.model.script.ScriptServiceUtil;
+import org.openhab.core.model.script.ScriptStandaloneSetup;
+import org.openhab.core.model.script.engine.Script;
+import org.openhab.core.model.script.engine.ScriptEngine;
+import org.openhab.core.model.script.engine.ScriptExecutionException;
+import org.openhab.core.model.script.engine.ScriptParsingException;
+import org.openhab.core.model.script.runtime.ScriptRuntime;
 import org.eclipse.xtext.diagnostics.Severity;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.XtextResourceSet;
diff --git a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptImpl.java b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptImpl.java
index c760d07b4c2..b3ac6485be6 100644
--- a/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptImpl.java
+++ b/bundles/org.openhab.core.model.script.runtime/src/org/openhab/core/model/script/runtime/internal/engine/ScriptImpl.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.runtime.internal.engine;
+package org.openhab.core.model.script.runtime.internal.engine;
 
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.smarthome.model.script.engine.Script;
-import org.eclipse.smarthome.model.script.engine.ScriptExecutionException;
+import org.openhab.core.model.script.engine.Script;
+import org.openhab.core.model.script.engine.ScriptExecutionException;
 import org.eclipse.xtext.resource.IResourceServiceProvider;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.util.CancelIndicator;
diff --git a/bundles/org.openhab.core.model.script/bnd.bnd b/bundles/org.openhab.core.model.script/bnd.bnd
index 8d05e011210..59d25b970ca 100644
--- a/bundles/org.openhab.core.model.script/bnd.bnd
+++ b/bundles/org.openhab.core.model.script/bnd.bnd
@@ -1,46 +1,46 @@
 Bundle-SymbolicName: ${project.artifactId}
-Export-Package: org.eclipse.smarthome.model.script,\
- org.eclipse.smarthome.model.script.actions,\
- org.eclipse.smarthome.model.script.engine,\
- org.eclipse.smarthome.model.script.engine.action,\
- org.eclipse.smarthome.model.script.extension,\
- org.eclipse.smarthome.model.script.formatting,\
- org.eclipse.smarthome.model.script.interpreter,\
- org.eclipse.smarthome.model.script.jvmmodel,\
- org.eclipse.smarthome.model.script.lib,\
- org.eclipse.smarthome.model.script.parser.antlr,\
- org.eclipse.smarthome.model.script.parser.antlr.internal,\
- org.eclipse.smarthome.model.script.scoping,\
- org.eclipse.smarthome.model.script.script,\
- org.eclipse.smarthome.model.script.script.impl,\
- org.eclipse.smarthome.model.script.script.util,\
- org.eclipse.smarthome.model.script.serializer,\
- org.eclipse.smarthome.model.script.services,\
- org.eclipse.smarthome.model.script.validation
+Export-Package: org.openhab.core.model.script,\
+ org.openhab.core.model.script.actions,\
+ org.openhab.core.model.script.engine,\
+ org.openhab.core.model.script.engine.action,\
+ org.openhab.core.model.script.extension,\
+ org.openhab.core.model.script.formatting,\
+ org.openhab.core.model.script.interpreter,\
+ org.openhab.core.model.script.jvmmodel,\
+ org.openhab.core.model.script.lib,\
+ org.openhab.core.model.script.parser.antlr,\
+ org.openhab.core.model.script.parser.antlr.internal,\
+ org.openhab.core.model.script.scoping,\
+ org.openhab.core.model.script.script,\
+ org.openhab.core.model.script.script.impl,\
+ org.openhab.core.model.script.script.util,\
+ org.openhab.core.model.script.serializer,\
+ org.openhab.core.model.script.services,\
+ org.openhab.core.model.script.validation
 Import-Package: \
- org.eclipse.smarthome.core.audio,\
- org.eclipse.smarthome.core.common.registry,\
- org.eclipse.smarthome.core.ephemeris,\
- org.eclipse.smarthome.core.events,\
- org.eclipse.smarthome.core.items,\
- org.eclipse.smarthome.core.items.events,\
- org.eclipse.smarthome.core.library.items,\
- org.eclipse.smarthome.core.library.types,\
- org.eclipse.smarthome.core.library.unit,\
- org.eclipse.smarthome.core.persistence,\
- org.eclipse.smarthome.core.thing,\
- org.eclipse.smarthome.core.thing.binding,\
- org.eclipse.smarthome.core.transform.actions,\
- org.eclipse.smarthome.core.types,\
- org.eclipse.smarthome.core.voice,\
- org.eclipse.smarthome.core.voice.text,\
- org.eclipse.smarthome.io.console,\
- org.eclipse.smarthome.io.console.extensions,\
- org.eclipse.smarthome.io.net.exec,\
- org.eclipse.smarthome.io.net.http,\
- org.eclipse.smarthome.model.core,\
- org.eclipse.smarthome.model.persistence.extensions,\
- org.eclipse.smarthome.model.script.engine.action,\
+ org.openhab.core.audio,\
+ org.openhab.core.common.registry,\
+ org.openhab.core.ephemeris,\
+ org.openhab.core.events,\
+ org.openhab.core.items,\
+ org.openhab.core.items.events,\
+ org.openhab.core.library.items,\
+ org.openhab.core.library.types,\
+ org.openhab.core.library.unit,\
+ org.openhab.core.persistence,\
+ org.openhab.core.thing,\
+ org.openhab.core.thing.binding,\
+ org.openhab.core.transform.actions,\
+ org.openhab.core.types,\
+ org.openhab.core.voice,\
+ org.openhab.core.voice.text,\
+ org.openhab.core.io.console,\
+ org.openhab.core.io.console.extensions,\
+ org.openhab.core.io.net.exec,\
+ org.openhab.core.io.net.http,\
+ org.openhab.core.model.core,\
+ org.openhab.core.model.persistence.extensions,\
+ org.openhab.core.model.script.engine.action,\
  com.google.common.*;version="14",\
  javax.measure.*,\
  org.apache.*,\
diff --git a/bundles/org.openhab.core.model.script/plugin.xml b/bundles/org.openhab.core.model.script/plugin.xml
index cf1f2de468d..cf16866d872 100644
--- a/bundles/org.openhab.core.model.script/plugin.xml
+++ b/bundles/org.openhab.core.model.script/plugin.xml
@@ -5,8 +5,8 @@
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
-       uri = "http://www.eclipse.org/smarthome/model/Script" 
-       class = "org.eclipse.smarthome.model.script.script.ScriptPackage"
+       uri = "https://openhab.org/model/Script" 
+       class = "org.openhab.core.model.script.script.ScriptPackage"
        genModel = "model/generated/Script.genmodel" /> 
 	
   </extension>
diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml
index 1f6a7bf3af0..1c2fd023fd5 100644
--- a/bundles/org.openhab.core.model.script/pom.xml
+++ b/bundles/org.openhab.core.model.script/pom.xml
@@ -77,7 +77,7 @@
           <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <arguments>
-            <argument>file://${project.basedir}/src/org/eclipse/smarthome/model/script/GenerateScript.mwe2</argument>
+            <argument>file://${project.basedir}/src/org/openhab/core/model/script/GenerateScript.mwe2</argument>
             <argument>-p</argument>
             <argument>rootPath=/${project.basedir}/..</argument>
           </arguments>
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2 b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2
index 05d724ba396..8a8ce9497df 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/GenerateScript.mwe2
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-module org.eclipse.smarthome.model.script.GenerateScript
+module org.openhab.core.model.script.GenerateScript
 
 import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
@@ -18,7 +18,7 @@ import org.eclipse.xtext.xtext.generator.model.project.*
 var rootPath = ".."
 var fileExtensions = "script"
 var projectName = "org.openhab.core.model.script"
-var languageName = "org.eclipse.smarthome.model.script.Script"
+var languageName = "org.openhab.core.model.script.Script"
 var generateXtendStub = true
 var encoding = "UTF-8"
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/OptimizingFeatureScopeTrackerProvider2.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/OptimizingFeatureScopeTrackerProvider2.java
index a6a39fecf0f..f8e0dfde2e3 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/OptimizingFeatureScopeTrackerProvider2.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/OptimizingFeatureScopeTrackerProvider2.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script;
+package org.openhab.core.model.script;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.xbase.typesystem.internal.FeatureScopeTracker;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/Script.xtext b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/Script.xtext
index f9b4070b82d..46ea8346d19 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/Script.xtext
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/Script.xtext
@@ -1,10 +1,10 @@
-grammar org.eclipse.smarthome.model.script.Script with org.eclipse.xtext.xbase.Xbase
+grammar org.openhab.core.model.script.Script with org.eclipse.xtext.xbase.Xbase
 
 import "http://www.eclipse.org/xtext/xbase/Xbase"
 import "http://www.eclipse.org/xtext/common/JavaVMTypes" as types
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 
-generate script "http://www.eclipse.org/smarthome/model/Script"
+generate script "https://openhab.org/model/Script"
 
 Script returns XBlockExpression: 
 	{Script}
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptRuntimeModule.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptRuntimeModule.xtend
index c7e9e76730f..fdbb7f44056 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptRuntimeModule.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptRuntimeModule.xtend
@@ -14,12 +14,12 @@ package
 /*
  * generated by Xtext
  */
-org.eclipse.smarthome.model.script
+org.openhab.core.model.script
 
-import org.eclipse.smarthome.model.script.interpreter.ScriptInterpreter
-import org.eclipse.smarthome.model.script.scoping.ActionClassLoader
-import org.eclipse.smarthome.model.script.scoping.ScriptImplicitlyImportedTypes
-import org.eclipse.smarthome.model.script.scoping.ScriptImportSectionNamespaceScopeProvider
+import org.openhab.core.model.script.interpreter.ScriptInterpreter
+import org.openhab.core.model.script.scoping.ActionClassLoader
+import org.openhab.core.model.script.scoping.ScriptImplicitlyImportedTypes
+import org.openhab.core.model.script.scoping.ScriptImportSectionNamespaceScopeProvider
 import org.eclipse.xtext.common.types.access.IJvmTypeProvider
 import org.eclipse.xtext.common.types.access.reflect.ReflectionTypeProviderFactory
 import org.eclipse.xtext.common.types.access.reflect.ReflectionTypeScopeProvider
@@ -34,16 +34,16 @@ import org.eclipse.xtext.xbase.scoping.batch.ImplicitlyImportedFeatures
 import com.google.inject.Binder
 import com.google.inject.name.Names
 import org.eclipse.xtext.xbase.typesystem.computation.ITypeComputer
-import org.eclipse.smarthome.model.script.jvmmodel.ScriptTypeComputer
+import org.openhab.core.model.script.jvmmodel.ScriptTypeComputer
 import org.eclipse.xtext.parser.IEncodingProvider
-import org.eclipse.smarthome.model.script.internal.ScriptEncodingProvider
+import org.openhab.core.model.script.internal.ScriptEncodingProvider
 import org.eclipse.xtext.service.DispatchingProvider
 
 /** 
  * Use this class to register components to be used at runtime / without the Equinox extension registry.
  * @author Oliver Libutzki - Initial contribution
  */
-@SuppressWarnings("restriction") class ScriptRuntimeModule extends org.eclipse.smarthome.model.script.AbstractScriptRuntimeModule {
+@SuppressWarnings("restriction") class ScriptRuntimeModule extends org.openhab.core.model.script.AbstractScriptRuntimeModule {
     def Class<? extends ImplicitlyImportedFeatures> bindImplicitlyImportedTypes() {
         return ScriptImplicitlyImportedTypes
     }
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptServiceUtil.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptServiceUtil.java
index 8a9af6f2a02..4ae7eec0364 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptServiceUtil.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptServiceUtil.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script;
+package org.openhab.core.model.script;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.binding.ThingActions;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.binding.ThingActions;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.script.engine.ScriptEngine;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptStandaloneSetup.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptStandaloneSetup.xtend
index 28f8c78ab61..0643d063da6 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptStandaloneSetup.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ScriptStandaloneSetup.xtend
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script
+package org.openhab.core.model.script
 
 import com.google.inject.Guice
 import com.google.inject.Injector
-import org.eclipse.smarthome.model.script.engine.ScriptEngine
+import org.openhab.core.model.script.engine.ScriptEngine
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.EPackage
 import org.eclipse.xtext.resource.IResourceServiceProvider
@@ -67,7 +67,7 @@ class ScriptStandaloneSetup extends ScriptStandaloneSetupGenerated {
     }
     
     def static void unregister() {
-        EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Script");
+        EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Script");
         Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("script");
         IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("script");
         
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ServiceModule.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ServiceModule.java
index a00f078d3e8..bdc61e48ab4 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ServiceModule.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/ServiceModule.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script;
+package org.openhab.core.model.script;
 
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.script.engine.IActionServiceProvider;
-import org.eclipse.smarthome.model.script.engine.IThingActionsProvider;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
-import org.eclipse.smarthome.model.script.internal.engine.ServiceTrackerActionServiceProvider;
-import org.eclipse.smarthome.model.script.internal.engine.ServiceTrackerThingActionsProvider;
-import org.eclipse.smarthome.model.script.script.Script;
-import org.eclipse.smarthome.model.script.script.impl.ScriptImpl;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.script.engine.IActionServiceProvider;
+import org.openhab.core.model.script.engine.IThingActionsProvider;
+import org.openhab.core.model.script.engine.ScriptEngine;
+import org.openhab.core.model.script.internal.engine.ServiceTrackerActionServiceProvider;
+import org.openhab.core.model.script.internal.engine.ServiceTrackerThingActionsProvider;
+import org.openhab.core.model.script.script.Script;
+import org.openhab.core.model.script.script.impl.ScriptImpl;
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Audio.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Audio.java
index a06405a2858..b64f370ea7b 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Audio.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Audio.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 
-import org.eclipse.smarthome.core.audio.AudioException;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.model.script.engine.action.ActionDoc;
-import org.eclipse.smarthome.model.script.engine.action.ParamDoc;
-import org.eclipse.smarthome.model.script.internal.engine.action.AudioActionService;
+import org.openhab.core.audio.AudioException;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.model.script.engine.action.ActionDoc;
+import org.openhab.core.model.script.engine.action.ParamDoc;
+import org.openhab.core.model.script.internal.engine.action.AudioActionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/BusEvent.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/BusEvent.java
index face5849ee6..8b1f3bce4d6 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/BusEvent.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/BusEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import java.util.HashMap;
 import java.util.List;
@@ -18,16 +18,16 @@
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.TypeParser;
-import org.eclipse.smarthome.model.script.ScriptServiceUtil;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.TypeParser;
+import org.openhab.core.model.script.ScriptServiceUtil;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ephemeris.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ephemeris.java
index a7a42698d1a..7fbe4536187 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ephemeris.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ephemeris.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import java.io.FileNotFoundException;
 import java.time.ZonedDateTime;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.model.script.engine.action.ActionDoc;
-import org.eclipse.smarthome.model.script.internal.engine.action.EphemerisActionService;
+import org.openhab.core.model.script.engine.action.ActionDoc;
+import org.openhab.core.model.script.internal.engine.action.EphemerisActionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Exec.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Exec.java
index dd0dbb056f4..7c5b3f385a0 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Exec.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Exec.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import java.io.IOException;
 
-import org.eclipse.smarthome.io.net.exec.ExecUtil;
+import org.openhab.core.io.net.exec.ExecUtil;
 
 /**
  * This class provides static methods that can be used in automation rules for
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java
index d8b08d9b4c7..d8ab06df682 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import java.io.IOException;
 import java.util.Properties;
@@ -18,7 +18,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.eclipse.jetty.http.HttpMethod;
-import org.eclipse.smarthome.io.net.http.HttpUtil;
+import org.openhab.core.io.net.http.HttpUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/LogAction.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/LogAction.java
index 5f447b93556..3bbba615629 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/LogAction.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/LogAction.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,13 +23,13 @@
  */
 public class LogAction {
 
-    private static final String LOGGER_NAME_PREFIX = "org.eclipse.smarthome.model.script.";
+    private static final String LOGGER_NAME_PREFIX = "org.openhab.core.model.script.";
 
     /**
      * Creates the Log-Entry <code>format</code> with level <code>DEBUG</code> and logs under the loggers name
-     * <code>org.eclipse.smarthome.model.script.&lt;loggerName&gt;</code>
+     * <code>org.openhab.core.model.script.&lt;loggerName&gt;</code>
      * 
-     * @param loggerName the name of the Logger which is prefixed with <code>org.eclipse.smarthome.model.script.</code>
+     * @param loggerName the name of the Logger which is prefixed with <code>org.openhab.core.model.script.</code>
      * @param format the Log-Statement which can contain placeholders '<code>{}</code>'
      * @param args the arguments to replace the placeholders contained in <code>format</code>
      * 
@@ -41,9 +41,9 @@ static public void logDebug(String loggerName, String format, Object... args) {
 
     /**
      * Creates the Log-Entry <code>format</code> with level <code>INFO</code> and logs under the loggers name
-     * <code>org.eclipse.smarthome.model.script.&lt;loggerName&gt;</code>
+     * <code>org.openhab.core.model.script.&lt;loggerName&gt;</code>
      * 
-     * @param loggerName the name of the Logger which is prefixed with <code>org.eclipse.smarthome.model.script.</code>
+     * @param loggerName the name of the Logger which is prefixed with <code>org.openhab.core.model.script.</code>
      * @param format the Log-Statement which can contain placeholders '<code>{}</code>'
      * @param args the arguments to replace the placeholders contained in <code>format</code>
      * 
@@ -55,9 +55,9 @@ static public void logInfo(String loggerName, String format, Object... args) {
 
     /**
      * Creates the Log-Entry <code>format</code> with level <code>WARN</code> and logs under the loggers name
-     * <code>org.eclipse.smarthome.model.script.&lt;loggerName&gt;</code>
+     * <code>org.openhab.core.model.script.&lt;loggerName&gt;</code>
      * 
-     * @param loggerName the name of the Logger which is prefixed with <code>org.eclipse.smarthome.model.script.</code>
+     * @param loggerName the name of the Logger which is prefixed with <code>org.openhab.core.model.script.</code>
      * @param format the Log-Statement which can contain placeholders '<code>{}</code>'
      * @param args the arguments to replace the placeholders contained in <code>format</code>
      * 
@@ -69,9 +69,9 @@ static public void logWarn(String loggerName, String format, Object... args) {
 
     /**
      * Creates the Log-Entry <code>format</code> with level <code>ERROR</code> and logs under the loggers name
-     * <code>org.eclipse.smarthome.model.script.&lt;loggerName&gt;</code>
+     * <code>org.openhab.core.model.script.&lt;loggerName&gt;</code>
      * 
-     * @param loggerName the name of the Logger which is prefixed with <code>org.eclipse.smarthome.model.script.</code>
+     * @param loggerName the name of the Logger which is prefixed with <code>org.openhab.core.model.script.</code>
      * @param format the Log-Statement which can contain placeholders '<code>{}</code>'
      * @param args the arguments to replace the placeholders contained in <code>format</code>
      * 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ping.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ping.java
index 0a8b9014304..86dfa7b5e17 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ping.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Ping.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/ScriptExecution.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/ScriptExecution.java
index 69fe18d8414..e6644ae2671 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/ScriptExecution.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/ScriptExecution.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import static org.quartz.JobBuilder.newJob;
 import static org.quartz.TriggerBuilder.newTrigger;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.script.ScriptServiceUtil;
-import org.eclipse.smarthome.model.script.engine.Script;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
-import org.eclipse.smarthome.model.script.engine.ScriptExecutionException;
-import org.eclipse.smarthome.model.script.internal.actions.TimerExecutionJob;
-import org.eclipse.smarthome.model.script.internal.actions.TimerImpl;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.script.ScriptServiceUtil;
+import org.openhab.core.model.script.engine.Script;
+import org.openhab.core.model.script.engine.ScriptEngine;
+import org.openhab.core.model.script.engine.ScriptExecutionException;
+import org.openhab.core.model.script.internal.actions.TimerExecutionJob;
+import org.openhab.core.model.script.internal.actions.TimerImpl;
 import org.eclipse.xtext.xbase.XExpression;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure0;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Things.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Things.java
index 24f95104074..9738a4bb761 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Things.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Things.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.binding.ThingActions;
-import org.eclipse.smarthome.model.script.internal.engine.action.ThingActionService;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.binding.ThingActions;
+import org.openhab.core.model.script.internal.engine.action.ThingActionService;
 
 /**
  * This class provides static methods that can be used in automation rules for
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Timer.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Timer.java
index 4c3d281b1fc..4a1fd3066e6 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Timer.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Timer.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import org.joda.time.base.AbstractInstant;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Voice.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Voice.java
index 4ffb26005dd..1b7bce2d89c 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Voice.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/Voice.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.voice.text.InterpretationException;
-import org.eclipse.smarthome.model.script.engine.action.ActionDoc;
-import org.eclipse.smarthome.model.script.engine.action.ParamDoc;
-import org.eclipse.smarthome.model.script.internal.engine.action.VoiceActionService;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.voice.text.InterpretationException;
+import org.openhab.core.model.script.engine.action.ActionDoc;
+import org.openhab.core.model.script.engine.action.ParamDoc;
+import org.openhab.core.model.script.internal.engine.action.VoiceActionService;
 
 /**
  * The static methods of this class are made available as functions in the scripts.
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IActionServiceProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IActionServiceProvider.java
index 2748b7d6af2..d58eb62ce0f 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IActionServiceProvider.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IActionServiceProvider.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine;
+package org.openhab.core.model.script.engine;
 
 import java.util.List;
 
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.model.script.engine.action.ActionService;
 
 public interface IActionServiceProvider {
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IThingActionsProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IThingActionsProvider.java
index b0e7c59a3a8..552466d36ff 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IThingActionsProvider.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/IThingActionsProvider.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine;
+package org.openhab.core.model.script.engine;
 
 import java.util.List;
 
-import org.eclipse.smarthome.core.thing.binding.ThingActions;
+import org.openhab.core.thing.binding.ThingActions;
 
 public interface IThingActionsProvider {
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/Script.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/Script.java
index 022733a4e90..532ad4dae0d 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/Script.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/Script.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine;
+package org.openhab.core.model.script.engine;
 
 import org.eclipse.xtext.xbase.interpreter.IEvaluationContext;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptEngine.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptEngine.java
index f7cce659e8a..520be309ebd 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptEngine.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptEngine.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine;
+package org.openhab.core.model.script.engine;
 
 import org.eclipse.xtext.xbase.XExpression;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java
index fece5bdb38e..914ce84f36c 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptError.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine;
+package org.openhab.core.model.script.engine;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.nodemodel.INode;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptException.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptException.java
index d11f5782b4f..93cc2e1df1a 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptException.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine;
+package org.openhab.core.model.script.engine;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptExecutionException.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptExecutionException.java
index 13515b4d016..c50565e1d6b 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptExecutionException.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptExecutionException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine;
+package org.openhab.core.model.script.engine;
 
 /**
  * Exception that is thrown on errors during script execution.
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptParsingException.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptParsingException.java
index 9c2978e8ee7..5ae8a567ba1 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptParsingException.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/ScriptParsingException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine;
+package org.openhab.core.model.script.engine;
 
 import java.util.List;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionDoc.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionDoc.java
index 84eb98f154e..07fe78a2fed 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionDoc.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionDoc.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine.action;
+package org.openhab.core.model.script.engine.action;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionService.java
index 2d74688d957..7e31bdd5acd 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionService.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ActionService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine.action;
+package org.openhab.core.model.script.engine.action;
 
 /**
  * This interface must be implemented by services that want to contribute script actions.
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ParamDoc.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ParamDoc.java
index 5ec58e22c54..f10cd7b2dd0 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ParamDoc.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/engine/action/ParamDoc.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine.action;
+package org.openhab.core.model.script.engine.action;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java
index 35556239f22..db66f8d895e 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/extension/ScriptEngineConsoleCommandExtension.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.extension;
+package org.openhab.core.model.script.extension;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
-import org.eclipse.smarthome.model.script.engine.Script;
-import org.eclipse.smarthome.model.script.engine.ScriptEngine;
-import org.eclipse.smarthome.model.script.engine.ScriptExecutionException;
-import org.eclipse.smarthome.model.script.engine.ScriptParsingException;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.model.script.engine.Script;
+import org.openhab.core.model.script.engine.ScriptEngine;
+import org.openhab.core.model.script.engine.ScriptExecutionException;
+import org.openhab.core.model.script.engine.ScriptParsingException;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/formatting/ScriptFormatter.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/formatting/ScriptFormatter.xtend
index 3a84436af94..9f81e40afcf 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/formatting/ScriptFormatter.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/formatting/ScriptFormatter.xtend
@@ -13,12 +13,12 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.script.formatting
+package org.openhab.core.model.script.formatting
 
 import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter
 import org.eclipse.xtext.formatting.impl.FormattingConfig
 // import com.google.inject.Inject;
-// import org.eclipse.smarthome.model.script.services.ScriptGrammarAccess
+// import org.openhab.core.model.script.services.ScriptGrammarAccess
 
 /**
  * This class contains custom formatting description.
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java
index a9864903478..a832c86fda9 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/RuleHumanLanguageInterpreter.java
@@ -10,21 +10,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal;
+package org.openhab.core.model.script.internal;
 
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.ItemUtil;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter;
-import org.eclipse.smarthome.core.voice.text.InterpretationException;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.ItemUtil;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.voice.text.HumanLanguageInterpreter;
+import org.openhab.core.voice.text.InterpretationException;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -42,8 +42,8 @@
  *
  * @author Kai Kreuzer - Initial contribution
  */
-@Component(immediate = true, service = HumanLanguageInterpreter.class, configurationPid = "org.eclipse.smarthome.rulehli", property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.rulehli",
+@Component(immediate = true, service = HumanLanguageInterpreter.class, configurationPid = "org.openhab.core.rulehli", property = {
+        Constants.SERVICE_PID + "=org.openhab.core.rulehli",
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=voice",
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=Rule Voice Interpreter",
         ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + RuleHumanLanguageInterpreter.CONFIG_URI })
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/ScriptEncodingProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/ScriptEncodingProvider.java
index 26e9eaedf7c..bbbbd870fbc 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/ScriptEncodingProvider.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/ScriptEncodingProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal;
+package org.openhab.core.model.script.internal;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerExecutionJob.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerExecutionJob.java
index 1f8fb0ae06a..08548f2bf04 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerExecutionJob.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerExecutionJob.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal.actions;
+package org.openhab.core.model.script.internal.actions;
 
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure0;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerImpl.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerImpl.java
index cd41b4cad54..762dd0890cc 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerImpl.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/actions/TimerImpl.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal.actions;
+package org.openhab.core.model.script.internal.actions;
 
 import static org.quartz.JobBuilder.newJob;
 import static org.quartz.TriggerBuilder.newTrigger;
 
 import java.util.Date;
 
-import org.eclipse.smarthome.model.script.actions.Timer;
+import org.openhab.core.model.script.actions.Timer;
 import org.joda.time.DateTime;
 import org.joda.time.base.AbstractInstant;
 import org.quartz.JobDataMap;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend
index ee80973fb26..01157151284 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerActionServiceProvider.xtend
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal.engine;
+package org.openhab.core.model.script.internal.engine;
 
 import com.google.inject.Singleton
-import org.eclipse.smarthome.model.script.ScriptServiceUtil
-import org.eclipse.smarthome.model.script.engine.IActionServiceProvider
+import org.openhab.core.model.script.ScriptServiceUtil
+import org.openhab.core.model.script.engine.IActionServiceProvider
 
 @Singleton
 class ServiceTrackerActionServiceProvider implements IActionServiceProvider {
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend
index daac8c092e9..30bd0febb5c 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/ServiceTrackerThingActionsProvider.xtend
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal.engine;
+package org.openhab.core.model.script.internal.engine;
 
 import com.google.inject.Singleton
-import org.eclipse.smarthome.model.script.ScriptServiceUtil
-import org.eclipse.smarthome.model.script.engine.IThingActionsProvider
+import org.openhab.core.model.script.ScriptServiceUtil
+import org.openhab.core.model.script.engine.IThingActionsProvider
 
 @Singleton
 class ServiceTrackerThingActionsProvider implements IThingActionsProvider {
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/AudioActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/AudioActionService.java
index 0e0cae50cf7..d034d067cf6 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/AudioActionService.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/AudioActionService.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal.engine.action;
+package org.openhab.core.model.script.internal.engine.action;
 
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.model.script.actions.Audio;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.model.script.actions.Audio;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/EphemerisActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/EphemerisActionService.java
index 3c9ed36007f..c56e4abee37 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/EphemerisActionService.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/EphemerisActionService.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal.engine.action;
+package org.openhab.core.model.script.internal.engine.action;
 
-import org.eclipse.smarthome.core.ephemeris.EphemerisManager;
-import org.eclipse.smarthome.model.script.actions.Ephemeris;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.ephemeris.EphemerisManager;
+import org.openhab.core.model.script.actions.Ephemeris;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/PersistenceActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/PersistenceActionService.java
index 03c3a06ffe8..9cd31c675d1 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/PersistenceActionService.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/PersistenceActionService.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal.engine.action;
+package org.openhab.core.model.script.internal.engine.action;
 
-import org.eclipse.smarthome.model.persistence.extensions.PersistenceExtensions;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.model.persistence.extensions.PersistenceExtensions;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/ThingActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/ThingActionService.java
index 41a08207246..b3cb9bf019b 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/ThingActionService.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/ThingActionService.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal.engine.action;
+package org.openhab.core.model.script.internal.engine.action;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingActions;
-import org.eclipse.smarthome.core.thing.binding.ThingActionsScope;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.model.script.actions.Things;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingActions;
+import org.openhab.core.thing.binding.ThingActionsScope;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.model.script.actions.Things;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/TransformationActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/TransformationActionService.java
index fac35f6206e..004ff77e2c7 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/TransformationActionService.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/TransformationActionService.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal.engine.action;
+package org.openhab.core.model.script.internal.engine.action;
 
-import org.eclipse.smarthome.core.transform.actions.Transformation;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.transform.actions.Transformation;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/VoiceActionService.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/VoiceActionService.java
index f9f8e119c69..21a5de2db53 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/VoiceActionService.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/internal/engine/action/VoiceActionService.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.internal.engine.action;
+package org.openhab.core.model.script.internal.engine.action;
 
-import org.eclipse.smarthome.core.voice.VoiceManager;
-import org.eclipse.smarthome.model.script.actions.Voice;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.voice.VoiceManager;
+import org.openhab.core.model.script.actions.Voice;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend
index 70ff299d3d0..4e49538a5ae 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/interpreter/ScriptInterpreter.xtend
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.interpreter;
+package org.openhab.core.model.script.interpreter;
 
 import com.google.inject.Inject
-import org.eclipse.smarthome.core.items.Item
-import org.eclipse.smarthome.core.items.ItemNotFoundException
-import org.eclipse.smarthome.core.items.ItemRegistry
-import org.eclipse.smarthome.core.library.types.QuantityType
-import org.eclipse.smarthome.core.types.Type
-import org.eclipse.smarthome.model.script.engine.ScriptError
-import org.eclipse.smarthome.model.script.engine.ScriptExecutionException
-import org.eclipse.smarthome.model.script.lib.NumberExtensions
-import org.eclipse.smarthome.model.script.scoping.StateAndCommandProvider
-import org.eclipse.smarthome.model.script.script.QuantityLiteral
+import org.openhab.core.items.Item
+import org.openhab.core.items.ItemNotFoundException
+import org.openhab.core.items.ItemRegistry
+import org.openhab.core.library.types.QuantityType
+import org.openhab.core.types.Type
+import org.openhab.core.model.script.engine.ScriptError
+import org.openhab.core.model.script.engine.ScriptExecutionException
+import org.openhab.core.model.script.lib.NumberExtensions
+import org.openhab.core.model.script.scoping.StateAndCommandProvider
+import org.openhab.core.model.script.script.QuantityLiteral
 import org.eclipse.xtext.common.types.JvmField
 import org.eclipse.xtext.common.types.JvmIdentifiableElement
 import org.eclipse.xtext.naming.QualifiedName
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptItemRefresher.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptItemRefresher.java
index b4a01ca5a07..c296e9bce98 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptItemRefresher.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptItemRefresher.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.jvmmodel;
+package org.openhab.core.model.script.jvmmodel;
 
 import java.util.Collection;
 import java.util.concurrent.Executors;
@@ -18,11 +18,11 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.ItemRegistryChangeListener;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.ItemRegistryChangeListener;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.script.engine.action.ActionService;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend
index 9ec3ef98c6c..7dd67ec6668 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptJvmModelInferrer.xtend
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.jvmmodel
+package org.openhab.core.model.script.jvmmodel
 
 import com.google.inject.Inject
 import java.util.Set
-import org.eclipse.smarthome.core.items.ItemRegistry
-import org.eclipse.smarthome.model.script.scoping.StateAndCommandProvider
-import org.eclipse.smarthome.model.script.script.Script
+import org.openhab.core.items.ItemRegistry
+import org.openhab.core.model.script.scoping.StateAndCommandProvider
+import org.openhab.core.model.script.script.Script
 import org.eclipse.xtext.xbase.jvmmodel.AbstractModelInferrer
 import org.eclipse.xtext.xbase.jvmmodel.IJvmDeclaredTypeAcceptor
 import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptTypeComputer.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptTypeComputer.java
index 6c33352e82d..b44377d9918 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptTypeComputer.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/jvmmodel/ScriptTypeComputer.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.jvmmodel;
+package org.openhab.core.model.script.jvmmodel;
 
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.model.script.script.QuantityLiteral;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.model.script.script.QuantityLiteral;
 import org.eclipse.xtext.xbase.XExpression;
 import org.eclipse.xtext.xbase.typesystem.computation.ITypeComputationState;
 import org.eclipse.xtext.xbase.typesystem.computation.ITypeExpectation;
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java
index 8a447e19f96..863206bbcc5 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.lib;
+package org.openhab.core.model.script.lib;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
 import javax.measure.quantity.Dimensionless;
 
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
-import org.eclipse.smarthome.core.types.Type;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.SmartHomeUnits;
+import org.openhab.core.types.Type;
 
 /**
  * This class contains all kinds of extensions to be used by scripts and not
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ActionClassLoader.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ActionClassLoader.java
index 98b987d5708..64f0ca49159 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ActionClassLoader.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ActionClassLoader.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.scoping;
+package org.openhab.core.model.script.scoping;
 
-import org.eclipse.smarthome.core.thing.binding.ThingActions;
-import org.eclipse.smarthome.model.script.ScriptServiceUtil;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
+import org.openhab.core.thing.binding.ThingActions;
+import org.openhab.core.model.script.ScriptServiceUtil;
+import org.openhab.core.model.script.engine.action.ActionService;
 
 /**
  * This is a special class loader that tries to resolve classes from available {@link ActionService}s,
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImplicitlyImportedTypes.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImplicitlyImportedTypes.java
index d9b1d1a8e9b..0a1bdbba790 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImplicitlyImportedTypes.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImplicitlyImportedTypes.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.scoping;
+package org.openhab.core.model.script.scoping;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -19,26 +19,26 @@
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.core.library.unit.BinaryPrefix;
-import org.eclipse.smarthome.core.library.unit.ImperialUnits;
-import org.eclipse.smarthome.core.library.unit.MetricPrefix;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
-import org.eclipse.smarthome.core.thing.binding.ThingActions;
-import org.eclipse.smarthome.model.persistence.extensions.PersistenceExtensions;
-import org.eclipse.smarthome.model.script.actions.Audio;
-import org.eclipse.smarthome.model.script.actions.BusEvent;
-import org.eclipse.smarthome.model.script.actions.Exec;
-import org.eclipse.smarthome.model.script.actions.HTTP;
-import org.eclipse.smarthome.model.script.actions.LogAction;
-import org.eclipse.smarthome.model.script.actions.Ping;
-import org.eclipse.smarthome.model.script.actions.ScriptExecution;
-import org.eclipse.smarthome.model.script.actions.Things;
-import org.eclipse.smarthome.model.script.actions.Voice;
-import org.eclipse.smarthome.model.script.engine.IActionServiceProvider;
-import org.eclipse.smarthome.model.script.engine.IThingActionsProvider;
-import org.eclipse.smarthome.model.script.engine.action.ActionService;
-import org.eclipse.smarthome.model.script.lib.NumberExtensions;
+import org.openhab.core.library.unit.BinaryPrefix;
+import org.openhab.core.library.unit.ImperialUnits;
+import org.openhab.core.library.unit.MetricPrefix;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.SmartHomeUnits;
+import org.openhab.core.thing.binding.ThingActions;
+import org.openhab.core.model.persistence.extensions.PersistenceExtensions;
+import org.openhab.core.model.script.actions.Audio;
+import org.openhab.core.model.script.actions.BusEvent;
+import org.openhab.core.model.script.actions.Exec;
+import org.openhab.core.model.script.actions.HTTP;
+import org.openhab.core.model.script.actions.LogAction;
+import org.openhab.core.model.script.actions.Ping;
+import org.openhab.core.model.script.actions.ScriptExecution;
+import org.openhab.core.model.script.actions.Things;
+import org.openhab.core.model.script.actions.Voice;
+import org.openhab.core.model.script.engine.IActionServiceProvider;
+import org.openhab.core.model.script.engine.IThingActionsProvider;
+import org.openhab.core.model.script.engine.action.ActionService;
+import org.openhab.core.model.script.lib.NumberExtensions;
 import org.eclipse.xtext.xbase.scoping.batch.ImplicitlyImportedFeatures;
 import org.joda.time.DateTime;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java
index 7e9e3e37968..77457602bb4 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.scoping;
+package org.openhab.core.model.script.scoping;
 
 import java.util.List;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptScopeProvider.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptScopeProvider.xtend
index 052654d42ed..2c72ed3f45d 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptScopeProvider.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptScopeProvider.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.script.scoping
+package org.openhab.core.model.script.scoping
 
 
 /**
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java
index 5b1f37845e1..c154c4dd1a5 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/StateAndCommandProvider.java
@@ -10,24 +10,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.scoping;
+package org.openhab.core.model.script.scoping;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.library.types.IncreaseDecreaseType;
-import org.eclipse.smarthome.core.library.types.NextPreviousType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.OpenClosedType;
-import org.eclipse.smarthome.core.library.types.PlayPauseType;
-import org.eclipse.smarthome.core.library.types.RewindFastforwardType;
-import org.eclipse.smarthome.core.library.types.StopMoveType;
-import org.eclipse.smarthome.core.library.types.UpDownType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.Type;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.library.types.IncreaseDecreaseType;
+import org.openhab.core.library.types.NextPreviousType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.OpenClosedType;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.library.types.RewindFastforwardType;
+import org.openhab.core.library.types.StopMoveType;
+import org.openhab.core.library.types.UpDownType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.Type;
+import org.openhab.core.types.UnDefType;
 
 import com.google.inject.Singleton;
 
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSemanticSequencer.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSemanticSequencer.xtend
index e17f726cea8..fdc7865546c 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSemanticSequencer.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSemanticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.script.serializer
+package org.openhab.core.model.script.serializer
 
 
 class ScriptSemanticSequencer extends AbstractScriptSemanticSequencer {
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSyntacticSequencer.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSyntacticSequencer.xtend
index a74f83818b7..3740b5632c4 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSyntacticSequencer.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/serializer/ScriptSyntacticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.script.serializer
+package org.openhab.core.model.script.serializer
 
 
 class ScriptSyntacticSequencer extends AbstractScriptSyntacticSequencer {
diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/validation/ScriptValidator.xtend b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/validation/ScriptValidator.xtend
index 457ad3ccb98..523eb40229b 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/validation/ScriptValidator.xtend
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/validation/ScriptValidator.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.script.validation
+package org.openhab.core.model.script.validation
 //import org.eclipse.xtext.validation.Check
 
 /**
diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeModule.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeModule.xtend
index 30546e022ed..4e5fa8c936a 100644
--- a/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeModule.xtend
+++ b/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeModule.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.19.0
  */
-package org.eclipse.smarthome.model.sitemap.ide
+package org.openhab.core.model.sitemap.ide
 
 
 /**
diff --git a/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeSetup.xtend b/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeSetup.xtend
index c7af0718306..5c8bcf5911f 100644
--- a/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeSetup.xtend
+++ b/bundles/org.openhab.core.model.sitemap.ide/src/org/openhab/core/model/sitemap/ide/SitemapIdeSetup.xtend
@@ -13,11 +13,11 @@
 /*
  * generated by Xtext 2.19.0
  */
-package org.eclipse.smarthome.model.sitemap.ide
+package org.openhab.core.model.sitemap.ide
 
 import com.google.inject.Guice
-import org.eclipse.smarthome.model.sitemap.SitemapRuntimeModule
-import org.eclipse.smarthome.model.sitemap.SitemapStandaloneSetup
+import org.openhab.core.model.sitemap.SitemapRuntimeModule
+import org.openhab.core.model.sitemap.SitemapStandaloneSetup
 import org.eclipse.xtext.util.Modules2
 
 /**
diff --git a/bundles/org.openhab.core.model.sitemap.runtime/bnd.bnd b/bundles/org.openhab.core.model.sitemap.runtime/bnd.bnd
index e7ee00d1ba7..b340bf0eabf 100644
--- a/bundles/org.openhab.core.model.sitemap.runtime/bnd.bnd
+++ b/bundles/org.openhab.core.model.sitemap.runtime/bnd.bnd
@@ -2,6 +2,6 @@ Bundle-SymbolicName: ${project.artifactId}
 Require-Bundle: org.openhab.core.model.sitemap
 Import-Package: \
  org.eclipse.jdt.annotation;resolution:=optional,\
- org.eclipse.smarthome.model.core,\
+ org.openhab.core.model.core,\
  org.osgi.framework,\
  org.slf4j
diff --git a/bundles/org.openhab.core.model.sitemap.runtime/src/org/openhab/core/model/sitemap/runtime/internal/SitemapRuntimeActivator.java b/bundles/org.openhab.core.model.sitemap.runtime/src/org/openhab/core/model/sitemap/runtime/internal/SitemapRuntimeActivator.java
index 829222c9248..e92de67292c 100644
--- a/bundles/org.openhab.core.model.sitemap.runtime/src/org/openhab/core/model/sitemap/runtime/internal/SitemapRuntimeActivator.java
+++ b/bundles/org.openhab.core.model.sitemap.runtime/src/org/openhab/core/model/sitemap/runtime/internal/SitemapRuntimeActivator.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.sitemap.runtime.internal;
+package org.openhab.core.model.sitemap.runtime.internal;
 
-import org.eclipse.smarthome.model.core.ModelParser;
-import org.eclipse.smarthome.model.sitemap.SitemapStandaloneSetup;
+import org.openhab.core.model.core.ModelParser;
+import org.openhab.core.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 0f8beebd055..3b1399c263e 100644
--- a/bundles/org.openhab.core.model.sitemap/bnd.bnd
+++ b/bundles/org.openhab.core.model.sitemap/bnd.bnd
@@ -1,21 +1,21 @@
 Bundle-SymbolicName: ${project.artifactId}
-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
+Export-Package: org.openhab.core.model.sitemap,\
+ org.openhab.core.model.sitemap.formatting,\
+ org.openhab.core.model.sitemap.generator,\
+ org.openhab.core.model.sitemap.parser.antlr,\
+ org.openhab.core.model.sitemap.parser.antlr.internal,\
+ org.openhab.core.model.sitemap.scoping,\
+ org.openhab.core.model.sitemap.serializer,\
+ org.openhab.core.model.sitemap.services,\
+ org.openhab.core.model.sitemap.sitemap,\
+ org.openhab.core.model.sitemap.sitemap.impl,\
+ org.openhab.core.model.sitemap.sitemap.util,\
+ org.openhab.core.model.sitemap.validation
 Import-Package: org.apache.commons.lang,\
  org.apache.log4j,\
  org.eclipse.jdt.annotation;resolution:=optional,\
- org.eclipse.smarthome.core.items.dto,\
- org.eclipse.smarthome.model.core,\
+ org.openhab.core.items.dto,\
+ org.openhab.core.model.core,\
  org.eclipse.xtext.xbase.lib,\
  org.osgi.framework,\
  org.osgi.service.cm,\
diff --git a/bundles/org.openhab.core.model.sitemap/plugin.xml b/bundles/org.openhab.core.model.sitemap/plugin.xml
index 97e86ccb1c0..190e561df26 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/Sitemap" 
-       class = "org.eclipse.smarthome.model.sitemap.sitemap.SitemapPackage"
+       uri = "https://openhab.org/model/sitemap/Sitemap" 
+       class = "org.openhab.core.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 55b762b8522..1f8ccdc07b8 100644
--- a/bundles/org.openhab.core.model.sitemap/pom.xml
+++ b/bundles/org.openhab.core.model.sitemap/pom.xml
@@ -51,7 +51,7 @@
           <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <arguments>
-            <argument>file://${project.basedir}/src/org/eclipse/smarthome/model/sitemap/GenerateSitemap.mwe2</argument>
+            <argument>file://${project.basedir}/src/org/openhab/core/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/openhab/core/model/sitemap/GenerateSitemap.mwe2 b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/GenerateSitemap.mwe2
index e6be9976fa8..fce13b7405a 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/GenerateSitemap.mwe2
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/GenerateSitemap.mwe2
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-module org.eclipse.smarthome.model.sitemap.GenerateSitemap
+module org.openhab.core.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.Sitemap"
+var languageName = "org.openhab.core.model.sitemap.Sitemap"
 var fileExtensions = "sitemap"
 var generateXtendStub = true
 var encoding = "UTF-8"
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.properties b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.properties
index ce789b8c333..8bcda501c2d 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.properties
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.properties
@@ -1,3 +1,3 @@
 grammarURI=classpath:/org/openhab/model/sitemap/Sitemap.xtext
 file.extensions=sitemap
-projectName=org.eclipse.smarthome.model.sitemap
+projectName=org.openhab.core.model.sitemap
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext
index 5ec68369221..f83add36227 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/Sitemap.xtext
@@ -1,7 +1,7 @@
-grammar org.eclipse.smarthome.model.sitemap.Sitemap with org.eclipse.xtext.common.Terminals
+grammar org.openhab.core.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"
+generate sitemap "https://openhab.org/model/Sitemap"
 
 SitemapModel:
     'sitemap' Sitemap;
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapProvider.java b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapProvider.java
index aab431bc23f..ed84f2a93c6 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapProvider.java
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapProvider.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.sitemap;
+package org.openhab.core.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;
+import org.openhab.core.model.core.ModelRepositoryChangeListener;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
 
 @NonNullByDefault
 public interface SitemapProvider {
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend
index b5a14670a6b..fd80371c7b8 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapRuntimeModule.xtend
@@ -14,9 +14,9 @@ package
 /*
  * generated by Xtext
  */
-org.eclipse.smarthome.model.sitemap
+org.openhab.core.model.sitemap
 
-import org.eclipse.smarthome.model.sitemap.valueconverter.SitemapConverters
+import org.openhab.core.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.sitemap.AbstractSitemapRuntimeModule {
+class SitemapRuntimeModule extends org.openhab.core.model.sitemap.AbstractSitemapRuntimeModule {
     override Class<? extends IValueConverterService> bindIValueConverterService() {
         return SitemapConverters
     }
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapStandaloneSetup.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapStandaloneSetup.xtend
index b733a6057f3..7d866725387 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapStandaloneSetup.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/SitemapStandaloneSetup.xtend
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.sitemap
+package org.openhab.core.model.sitemap
 
 import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.resource.Resource
@@ -26,7 +26,7 @@ class SitemapStandaloneSetup extends SitemapStandaloneSetupGenerated {
     }
     
     def static void unregister() {
-        EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Sitemap");
+        EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Sitemap");
         Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("sitemap");
         IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("sitemap");
     }
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend
index f400b9c1915..8d1f5783b6f 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/formatting/SitemapFormatter.xtend
@@ -13,12 +13,12 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.sitemap.formatting
+package org.openhab.core.model.sitemap.formatting
 
 import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter
 import org.eclipse.xtext.formatting.impl.FormattingConfig
 // import com.google.inject.Inject;
-// import org.eclipse.smarthome.model.services.SitemapGrammarAccess
+// import org.openhab.core.model.services.SitemapGrammarAccess
 
 /**
  * This class contains custom formatting description.
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/generator/SitemapGenerator.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/generator/SitemapGenerator.xtend
index 3a9b40be708..36afee212d5 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/generator/SitemapGenerator.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/generator/SitemapGenerator.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.sitemap.generator
+package org.openhab.core.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/openhab/core/model/sitemap/internal/SitemapProviderImpl.java b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/internal/SitemapProviderImpl.java
index 8506e30e23d..b8a58162730 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/internal/SitemapProviderImpl.java
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/internal/SitemapProviderImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.sitemap.internal;
+package org.openhab.core.model.sitemap.internal;
 
 import java.util.Map;
 import java.util.Set;
@@ -22,11 +22,11 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 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.Sitemap;
-import org.eclipse.smarthome.model.sitemap.SitemapProvider;
+import org.openhab.core.model.core.EventType;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.core.ModelRepositoryChangeListener;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
+import org.openhab.core.model.sitemap.SitemapProvider;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/scoping/SitemapScopeProvider.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/scoping/SitemapScopeProvider.xtend
index fa6eda10ef3..c4dbbf94e00 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/scoping/SitemapScopeProvider.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/scoping/SitemapScopeProvider.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.sitemap.scoping
+package org.openhab.core.model.sitemap.scoping
 
 /**
  * This class contains custom scoping description.
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSemanticSequencer.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSemanticSequencer.xtend
index 99f84474075..08dceb21872 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSemanticSequencer.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSemanticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.sitemap.serializer
+package org.openhab.core.model.sitemap.serializer
 
 
 class SitemapSemanticSequencer extends AbstractSitemapSemanticSequencer {
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSyntacticSequencer.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSyntacticSequencer.xtend
index 7c14985f900..1abc41ef608 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSyntacticSequencer.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/serializer/SitemapSyntacticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.sitemap.serializer
+package org.openhab.core.model.sitemap.serializer
 
 
 class SitemapSyntacticSequencer extends AbstractSitemapSyntacticSequencer {
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend
index 363b9ccb3ab..2fef8b0f8ce 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/validation/SitemapValidator.xtend
@@ -13,14 +13,14 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.sitemap.validation
+package org.openhab.core.model.sitemap.validation
 
-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.openhab.core.model.sitemap.sitemap.Frame
+import org.openhab.core.model.sitemap.sitemap.LinkableWidget
+import org.openhab.core.model.sitemap.sitemap.Setpoint
+import org.openhab.core.model.sitemap.sitemap.Sitemap
+import org.openhab.core.model.sitemap.sitemap.SitemapPackage
+import org.openhab.core.model.sitemap.sitemap.Widget
 import org.eclipse.xtext.validation.Check
 import java.math.BigDecimal
 
diff --git a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java
index bdc36a63be1..a98c7699adb 100644
--- a/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java
+++ b/bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/valueconverter/SitemapConverters.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.sitemap.valueconverter;
+package org.openhab.core.model.sitemap.valueconverter;
 
 import java.util.regex.Pattern;
 
diff --git a/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeModule.xtend b/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeModule.xtend
index 647f343adfa..c9cc170a10d 100644
--- a/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeModule.xtend
+++ b/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeModule.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.thing.ide
+package org.openhab.core.model.thing.ide
 
 
 /**
diff --git a/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeSetup.xtend b/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeSetup.xtend
index fb59d12a434..12daa1a400b 100644
--- a/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeSetup.xtend
+++ b/bundles/org.openhab.core.model.thing.ide/src/org/openhab/core/model/thing/ide/ThingIdeSetup.xtend
@@ -13,11 +13,11 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.thing.ide
+package org.openhab.core.model.thing.ide
 
 import com.google.inject.Guice
-import org.eclipse.smarthome.model.thing.ThingRuntimeModule
-import org.eclipse.smarthome.model.thing.ThingStandaloneSetup
+import org.openhab.core.model.thing.ThingRuntimeModule
+import org.openhab.core.model.thing.ThingStandaloneSetup
 import org.eclipse.xtext.util.Modules2
 
 /**
diff --git a/bundles/org.openhab.core.model.thing.runtime/src/org/openhab/core/model/thing/runtime/internal/ThingRuntimeActivator.java b/bundles/org.openhab.core.model.thing.runtime/src/org/openhab/core/model/thing/runtime/internal/ThingRuntimeActivator.java
index ccbfc284327..cc8e08aa489 100644
--- a/bundles/org.openhab.core.model.thing.runtime/src/org/openhab/core/model/thing/runtime/internal/ThingRuntimeActivator.java
+++ b/bundles/org.openhab.core.model.thing.runtime/src/org/openhab/core/model/thing/runtime/internal/ThingRuntimeActivator.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.runtime.internal;
+package org.openhab.core.model.thing.runtime.internal;
 
-import org.eclipse.smarthome.model.core.ModelParser;
-import org.eclipse.smarthome.model.thing.ThingStandaloneSetup;
+import org.openhab.core.model.core.ModelParser;
+import org.openhab.core.model.thing.ThingStandaloneSetup;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.model.thing/bnd.bnd b/bundles/org.openhab.core.model.thing/bnd.bnd
index 46c3bc834ef..7992be15711 100644
--- a/bundles/org.openhab.core.model.thing/bnd.bnd
+++ b/bundles/org.openhab.core.model.thing/bnd.bnd
@@ -1,34 +1,34 @@
 Bundle-SymbolicName: ${project.artifactId}
-Export-Package: org.eclipse.smarthome.model.thing,\
- org.eclipse.smarthome.model.thing.formatting,\
- org.eclipse.smarthome.model.thing.generator,\
- org.eclipse.smarthome.model.thing.parser.antlr,\
- org.eclipse.smarthome.model.thing.parser.antlr.internal,\
- org.eclipse.smarthome.model.thing.scoping,\
- org.eclipse.smarthome.model.thing.serializer,\
- org.eclipse.smarthome.model.thing.services,\
- org.eclipse.smarthome.model.thing.thing,\
- org.eclipse.smarthome.model.thing.thing.impl,\
- org.eclipse.smarthome.model.thing.thing.util,\
- org.eclipse.smarthome.model.thing.validation
+Export-Package: org.openhab.core.model.thing,\
+ org.openhab.core.model.thing.formatting,\
+ org.openhab.core.model.thing.generator,\
+ org.openhab.core.model.thing.parser.antlr,\
+ org.openhab.core.model.thing.parser.antlr.internal,\
+ org.openhab.core.model.thing.scoping,\
+ org.openhab.core.model.thing.serializer,\
+ org.openhab.core.model.thing.services,\
+ org.openhab.core.model.thing.thing,\
+ org.openhab.core.model.thing.thing.impl,\
+ org.openhab.core.model.thing.thing.util,\
+ org.openhab.core.model.thing.validation
 Import-Package: org.apache.log4j,\
  org.eclipse.jdt.annotation;resolution:=optional,\
- org.eclipse.smarthome.config.core,\
- org.eclipse.smarthome.core.common.registry,\
- org.eclipse.smarthome.core.i18n,\
- org.eclipse.smarthome.core.items,\
- org.eclipse.smarthome.core.service,\
- org.eclipse.smarthome.core.thing,\
- org.eclipse.smarthome.core.thing.binding,\
- org.eclipse.smarthome.core.thing.binding.builder,\
- org.eclipse.smarthome.core.thing.link,\
- org.eclipse.smarthome.core.thing.type,\
- org.eclipse.smarthome.core.thing.util,\
- org.eclipse.smarthome.core.types.util,\
- org.eclipse.smarthome.core.util,\
- org.eclipse.smarthome.model.core,\
- org.eclipse.smarthome.model.core.valueconverter,\
- org.eclipse.smarthome.model.item,\
+ org.openhab.core.config.core,\
+ org.openhab.core.common.registry,\
+ org.openhab.core.i18n,\
+ org.openhab.core.items,\
+ org.openhab.core.service,\
+ org.openhab.core.thing,\
+ org.openhab.core.thing.binding,\
+ org.openhab.core.thing.binding.builder,\
+ org.openhab.core.thing.link,\
+ org.openhab.core.thing.type,\
+ org.openhab.core.thing.util,\
+ org.openhab.core.types.util,\
+ org.openhab.core.util,\
+ org.openhab.core.model.core,\
+ org.openhab.core.model.core.valueconverter,\
+ org.openhab.core.model.item,\
  org.eclipse.xtext.xbase.lib,\
  org.osgi.framework,\
  org.osgi.service.component,\
diff --git a/bundles/org.openhab.core.model.thing/plugin.xml b/bundles/org.openhab.core.model.thing/plugin.xml
index 6f9bc5314dd..d374704d7b4 100644
--- a/bundles/org.openhab.core.model.thing/plugin.xml
+++ b/bundles/org.openhab.core.model.thing/plugin.xml
@@ -5,8 +5,8 @@
 
   <extension point="org.eclipse.emf.ecore.generated_package">
     <package 
-       uri = "http://www.eclipse.org/smarthome/model/thing/Thing" 
-       class = "org.eclipse.smarthome.model.thing.thing.ThingPackage"
+       uri = "https://openhab.org/model/thing/Thing" 
+       class = "org.openhab.core.model.thing.thing.ThingPackage"
        genModel = "model/generated/Thing.genmodel" /> 
 	
   </extension>
diff --git a/bundles/org.openhab.core.model.thing/plugin.xml_gen b/bundles/org.openhab.core.model.thing/plugin.xml_gen
index dd629c4b780..f1981ab8bb2 100644
--- a/bundles/org.openhab.core.model.thing/plugin.xml_gen
+++ b/bundles/org.openhab.core.model.thing/plugin.xml_gen
@@ -3,8 +3,8 @@
 <plugin>
 	<extension point="org.eclipse.emf.ecore.generated_package">
 		<package 
-			uri = "http://www.eclipse.org/smarthome/model/Thing"
-			class = "org.eclipse.smarthome.model.thing.thing.ThingPackage"
+			uri = "https://openhab.org/model/Thing"
+			class = "org.openhab.core.model.thing.thing.ThingPackage"
 			genModel = "model/generated/Thing.genmodel" />
 	</extension>
 </plugin>
diff --git a/bundles/org.openhab.core.model.thing/pom.xml b/bundles/org.openhab.core.model.thing/pom.xml
index 9bb7b08aa47..58c1b42aea3 100644
--- a/bundles/org.openhab.core.model.thing/pom.xml
+++ b/bundles/org.openhab.core.model.thing/pom.xml
@@ -56,7 +56,7 @@
           <mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
           <arguments>
-            <argument>file://${project.basedir}/src/org/eclipse/smarthome/model/thing/GenerateThing.mwe2</argument>
+            <argument>file://${project.basedir}/src/org/openhab/core/model/thing/GenerateThing.mwe2</argument>
             <argument>-p</argument>
             <argument>rootPath=/${project.basedir}/..</argument>
           </arguments>
diff --git a/bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java b/bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java
index 5f326858c26..1902e78ddfe 100644
--- a/bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java
+++ b/bundles/org.openhab.core.model.thing/src.moved/test/java/org/openhab/core/model/thing/internal/GenericThingProviderMultipleBundlesTest.java
@@ -10,26 +10,26 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.internal;
+package org.openhab.core.model.thing.internal;
 
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.service.ReadyMarker;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.util.BundleResolver;
-import org.eclipse.smarthome.model.core.EventType;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.thing.thing.ModelBridge;
-import org.eclipse.smarthome.model.thing.thing.ModelThing;
-import org.eclipse.smarthome.model.thing.thing.ThingModel;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.service.ReadyMarker;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.binding.builder.BridgeBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.util.BundleResolver;
+import org.openhab.core.model.core.EventType;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.thing.thing.ModelBridge;
+import org.openhab.core.model.thing.thing.ModelThing;
+import org.openhab.core.model.thing.thing.ThingModel;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2 b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2
index 03f88d8289d..8701a76f89a 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/GenerateThing.mwe2
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-module org.eclipse.smarthome.model.thing.GenerateThing
+module org.openhab.core.model.thing.GenerateThing
 
 import org.eclipse.xtext.xtext.generator.*
 import org.eclipse.xtext.xtext.generator.model.project.*
@@ -18,7 +18,7 @@ import org.eclipse.xtext.xtext.generator.model.project.*
 var rootPath = ".."
 var fileExtensions = "things"
 var projectName = "org.openhab.core.model.thing"
-var languageName = "org.eclipse.smarthome.model.thing.Thing"
+var languageName = "org.openhab.core.model.thing.Thing"
 var generateXtendStub = true
 var encoding = "UTF-8"
 
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext
index 775b9b347fb..5c8c1975f5c 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext
@@ -1,4 +1,4 @@
-grammar org.eclipse.smarthome.model.thing.Thing 
+grammar org.openhab.core.model.thing.Thing 
 
 // disabled due to conflicts between the custom ID rule and the common INT rule
 // with org.eclipse.xtext.common.Terminals
@@ -7,7 +7,7 @@ hidden(WS, ML_COMMENT, SL_COMMENT)
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 
-generate thing "http://www.eclipse.org/smarthome/model/Thing"
+generate thing "https://openhab.org/model/Thing"
 
 ThingModel:
 	things+=(ModelThing|ModelBridge)*;
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingRuntimeModule.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingRuntimeModule.xtend
index ddbffd232dc..aefc1f5c44c 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingRuntimeModule.xtend
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingRuntimeModule.xtend
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing
+package org.openhab.core.model.thing
 
-import org.eclipse.smarthome.model.thing.valueconverter.ThingValueConverters
+import org.openhab.core.model.thing.valueconverter.ThingValueConverters
 import org.eclipse.xtext.conversion.IValueConverterService
 import org.eclipse.xtext.linking.lazy.LazyURIEncoder
 import com.google.inject.Binder
@@ -21,13 +21,13 @@ import com.google.inject.name.Names
 /** 
  * Use this class to register components to be used at runtime / without the Equinox extension registry.
  */
-@SuppressWarnings("restriction") class ThingRuntimeModule extends org.eclipse.smarthome.model.thing.AbstractThingRuntimeModule {
+@SuppressWarnings("restriction") class ThingRuntimeModule extends org.openhab.core.model.thing.AbstractThingRuntimeModule {
     override Class<? extends IValueConverterService> bindIValueConverterService() {
         return ThingValueConverters
     }
 
     override Class<? extends org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer> bindISyntacticSequencer() {
-        return org.eclipse.smarthome.model.thing.serializer.ThingSyntacticSequencerExtension
+        return org.openhab.core.model.thing.serializer.ThingSyntacticSequencerExtension
     }
 
     override void configureUseIndexFragmentsForLazyLinking(Binder binder) {
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingStandaloneSetup.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingStandaloneSetup.xtend
index b0a4ac4233a..ef8b408fae3 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingStandaloneSetup.xtend
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/ThingStandaloneSetup.xtend
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing
+package org.openhab.core.model.thing
 
 import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.resource.Resource
@@ -26,7 +26,7 @@ class ThingStandaloneSetup extends ThingStandaloneSetupGenerated {
     }
     
     def static void unregister() {
-        EPackage.Registry.INSTANCE.remove("http://www.eclipse.org/smarthome/model/Thing");
+        EPackage.Registry.INSTANCE.remove("https://openhab.org/model/Thing");
         Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("things");
         IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().remove("things");
     }
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend
index a37f7ff9a11..241ba3eddc5 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend
@@ -13,12 +13,12 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.thing.formatting
+package org.openhab.core.model.thing.formatting
 
 import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter
 import org.eclipse.xtext.formatting.impl.FormattingConfig
 // import com.google.inject.Inject;
-// import org.eclipse.smarthome.model.thing.services.ThingGrammarAccess
+// import org.openhab.core.model.thing.services.ThingGrammarAccess
 
 /**
  * This class contains custom formatting description.
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/generator/ThingGenerator.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/generator/ThingGenerator.xtend
index c4896d3c3a6..99cfde70eaa 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/generator/ThingGenerator.xtend
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/generator/ThingGenerator.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.thing.generator
+package org.openhab.core.model.thing.generator
 
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.xtext.generator.AbstractGenerator
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java
index 9720e9de11d..aec075e6436 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericItemChannelLinkProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.internal;
+package org.openhab.core.model.thing.internal;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -20,13 +20,13 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.AbstractProvider;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkProvider;
-import org.eclipse.smarthome.model.item.BindingConfigParseException;
-import org.eclipse.smarthome.model.item.BindingConfigReader;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.AbstractProvider;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkProvider;
+import org.openhab.core.model.item.BindingConfigParseException;
+import org.openhab.core.model.item.BindingConfigReader;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericThingProvider.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericThingProvider.xtend
index 616ce7faa3c..38c23d447ea 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericThingProvider.xtend
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/internal/GenericThingProvider.xtend
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.internal
+package org.openhab.core.model.thing.internal
 
 import java.util.ArrayList
 import java.util.Collection
@@ -21,39 +21,39 @@ import java.util.Set
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.CopyOnWriteArraySet
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry
-import org.eclipse.smarthome.config.core.ConfigUtil
-import org.eclipse.smarthome.config.core.Configuration
-import org.eclipse.smarthome.core.common.registry.AbstractProvider
-import org.eclipse.smarthome.core.i18n.LocaleProvider
-import org.eclipse.smarthome.core.service.ReadyMarker
-import org.eclipse.smarthome.core.service.ReadyMarkerFilter
-import org.eclipse.smarthome.core.service.ReadyService
-import org.eclipse.smarthome.core.thing.Channel
-import org.eclipse.smarthome.core.thing.ChannelUID
-import org.eclipse.smarthome.core.thing.Thing
-import org.eclipse.smarthome.core.thing.ThingProvider
-import org.eclipse.smarthome.core.thing.ThingTypeUID
-import org.eclipse.smarthome.core.thing.ThingUID
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory
-import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder
-import org.eclipse.smarthome.core.thing.type.AutoUpdatePolicy
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition
-import org.eclipse.smarthome.core.thing.type.ChannelKind
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry
-import org.eclipse.smarthome.core.thing.util.ThingHelper
-import org.eclipse.smarthome.core.util.BundleResolver
-import org.eclipse.smarthome.model.core.ModelRepository
-import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener
-import org.eclipse.smarthome.model.thing.thing.ModelBridge
-import org.eclipse.smarthome.model.thing.thing.ModelChannel
-import org.eclipse.smarthome.model.thing.thing.ModelPropertyContainer
-import org.eclipse.smarthome.model.thing.thing.ModelThing
-import org.eclipse.smarthome.model.thing.thing.ThingModel
+import org.openhab.core.config.core.ConfigDescriptionRegistry
+import org.openhab.core.config.core.ConfigUtil
+import org.openhab.core.config.core.Configuration
+import org.openhab.core.common.registry.AbstractProvider
+import org.openhab.core.i18n.LocaleProvider
+import org.openhab.core.service.ReadyMarker
+import org.openhab.core.service.ReadyMarkerFilter
+import org.openhab.core.service.ReadyService
+import org.openhab.core.thing.Channel
+import org.openhab.core.thing.ChannelUID
+import org.openhab.core.thing.Thing
+import org.openhab.core.thing.ThingProvider
+import org.openhab.core.thing.ThingTypeUID
+import org.openhab.core.thing.ThingUID
+import org.openhab.core.thing.binding.ThingHandlerFactory
+import org.openhab.core.thing.binding.builder.BridgeBuilder
+import org.openhab.core.thing.binding.builder.ChannelBuilder
+import org.openhab.core.thing.binding.builder.ThingBuilder
+import org.openhab.core.thing.type.AutoUpdatePolicy
+import org.openhab.core.thing.type.ChannelDefinition
+import org.openhab.core.thing.type.ChannelKind
+import org.openhab.core.thing.type.ChannelTypeRegistry
+import org.openhab.core.thing.type.ChannelTypeUID
+import org.openhab.core.thing.type.ThingTypeRegistry
+import org.openhab.core.thing.util.ThingHelper
+import org.openhab.core.util.BundleResolver
+import org.openhab.core.model.core.ModelRepository
+import org.openhab.core.model.core.ModelRepositoryChangeListener
+import org.openhab.core.model.thing.thing.ModelBridge
+import org.openhab.core.model.thing.thing.ModelChannel
+import org.openhab.core.model.thing.thing.ModelPropertyContainer
+import org.openhab.core.model.thing.thing.ModelThing
+import org.openhab.core.model.thing.thing.ThingModel
 import org.eclipse.xtend.lib.annotations.Data
 import org.osgi.service.component.annotations.Component
 import org.osgi.service.component.annotations.Reference
@@ -437,13 +437,13 @@ class GenericThingProvider extends AbstractProvider<Thing> implements ThingProvi
         this.bundleResolver = null;
     }
 
-    override void modelChanged(String modelName, org.eclipse.smarthome.model.core.EventType type) {
+    override void modelChanged(String modelName, org.openhab.core.model.core.EventType type) {
         if (modelName.endsWith("things")) {
             switch type {
-                case org.eclipse.smarthome.model.core.EventType.ADDED: {
+                case org.openhab.core.model.core.EventType.ADDED: {
                     createThingsFromModel(modelName)
                 }
-                case org.eclipse.smarthome.model.core.EventType.MODIFIED: {
+                case org.openhab.core.model.core.EventType.MODIFIED: {
                     val oldThings = thingsMap.get(modelName) ?: newArrayList
                     val model = modelRepository.getModel(modelName) as ThingModel
                     if (model !== null) {
@@ -457,7 +457,7 @@ class GenericThingProvider extends AbstractProvider<Thing> implements ThingProvi
                         thingsMap.get(modelName).removeAll(removedThings)
                     }
                 }
-                case org.eclipse.smarthome.model.core.EventType.REMOVED: {
+                case org.openhab.core.model.core.EventType.REMOVED: {
                     logger.debug("Removing all things from model '{}'.", modelName)
                     val things = thingsMap.remove(modelName) ?: newArrayList
                     things.forEach [
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/scoping/ThingScopeProvider.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/scoping/ThingScopeProvider.xtend
index a6c983210fa..3a3d07c0d3e 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/scoping/ThingScopeProvider.xtend
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/scoping/ThingScopeProvider.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.thing.scoping
+package org.openhab.core.model.thing.scoping
 
 /**
  * This class contains custom scoping description.
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSemanticSequencer.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSemanticSequencer.xtend
index 096e55d4c2a..fa36c67058d 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSemanticSequencer.xtend
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSemanticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.thing.serializer
+package org.openhab.core.model.thing.serializer
 
 
 class ThingSemanticSequencer extends AbstractThingSemanticSequencer {
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencer.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencer.xtend
index cddea3a3d67..8998c7b3342 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencer.xtend
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencer.xtend
@@ -13,7 +13,7 @@
 /*
  * generated by Xtext 2.12.0
  */
-package org.eclipse.smarthome.model.thing.serializer
+package org.openhab.core.model.thing.serializer
 
 
 class ThingSyntacticSequencer extends AbstractThingSyntacticSequencer {
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencerExtension.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencerExtension.java
index a4053a02bcc..c58eebf5ff5 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencerExtension.java
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/serializer/ThingSyntacticSequencerExtension.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.serializer;
+package org.openhab.core.model.thing.serializer;
 
 import java.util.List;
 
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/validation/ThingValidator.xtend b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/validation/ThingValidator.xtend
index b25e4cbf278..d239a6256d5 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/validation/ThingValidator.xtend
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/validation/ThingValidator.xtend
@@ -13,13 +13,13 @@
 /*
  * generated by Xtext
  */
-package org.eclipse.smarthome.model.thing.validation
+package org.openhab.core.model.thing.validation
 
-import org.eclipse.smarthome.model.thing.thing.ModelThing
+import org.openhab.core.model.thing.thing.ModelThing
 import org.eclipse.xtext.validation.Check
-import org.eclipse.smarthome.model.thing.thing.ThingPackage
+import org.openhab.core.model.thing.thing.ThingPackage
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils
-import org.eclipse.smarthome.core.thing.ThingUID
+import org.openhab.core.thing.ThingUID
 
 /**
  * Custom validation rules. 
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/ThingValueConverters.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/ThingValueConverters.java
index 5750e52eefd..66fd21e58e1 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/ThingValueConverters.java
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/ThingValueConverters.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.valueconverter;
+package org.openhab.core.model.thing.valueconverter;
 
-import org.eclipse.smarthome.model.core.valueconverter.ValueTypeToStringConverter;
+import org.openhab.core.model.core.valueconverter.ValueTypeToStringConverter;
 import org.eclipse.xtext.common.services.DefaultTerminalConverters;
 import org.eclipse.xtext.conversion.IValueConverter;
 import org.eclipse.xtext.conversion.ValueConverter;
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java
index e8c10ec92d7..d6dc40184a4 100644
--- a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java
+++ b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.valueconverter;
+package org.openhab.core.model.thing.valueconverter;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.core.thing.UID;
+import org.openhab.core.thing.UID;
 import org.eclipse.xtext.conversion.IValueConverter;
 import org.eclipse.xtext.conversion.ValueConverterException;
 import org.eclipse.xtext.nodemodel.INode;
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java
index f234f2b3f2b..186853d67ed 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/FilterCriteria.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.State;
 
 /**
  * This class is used to define a filter for queries to a {@link PersistenceService}.
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/HistoricItem.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/HistoricItem.java
index 3a1f088556f..d200959dafc 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/HistoricItem.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/HistoricItem.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 import java.util.Date;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.items.Item;
+import org.openhab.core.types.State;
 
 /**
  * This interface is used by persistence services to represent an item
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/ModifiablePersistenceService.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/ModifiablePersistenceService.java
index 917517047cb..31e7937e35e 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/ModifiablePersistenceService.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/ModifiablePersistenceService.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 import java.util.Date;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.items.Item;
+import org.openhab.core.types.State;
 
 /**
  * This class provides an interface to the a {@link PersistenceService} to allow data to be stored
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemInfo.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemInfo.java
index f48f9cd8993..1ad91d8b81f 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemInfo.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceItemInfo.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 import java.util.Date;
 
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceManager.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceManager.java
index 49cb0462e6e..6fd78646832 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceManager.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceService.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceService.java
index 6569e5729cd..c0498c3ed99 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceService.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceService.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.Item;
+import org.openhab.core.items.Item;
 
 /**
  * A persistence service which can be used to store data from openHAB.
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceConfiguration.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceConfiguration.java
index 0d86d721163..429eef9c6e7 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceConfiguration.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceConfiguration.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.smarthome.core.persistence.strategy.SimpleStrategy;
+import org.openhab.core.persistence.strategy.SimpleStrategy;
 
 /**
  * This class represents the configuration for a persistence service.
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceRegistry.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceRegistry.java
index 693276aaef8..32c457ffe6e 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceRegistry.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/PersistenceServiceRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 import java.util.Set;
 
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java
index 312808a5fed..9d2de8c053b 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/QueryablePersistenceService.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.Item;
+import org.openhab.core.items.Item;
 
 /**
  * A queryable persistence service which can be used to store and retrieve
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleFilter.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleFilter.java
index a284ed01119..6e7e3d4492e 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleFilter.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleFilter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 /**
  *
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleItemConfiguration.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleItemConfiguration.java
index 45d87b9781a..0d8804842da 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleItemConfiguration.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/SimpleItemConfiguration.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence;
+package org.openhab.core.persistence;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.smarthome.core.persistence.config.SimpleConfig;
-import org.eclipse.smarthome.core.persistence.strategy.SimpleStrategy;
+import org.openhab.core.persistence.config.SimpleConfig;
+import org.openhab.core.persistence.strategy.SimpleStrategy;
 
 /**
  * This class holds the configuration of a persistence strategy for specific items.
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleAllConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleAllConfig.java
index 9c044f90403..71d5bc535b7 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleAllConfig.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleAllConfig.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.config;
+package org.openhab.core.persistence.config;
 
 /**
  * This class represents the configuration that stand for "using all items".
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleConfig.java
index 3a64973bca6..e58c305275d 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleConfig.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleConfig.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.config;
+package org.openhab.core.persistence.config;
 
 /**
  * This class is a base class that needs to be used by every item configuration.
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleGroupConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleGroupConfig.java
index 8c55e194024..302feaed068 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleGroupConfig.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleGroupConfig.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.config;
+package org.openhab.core.persistence.config;
 
 /**
  * This class represents the configuration that is used for group items.
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleItemConfig.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleItemConfig.java
index 06ab13c4ecc..18c645c1cc5 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleItemConfig.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/config/SimpleItemConfig.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.config;
+package org.openhab.core.persistence.config;
 
 /**
  * This class represents the configuration that identify item(s) by name.
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/ItemHistoryDTO.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/ItemHistoryDTO.java
index ce55764cbe9..1f8757db163 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/ItemHistoryDTO.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/ItemHistoryDTO.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.dto;
+package org.openhab.core.persistence.dto;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.State;
 
 /**
  * This is a java bean that is used to serialize items to JSON.
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/PersistenceServiceDTO.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/PersistenceServiceDTO.java
index a8329bf9201..dc63a02dfc7 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/PersistenceServiceDTO.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/dto/PersistenceServiceDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.dto;
+package org.openhab.core.persistence.dto;
 
 /**
  * This is a java bean that is used to serialize services to JSON.
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java
index 1be167251fe..fc02da7a5fd 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.internal;
+package org.openhab.core.persistence.internal;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.persistence.PersistenceService;
-import org.eclipse.smarthome.core.persistence.PersistenceServiceConfiguration;
-import org.eclipse.smarthome.core.persistence.SimpleItemConfiguration;
-import org.eclipse.smarthome.core.persistence.strategy.SimpleStrategy;
-import org.eclipse.smarthome.core.scheduler.SchedulerRunnable;
+import org.openhab.core.items.Item;
+import org.openhab.core.persistence.PersistenceService;
+import org.openhab.core.persistence.PersistenceServiceConfiguration;
+import org.openhab.core.persistence.SimpleItemConfiguration;
+import org.openhab.core.persistence.strategy.SimpleStrategy;
+import org.openhab.core.scheduler.SchedulerRunnable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java
index b2b628a7105..67daf68c6cf 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.internal;
+package org.openhab.core.persistence.internal;
 
 import java.text.DateFormat;
 import java.util.Collection;
@@ -24,31 +24,31 @@
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.ItemRegistryChangeListener;
-import org.eclipse.smarthome.core.items.StateChangeListener;
-import org.eclipse.smarthome.core.persistence.FilterCriteria;
-import org.eclipse.smarthome.core.persistence.HistoricItem;
-import org.eclipse.smarthome.core.persistence.PersistenceManager;
-import org.eclipse.smarthome.core.persistence.PersistenceService;
-import org.eclipse.smarthome.core.persistence.PersistenceServiceConfiguration;
-import org.eclipse.smarthome.core.persistence.QueryablePersistenceService;
-import org.eclipse.smarthome.core.persistence.SimpleItemConfiguration;
-import org.eclipse.smarthome.core.persistence.config.SimpleAllConfig;
-import org.eclipse.smarthome.core.persistence.config.SimpleConfig;
-import org.eclipse.smarthome.core.persistence.config.SimpleGroupConfig;
-import org.eclipse.smarthome.core.persistence.config.SimpleItemConfig;
-import org.eclipse.smarthome.core.persistence.strategy.SimpleCronStrategy;
-import org.eclipse.smarthome.core.persistence.strategy.SimpleStrategy;
-import org.eclipse.smarthome.core.scheduler.CronScheduler;
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.ItemRegistryChangeListener;
+import org.openhab.core.items.StateChangeListener;
+import org.openhab.core.persistence.FilterCriteria;
+import org.openhab.core.persistence.HistoricItem;
+import org.openhab.core.persistence.PersistenceManager;
+import org.openhab.core.persistence.PersistenceService;
+import org.openhab.core.persistence.PersistenceServiceConfiguration;
+import org.openhab.core.persistence.QueryablePersistenceService;
+import org.openhab.core.persistence.SimpleItemConfiguration;
+import org.openhab.core.persistence.config.SimpleAllConfig;
+import org.openhab.core.persistence.config.SimpleConfig;
+import org.openhab.core.persistence.config.SimpleGroupConfig;
+import org.openhab.core.persistence.config.SimpleItemConfig;
+import org.openhab.core.persistence.strategy.SimpleCronStrategy;
+import org.openhab.core.persistence.strategy.SimpleStrategy;
+import org.openhab.core.scheduler.CronScheduler;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java
index fbd9b14f2d7..cfb85e6a63c 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceServiceRegistryImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.internal;
+package org.openhab.core.persistence.internal;
 
 import java.net.URI;
 import java.util.Collection;
@@ -22,11 +22,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigOptionProvider;
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.persistence.PersistenceService;
-import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry;
+import org.openhab.core.config.core.ConfigOptionProvider;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.persistence.PersistenceService;
+import org.openhab.core.persistence.PersistenceServiceRegistry;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -41,8 +41,8 @@
  *
  * @author Kai Kreuzer - Initial contribution
  */
-@Component(immediate = true, configurationPid = "org.eclipse.smarthome.persistence", property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.persistence",
+@Component(immediate = true, configurationPid = "org.openhab.core.persistence", property = {
+        Constants.SERVICE_PID + "=org.openhab.core.persistence",
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system",
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=Persistence",
         ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + PersistenceServiceRegistryImpl.CONFIG_URI })
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleCronStrategy.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleCronStrategy.java
index 32d9cf3593e..e4bc0e4320f 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleCronStrategy.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleCronStrategy.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.strategy;
+package org.openhab.core.persistence.strategy;
 
 /**
  * This class holds a cron expression based strategy to persist items.
diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleStrategy.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleStrategy.java
index 36b4a2b04f8..0e92dd16198 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleStrategy.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/strategy/SimpleStrategy.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.persistence.strategy;
+package org.openhab.core.persistence.strategy;
 
 import java.util.Objects;
 
diff --git a/bundles/org.openhab.core.scheduler/bnd.bnd b/bundles/org.openhab.core.scheduler/bnd.bnd
index 3e8326a0914..f31abaa89ba 100644
--- a/bundles/org.openhab.core.scheduler/bnd.bnd
+++ b/bundles/org.openhab.core.scheduler/bnd.bnd
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: ${project.artifactId}
-Bundle-Activator: org.eclipse.smarthome.core.scheduler.internal.SchedulerActivator
+Bundle-Activator: org.openhab.core.scheduler.internal.SchedulerActivator
 Import-Package: \
   com.mchange.v2.c3p0;resolution:=optional,\
   commonj.work;resolution:=optional,\
diff --git a/bundles/org.openhab.core.scheduler/src/main/java/org/openhab/core/scheduler/internal/SchedulerActivator.java b/bundles/org.openhab.core.scheduler/src/main/java/org/openhab/core/scheduler/internal/SchedulerActivator.java
index ead4ce0b5e4..4e11ff4355c 100644
--- a/bundles/org.openhab.core.scheduler/src/main/java/org/openhab/core/scheduler/internal/SchedulerActivator.java
+++ b/bundles/org.openhab.core.scheduler/src/main/java/org/openhab/core/scheduler/internal/SchedulerActivator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.scheduler.internal;
+package org.openhab.core.scheduler.internal;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy b/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy
index 245684cf0cb..bd2c7dbf649 100755
--- a/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy
+++ b/bundles/org.openhab.core.semantics/model/generateTagClasses.groovy
@@ -61,14 +61,14 @@ def createTagSetClass(def line, String tagSet) {
     def parent = line.Parent
     def parentClass = parent ? parent : type
     def pkg = type.toLowerCase()
-    def file = new FileWriter("../src/main/java/org/eclipse/smarthome/core/semantics/model/" + pkg + "/" + tag + ".java")
+    def file = new FileWriter("../src/main/java/org/openhab/core/semantics/model/" + pkg + "/" + tag + ".java")
     file.write(header())
-    file.write("package org.eclipse.smarthome.core.semantics.model." + pkg + ";\n\n")
+    file.write("package org.openhab.core.semantics.model." + pkg + ";\n\n")
     file.write("import org.eclipse.jdt.annotation.NonNullByDefault;\n")
     if(!parent) {
-            file.write("import org.eclipse.smarthome.core.semantics.model." + type + ";\n")
+            file.write("import org.openhab.core.semantics.model." + type + ";\n")
     }
-    file.write("""import org.eclipse.smarthome.core.semantics.model.TagInfo;
+    file.write("""import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a ${label}.
@@ -92,16 +92,16 @@ def appendLabelsFile(FileWriter file, def line, String tagSet) {
 }
 
 def createLocationsFile(Set<String> locations) {
-    def file = new FileWriter("../src/main/java/org/eclipse/smarthome/core/semantics/model/location/Locations.java")
+    def file = new FileWriter("../src/main/java/org/openhab/core/semantics/model/location/Locations.java")
     file.write(header())
-    file.write("""package org.eclipse.smarthome.core.semantics.model.location;
+    file.write("""package org.openhab.core.semantics.model.location;
 
 import java.util.Set;
 import java.util.HashSet;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Location;
+import org.openhab.core.semantics.model.Location;
 
 /**
  * This class provides a stream of all defined locations.
@@ -132,16 +132,16 @@ public class Locations {
 }
 
 def createEquipmentsFile(Set<String> equipments) {
-    def file = new FileWriter("../src/main/java/org/eclipse/smarthome/core/semantics/model/equipment/Equipments.java")
+    def file = new FileWriter("../src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java")
     file.write(header())
-    file.write("""package org.eclipse.smarthome.core.semantics.model.equipment;
+    file.write("""package org.openhab.core.semantics.model.equipment;
 
 import java.util.Set;
 import java.util.HashSet;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.Equipment;
 
 /**
  * This class provides a stream of all defined equipments.
@@ -172,16 +172,16 @@ public class Equipments {
 }
 
 def createPointsFile(Set<String> points) {
-    def file = new FileWriter("../src/main/java/org/eclipse/smarthome/core/semantics/model/point/Points.java")
+    def file = new FileWriter("../src/main/java/org/openhab/core/semantics/model/point/Points.java")
     file.write(header())
-    file.write("""package org.eclipse.smarthome.core.semantics.model.point;
+    file.write("""package org.openhab.core.semantics.model.point;
 
 import java.util.Set;
 import java.util.HashSet;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Point;
+import org.openhab.core.semantics.model.Point;
 
 /**
  * This class provides a stream of all defined points.
@@ -212,16 +212,16 @@ public class Points {
 }
 
 def createPropertiesFile(Set<String> properties) {
-    def file = new FileWriter("../src/main/java/org/eclipse/smarthome/core/semantics/model/property/Properties.java")
+    def file = new FileWriter("../src/main/java/org/openhab/core/semantics/model/property/Properties.java")
     file.write(header())
-    file.write("""package org.eclipse.smarthome.core.semantics.model.property;
+    file.write("""package org.openhab.core.semantics.model.property;
 
 import java.util.Set;
 import java.util.HashSet;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
+import org.openhab.core.semantics.model.Property;
 
 /**
  * This class provides a stream of all defined properties.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java
index 460a3bc7e7c..ea0092c2ca3 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticTags.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics;
+package org.openhab.core.semantics;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -27,16 +27,16 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.Tag;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
-import org.eclipse.smarthome.core.semantics.model.equipment.Equipments;
-import org.eclipse.smarthome.core.semantics.model.location.Locations;
-import org.eclipse.smarthome.core.semantics.model.point.Measurement;
-import org.eclipse.smarthome.core.semantics.model.point.Points;
-import org.eclipse.smarthome.core.semantics.model.property.Properties;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.items.Item;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.Tag;
+import org.openhab.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.equipment.Equipments;
+import org.openhab.core.semantics.model.location.Locations;
+import org.openhab.core.semantics.model.point.Measurement;
+import org.openhab.core.semantics.model.point.Points;
+import org.openhab.core.semantics.model.property.Properties;
+import org.openhab.core.types.StateDescription;
 
 /**
  * This is a class that gives static access to the semantic tag library.
@@ -128,7 +128,7 @@ public static String getLabel(Class<? extends Tag> tag, Locale locale) {
             if (stateDescription != null && stateDescription.isReadOnly()) {
                 return Measurement.class;
             } else {
-                return org.eclipse.smarthome.core.semantics.model.point.Control.class;
+                return org.openhab.core.semantics.model.point.Control.class;
             }
         } else {
             return null;
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java
index 34892b7d6cc..faed3457f64 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsPredicates.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics;
+package org.openhab.core.semantics;
 
 import java.util.function.Predicate;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.Location;
-import org.eclipse.smarthome.core.semantics.model.Point;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.Tag;
+import org.openhab.core.items.Item;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.Location;
+import org.openhab.core.semantics.model.Point;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.Tag;
 
 /**
  * This class provides predicates that allow filtering item streams with regards to their semantics.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java
index ebdd3effaeb..10d1d382664 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/SemanticsService.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics;
+package org.openhab.core.semantics;
 
 import java.util.Locale;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.semantics.model.Location;
+import org.openhab.core.items.Item;
+import org.openhab.core.semantics.model.Location;
 
 /**
  * This interface defines a service, which offers functionality regarding semantic tags.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java
index cf9daeebd83..e51537bee38 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsMetadataProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.internal;
+package org.openhab.core.semantics.internal;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -22,21 +22,21 @@
 import java.util.TreeMap;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.AbstractProvider;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.ItemRegistryChangeListener;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataProvider;
-import org.eclipse.smarthome.core.semantics.SemanticTags;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.Location;
-import org.eclipse.smarthome.core.semantics.model.Point;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.Tag;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.common.registry.AbstractProvider;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.ItemRegistryChangeListener;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataProvider;
+import org.openhab.core.semantics.SemanticTags;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.Location;
+import org.openhab.core.semantics.model.Point;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.Tag;
+import org.openhab.core.semantics.model.TagInfo;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java
index 8c2047d8667..efef7f042e0 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/internal/SemanticsServiceImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.internal;
+package org.openhab.core.semantics.internal;
 
 import java.util.HashSet;
 import java.util.List;
@@ -20,20 +20,20 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemPredicates;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
-import org.eclipse.smarthome.core.semantics.SemanticTags;
-import org.eclipse.smarthome.core.semantics.SemanticsPredicates;
-import org.eclipse.smarthome.core.semantics.SemanticsService;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.Location;
-import org.eclipse.smarthome.core.semantics.model.Point;
-import org.eclipse.smarthome.core.semantics.model.Tag;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemPredicates;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataRegistry;
+import org.openhab.core.semantics.SemanticTags;
+import org.openhab.core.semantics.SemanticsPredicates;
+import org.openhab.core.semantics.SemanticsService;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.Location;
+import org.openhab.core.semantics.model.Point;
+import org.openhab.core.semantics.model.Tag;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java
index 4a5c0559954..e5e100a1a77 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Equipment.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model;
+package org.openhab.core.semantics.model;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java
index 406889b2182..cfa5eac2b4c 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Location.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model;
+package org.openhab.core.semantics.model;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java
index 00688a60f7a..43f8951db4a 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Point.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model;
+package org.openhab.core.semantics.model;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java
index f41d439ddba..5c9a4e5886b 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Property.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model;
+package org.openhab.core.semantics.model;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java
index c29418fa15d..c695e3d1839 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/Tag.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model;
+package org.openhab.core.semantics.model;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java
index 0bdb87ab0ef..8431bd7b67d 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/TagInfo.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model;
+package org.openhab.core.semantics.model;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java
index e6637a53f49..0a08dfb2962 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Battery.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Battery.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java
index 0294a5bfd23..9e3ea295891 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Blinds.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Blinds.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java
index b24ac68b3b6..c38b374c8cc 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Camera.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Camera.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java
index 053989f13bd..794fdd15fbe 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Car.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Car.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java
index 71746f13b3c..a3189b2e6c2 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/CleaningRobot.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Cleaning Robot.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java
index dff017eef3c..7f1c240569b 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Door.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Door.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java
index c65c90a040c..9bef9f023dd 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Equipments.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import java.util.Set;
 import java.util.HashSet;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.Equipment;
 
 /**
  * This class provides a stream of all defined equipments.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java
index ee229644bf1..bf34c1b6f2e 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/FrontDoor.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Front Door.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java
index 2229c1bd882..21221cf7f55 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/GarageDoor.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Garage Door.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java
index f77808cbfe2..554cba3f50b 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/HVAC.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a HVAC.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java
index a4a48c7ac8a..1702ef84c80 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Inverter.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Inverter.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java
index 6fa99a7074f..5ce766d8f3a 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/LawnMower.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Lawn Mower.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java
index 59a7c303239..0a926314fe9 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lightbulb.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Lightbulb.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java
index 7bced835690..6f64d4f50c9 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Lock.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Lock.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java
index a60ba583c61..5f70074b9a8 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/MotionDetector.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Motion Detector.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java
index 2124368fe77..a3843e26b97 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/NetworkAppliance.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Network Appliance.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java
index a083b627b78..ba80ee15885 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/PowerOutlet.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Power Outlet.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java
index d7682f85dbd..d1ddfe0a5cf 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Projector.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Projector.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java
index cfca48572c6..9a88dbbf513 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RadiatorControl.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Radiator Control.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java
index fbf46a3c993..22b1de7034f 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Receiver.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Receiver.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java
index fded4427d3d..1a614b32a7e 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/RemoteControl.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Remote Control.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java
index 7362b734cba..19c17558679 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Screen.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Screen.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java
index 5b6d2ade686..a85699636e2 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Siren.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Siren.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java
index 71d818d0dc9..6e985f265f0 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/SmokeDetector.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Smoke Detector.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java
index c862778a001..45e954448fe 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Speaker.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Speaker.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java
index c2b73159915..71f4ec0c2ce 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Valve.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Valve.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java
index 8fef8b0347d..d7a0377fe81 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WallSwitch.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Wall Switch.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java
index f3ad0b466e3..da3faec95b3 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WebService.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Web Service.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java
index 4a599463d9f..5e83d94987f 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/WhiteGood.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a White Good.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java
index 62354b8c293..f17a3e60948 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/equipment/Window.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.equipment;
+package org.openhab.core.semantics.model.equipment;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Equipment;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Equipment;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Window.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java
index d9bd2c4631a..3fc9284facf 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Attic.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Attic.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java
index 066e95ab058..aa29fbd2dd4 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Basement.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Basement.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java
index 0c2287d7479..c8501d4620a 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bathroom.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Bathroom.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java
index 3c967144da2..1e833c1af72 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Bedroom.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Bedroom.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java
index 877cfe5d630..0eaaeac65b7 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Building.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Building.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java
index 874100eaa9a..9eb4f6c5197 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Carport.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Carport.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java
index 80dec3ed23e..138f10fd5b1 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Corridor.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Corridor.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java
index 09520446a44..3eb557779f5 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/FirstFloor.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a First Floor.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java
index 0d3a98d694c..878744272cb 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Floor.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Floor.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java
index dfbb1ff9e39..c2a881dae88 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garage.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Garage.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java
index bf708aae663..90a874f744f 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Garden.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Garden.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java
index 16133de558c..41c0cfc7eca 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/GroundFloor.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Ground Floor.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java
index 739c6e24b30..f19a9ac4eb4 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Indoor.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Location;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Location;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Indoor.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java
index 5eda5417877..b68f4809491 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Kitchen.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Kitchen.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java
index 8bf7f6cbf65..ffa9eba40e8 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/LivingRoom.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Living Room.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java
index 15fbad2a5e5..176be98c917 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Locations.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import java.util.Set;
 import java.util.HashSet;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Location;
+import org.openhab.core.semantics.model.Location;
 
 /**
  * This class provides a stream of all defined locations.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java
index 8d5fd4805b1..54d6b8172cb 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Outdoor.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Location;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Location;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Outdoor.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java
index 6f9f7e40070..2738d9d47aa 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Room.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Room.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java
index 65326f9ee53..1e130602dd3 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/location/Terrace.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.location;
+package org.openhab.core.semantics.model.location;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Terrace.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java
index 63e2031cbde..ccfa57514d6 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Alarm.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Point;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Point;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Alarm.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java
index f347a825b25..4dcc775ca8f 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Control.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Point;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Point;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Control.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java
index bd4717ae414..ef49f59e556 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/LowBattery.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a LowBattery.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java
index a2ce34f93a1..4422399d954 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Measurement.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Point;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Point;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Measurement.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java
index dd99aef93fd..65c72a1ac0f 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenLevel.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a OpenLevel.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java
index 8640f48cebf..3ff1dacee39 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/OpenState.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a OpenState.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java
index 7292221c6d9..ddf0a3a65c3 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Points.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import java.util.Set;
 import java.util.HashSet;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Point;
+import org.openhab.core.semantics.model.Point;
 
 /**
  * This class provides a stream of all defined points.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java
index a0acd2901e9..fcc996256cd 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Setpoint.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Point;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Point;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Setpoint.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java
index b2998ac45aa..b0f0aa01074 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Status.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Point;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Point;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Status.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java
index 4955003a478..4794430f415 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Switch.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Switch.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java
index 0cac54105a5..e1a187a9210 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tampered.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Tampered.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java
index 11c12637f32..a6a41b254d1 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/point/Tilt.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.point;
+package org.openhab.core.semantics.model.point;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Tilt.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java
index fec055debb9..1c954872701 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a CO.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java
index fd17d21d698..506e29d44f3 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/CO2.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a CO2.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java
index fb07536d33f..d50b498757d 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/ColorTemperature.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Color Temperature.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java
index 7fc4e43c8a1..e5c16da7151 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Current.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Current.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java
index 7deb1f89a73..c72cbdc4e25 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Energy.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Energy.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java
index e6e193fa00f..b1ca738c9be 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Frequency.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Frequency.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java
index b8e2f141c6c..4a87ce0510e 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Gas.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Gas.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java
index ff498a327c4..dc7b7d1e104 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Humidity.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Humidity.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java
index 5e8784e12ae..a5ecba960e6 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Light.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Light.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java
index 67598e4ce6e..9d901c8c131 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Noise.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Noise.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java
index 02c441d0071..6a1f6417ea2 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Oil.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Oil.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java
index de2362b65e4..14edf0dc0bb 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Power.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Power.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java
index 50de593e4ad..fddf83d0f3f 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Presence.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Presence.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java
index a4689eb8658..42eddae2dfe 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Pressure.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Pressure.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java
index ea74316d996..7b5ec43265d 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Properties.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import java.util.Set;
 import java.util.HashSet;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
+import org.openhab.core.semantics.model.Property;
 
 /**
  * This class provides a stream of all defined properties.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java
index d1c1070d8a9..cd70302cc7b 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Rain.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Rain.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java
index ee835d3fc9e..eb1252e8016 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Smoke.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Smoke.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java
index 721b2511715..8dca8353720 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/SoundVolume.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Sound Volume.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java
index 9bbbd6dc42d..ac490c22abd 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Temperature.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Temperature.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java
index deb9c7fbdc0..160445e99b8 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Voltage.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Voltage.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java
index 69196046cf2..dafb67e9d46 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Water.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Water.
diff --git a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java
index e85083ae1eb..b11ada39c93 100644
--- a/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java
+++ b/bundles/org.openhab.core.semantics/src/main/java/org/openhab/core/semantics/model/property/Wind.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.model.property;
+package org.openhab.core.semantics.model.property;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.semantics.model.Property;
-import org.eclipse.smarthome.core.semantics.model.TagInfo;
+import org.openhab.core.semantics.model.Property;
+import org.openhab.core.semantics.model.TagInfo;
 
 /**
  * This class defines a Wind.
diff --git a/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java
index 76b9216b896..bdac8f86f42 100644
--- a/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java
+++ b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/SemanticTagsTest.java
@@ -10,22 +10,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics;
+package org.openhab.core.semantics;
 
 import static org.junit.Assert.*;
 
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.semantics.model.Location;
-import org.eclipse.smarthome.core.semantics.model.equipment.CleaningRobot;
-import org.eclipse.smarthome.core.semantics.model.location.Bathroom;
-import org.eclipse.smarthome.core.semantics.model.location.Kitchen;
-import org.eclipse.smarthome.core.semantics.model.location.Room;
-import org.eclipse.smarthome.core.semantics.model.point.Measurement;
-import org.eclipse.smarthome.core.semantics.model.property.Temperature;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.semantics.model.Location;
+import org.openhab.core.semantics.model.equipment.CleaningRobot;
+import org.openhab.core.semantics.model.location.Bathroom;
+import org.openhab.core.semantics.model.location.Kitchen;
+import org.openhab.core.semantics.model.location.Room;
+import org.openhab.core.semantics.model.point.Measurement;
+import org.openhab.core.semantics.model.property.Temperature;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsServiceImplTest.java b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsServiceImplTest.java
index 87b7fefad37..14eda0a5dcc 100644
--- a/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsServiceImplTest.java
+++ b/bundles/org.openhab.core.semantics/src/test/java/org/openhab/core/semantics/internal/SemanticsServiceImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.semantics.internal;
+package org.openhab.core.semantics.internal;
 
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -21,14 +21,14 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.semantics.model.location.Bathroom;
-import org.eclipse.smarthome.core.semantics.model.location.LivingRoom;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.MetadataRegistry;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.semantics.model.location.Bathroom;
+import org.openhab.core.semantics.model.location.LivingRoom;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java
index becd581a5e7..cf6bba7adc8 100644
--- a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java
+++ b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.json.internal;
+package org.openhab.core.storage.json.internal;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -27,9 +27,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.ConfigurationDeserializer;
-import org.eclipse.smarthome.core.storage.Storage;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.ConfigurationDeserializer;
+import org.openhab.core.storage.Storage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java
index b0e35b8cb03..11b994b6586 100644
--- a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java
+++ b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorageService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.json.internal;
+package org.openhab.core.storage.json.internal;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
@@ -21,10 +21,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -38,8 +38,8 @@
  *
  * @author Chris Jackson - Initial contribution
  */
-@Component(name = "org.eclipse.smarthome.storage.json", property = { //
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.storage.json", //
+@Component(name = "org.openhab.core.storage.json", property = { //
+        Constants.SERVICE_PID + "=org.openhab.core.storage.json", //
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=Json Storage", //
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", //
         ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=system:json_storage", //
diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntry.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntry.java
index 1db71184d6d..2cadf7f3457 100644
--- a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntry.java
+++ b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.json.internal;
+package org.openhab.core.storage.json.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntryMapDeserializer.java b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntryMapDeserializer.java
index a5fde5ef333..0a37fae7863 100644
--- a/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntryMapDeserializer.java
+++ b/bundles/org.openhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/StorageEntryMapDeserializer.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.json.internal;
+package org.openhab.core.storage.json.internal;
 
 import java.lang.reflect.Type;
 import java.util.Map;
diff --git a/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java b/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java
index a8ca1dbdaee..15e330a386a 100644
--- a/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java
+++ b/bundles/org.openhab.core.storage.json/src/test/java/org/openhab/core/storage/json/internal/JsonStorageTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.json.internal;
+package org.openhab.core.storage.json.internal;
 
 import static org.junit.Assert.*;
 
@@ -22,8 +22,8 @@
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorage.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorage.java
index 391ba9f6b2e..64824fce162 100644
--- a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorage.java
+++ b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorage.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.mapdb.internal;
+package org.openhab.core.storage.mapdb.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,10 +20,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.ManagedItemProvider.PersistedItem;
-import org.eclipse.smarthome.core.items.ManagedItemProvider.PersistedItemInstanceCreator;
-import org.eclipse.smarthome.core.storage.DeletableStorage;
-import org.eclipse.smarthome.core.storage.Storage;
+import org.openhab.core.items.ManagedItemProvider.PersistedItem;
+import org.openhab.core.items.ManagedItemProvider.PersistedItemInstanceCreator;
+import org.openhab.core.storage.DeletableStorage;
+import org.openhab.core.storage.Storage;
 import org.mapdb.DB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorageService.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorageService.java
index 16fcd0ae916..0f3c9cf7afe 100644
--- a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorageService.java
+++ b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/MapDbStorageService.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.mapdb.internal;
+package org.openhab.core.storage.mapdb.internal;
 
 import java.io.File;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.core.storage.DeletableStorage;
-import org.eclipse.smarthome.core.storage.DeletableStorageService;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.storage.DeletableStorage;
+import org.openhab.core.storage.DeletableStorageService;
+import org.openhab.core.storage.StorageService;
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
 import org.osgi.service.component.annotations.Activate;
@@ -36,7 +36,7 @@
  * @author Alex Tugarev - Added getStorage for name only
  * @author Markus Rathgeb - Use {@link DeletableStorageService}
  */
-@Component(name = "org.eclipse.smarthome.storage.mapdb", immediate = true, service = { StorageService.class,
+@Component(name = "org.openhab.core.storage.mapdb", immediate = true, service = { StorageService.class,
         DeletableStorageService.class }, property = "storage.format=mapdb")
 @NonNullByDefault
 public class MapDbStorageService implements DeletableStorageService {
diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapter.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapter.java
index 0888ba4a53a..2e38f1fa1bf 100644
--- a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapter.java
+++ b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.mapdb.internal;
+package org.openhab.core.storage.mapdb.internal;
 
 import java.io.IOException;
 import java.lang.reflect.Type;
diff --git a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapterFactory.java b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapterFactory.java
index 785a79576b2..45ee1b5446d 100644
--- a/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapterFactory.java
+++ b/bundles/org.openhab.core.storage.mapdb/src/main/java/org/openhab/core/storage/mapdb/internal/PropertiesTypeAdapterFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.mapdb.internal;
+package org.openhab.core.storage.mapdb.internal;
 
 import java.lang.reflect.Type;
 
diff --git a/bundles/org.openhab.core.storage.mapdb/src/test/java/org/openhab/core/storage/mapdb/internal/MapDbStorageServiceTest.java b/bundles/org.openhab.core.storage.mapdb/src/test/java/org/openhab/core/storage/mapdb/internal/MapDbStorageServiceTest.java
index 92f2531a698..77852c67040 100644
--- a/bundles/org.openhab.core.storage.mapdb/src/test/java/org/openhab/core/storage/mapdb/internal/MapDbStorageServiceTest.java
+++ b/bundles/org.openhab.core.storage.mapdb/src/test/java/org/openhab/core/storage/mapdb/internal/MapDbStorageServiceTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.mapdb.internal;
+package org.openhab.core.storage.mapdb.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,10 +25,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.storage.DeletableStorage;
-import org.eclipse.smarthome.core.storage.Storage;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.storage.DeletableStorage;
+import org.openhab.core.storage.Storage;
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Assert;
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicBindingConstants.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicBindingConstants.java
index 4af5775b263..07fc0266c6c 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicBindingConstants.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicBindingConstants.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding;
+package org.openhab.core.magic.binding;
 
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingTypeUID;
 
 /**
  * The {@link MagicBindingConstants} class defines common constants, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicService.java
index 552e381997f..ac0deeb84d0 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicService.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/MagicService.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding;
+package org.openhab.core.magic.binding;
 
 import java.net.URI;
 
-import org.eclipse.smarthome.config.core.ConfigOptionProvider;
+import org.openhab.core.config.core.ConfigOptionProvider;
 
 /**
  * A public interface for a service from this virtual bundle which is also a {@link ConfigOptionProvider}.
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java
index 29ea698444d..199b54b4354 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicActionModuleThingHandler.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerService;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.magic.binding.internal.automation.modules.MagicThingActionsService;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerService;
+import org.openhab.core.types.Command;
+import org.openhab.core.magic.binding.internal.automation.modules.MagicThingActionsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgeHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgeHandler.java
index e6d26182785..ba92d8db20a 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgeHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgeHandler.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseBridgeHandler;
+import org.openhab.core.types.Command;
 
 /**
  * The {@link MagicBridgeHandler} serves as a handler for magic bridges.
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgedThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgedThingHandler.java
index 70dbbfe7f9d..8db47ec7667 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgedThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicBridgedThingHandler.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * The {@link MagicBridgedThingHandler} is responsible for handling commands, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java
index f33d694ddb9..fa431300ad1 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicChattyThingHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
 import java.math.BigDecimal;
 import java.util.HashSet;
@@ -23,17 +23,17 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicColorLightHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicColorLightHandler.java
index 9b78b8ba2af..67397ba960e 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicColorLightHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicColorLightHandler.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * The {@link MagicColorLightHandler} is responsible for handling commands, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicConfigurableThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicConfigurableThingHandler.java
index ce7975a9336..ded2b0fe242 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicConfigurableThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicConfigurableThingHandler.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * Handler for thing with a configuration parameter
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicContactHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicContactHandler.java
index c32cb08fd27..94fc26dd9e1 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicContactHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicContactHandler.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * The {@link MagicContactHandler} is responsible for handling commands, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDelayedOnlineHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDelayedOnlineHandler.java
index 4e3397a45fb..2fc36e51414 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDelayedOnlineHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDelayedOnlineHandler.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * ThingHandler for a thing that goes online after 15 seconds
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandler.java
index 5483928e2e5..5e22efa2e47 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandler.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * The {@link MagicDimmableLightHandler} is responsible for handling commands, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java
index 336ce4b8093..689c9f5eaea 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicDynamicStateDescriptionThingHandler.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import static org.eclipse.smarthome.magic.binding.MagicBindingConstants.*;
+import static org.openhab.core.magic.binding.MagicBindingConstants.*;
 
 import java.util.Arrays;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.StateOption;
-import org.eclipse.smarthome.magic.binding.internal.MagicDynamicStateDescriptionProvider;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.StateOption;
+import org.openhab.core.magic.binding.internal.MagicDynamicStateDescriptionProvider;
 
 /**
  * ThingHandler which provides channels with dynamic state descriptions.
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicExtensibleThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicExtensibleThingHandler.java
index 79fa729640a..253f215fb70 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicExtensibleThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicExtensibleThingHandler.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * A handler for an extensible thing.
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicFirmwareUpdateThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicFirmwareUpdateThingHandler.java
index aca845284ef..0b8fecfcb54 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicFirmwareUpdateThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicFirmwareUpdateThingHandler.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressCallback;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressStep;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.magic.binding.MagicBindingConstants;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.thing.binding.firmware.ProgressCallback;
+import org.openhab.core.thing.binding.firmware.ProgressStep;
+import org.openhab.core.types.Command;
+import org.openhab.core.magic.binding.MagicBindingConstants;
 
 /**
  * Handler for firmware updatable magic things. Defines full progress sequence and simulates firmware update with small
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicImageHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicImageHandler.java
index f13ddf92d9d..94286dccfd7 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicImageHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicImageHandler.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import org.eclipse.smarthome.core.library.types.RawType;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.io.net.http.HttpUtil;
+import org.openhab.core.library.types.RawType;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.io.net.http.HttpUtil;
 
 /**
  * The {@link MagicImageHandler} is responsible for handling commands, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicLocationThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicLocationThingHandler.java
index 8adaee4c5cb..07a1e92e3be 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicLocationThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicLocationThingHandler.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * The {@link MagicLocationThingHandler} is responsible for handling commands, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandler.java
index 492777c49e6..882f9fa64bc 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandler.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * The {@link MagicOnOffLightHandler} is responsible for handling commands, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnlineOfflineHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnlineOfflineHandler.java
index c4ab4efc1ab..25e270f65b2 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnlineOfflineHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicOnlineOfflineHandler.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
 import java.math.BigDecimal;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * The {@link MagicOnlineOfflineHandler} is responsible for handling commands, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicPlayerHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicPlayerHandler.java
index c0c1965f6aa..93c0a5de3a6 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicPlayerHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicPlayerHandler.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * The {@link MagicPlayerHandler} is responsible for handling commands, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicRolllershutterHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicRolllershutterHandler.java
index 7f82eae7a9c..f1c64c1f771 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicRolllershutterHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicRolllershutterHandler.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * The {@link MagicRolllershutterHandler} is responsible for handling commands, which are
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicThermostatThingHandler.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicThermostatThingHandler.java
index 7cd209e0d0f..e50dd7a63d9 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicThermostatThingHandler.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/handler/MagicThermostatThingHandler.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
-import static org.eclipse.smarthome.magic.binding.MagicBindingConstants.*;
+import static org.openhab.core.magic.binding.MagicBindingConstants.*;
 
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
 
 /**
  * A handler for a thermostat thing.
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java
index 67599c96eeb..7a551b21973 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDiscoveryService.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal;
+package org.openhab.core.magic.binding.internal;
 
-import static org.eclipse.smarthome.magic.binding.MagicBindingConstants.THING_TYPE_CONFIG_THING;
+import static org.openhab.core.magic.binding.MagicBindingConstants.THING_TYPE_CONFIG_THING;
 
 import java.util.Collections;
 import java.util.UUID;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.discovery.AbstractDiscoveryService;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder;
-import org.eclipse.smarthome.config.discovery.DiscoveryService;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.AbstractDiscoveryService;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultBuilder;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDynamicStateDescriptionProvider.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDynamicStateDescriptionProvider.java
index 92df4ca40a0..56019a314eb 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDynamicStateDescriptionProvider.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicDynamicStateDescriptionProvider.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal;
+package org.openhab.core.magic.binding.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.binding.BaseDynamicStateDescriptionProvider;
-import org.eclipse.smarthome.core.thing.i18n.ChannelTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.type.DynamicStateDescriptionProvider;
+import org.openhab.core.thing.binding.BaseDynamicStateDescriptionProvider;
+import org.openhab.core.thing.i18n.ChannelTypeI18nLocalizationService;
+import org.openhab.core.thing.type.DynamicStateDescriptionProvider;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java
index d9b216294bb..e0a722ce277 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicHandlerFactory.java
@@ -10,40 +10,40 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal;
+package org.openhab.core.magic.binding.internal;
 
-import static org.eclipse.smarthome.magic.binding.MagicBindingConstants.*;
+import static org.openhab.core.magic.binding.MagicBindingConstants.*;
 
 import java.util.Collections;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.magic.binding.handler.MagicActionModuleThingHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicBridgeHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicBridgedThingHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicChattyThingHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicColorLightHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicConfigurableThingHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicContactHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicDelayedOnlineHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicDimmableLightHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicDynamicStateDescriptionThingHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicExtensibleThingHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicFirmwareUpdateThingHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicImageHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicLocationThingHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicOnOffLightHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicOnlineOfflineHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicPlayerHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicRolllershutterHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicThermostatThingHandler;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.magic.binding.handler.MagicActionModuleThingHandler;
+import org.openhab.core.magic.binding.handler.MagicBridgeHandler;
+import org.openhab.core.magic.binding.handler.MagicBridgedThingHandler;
+import org.openhab.core.magic.binding.handler.MagicChattyThingHandler;
+import org.openhab.core.magic.binding.handler.MagicColorLightHandler;
+import org.openhab.core.magic.binding.handler.MagicConfigurableThingHandler;
+import org.openhab.core.magic.binding.handler.MagicContactHandler;
+import org.openhab.core.magic.binding.handler.MagicDelayedOnlineHandler;
+import org.openhab.core.magic.binding.handler.MagicDimmableLightHandler;
+import org.openhab.core.magic.binding.handler.MagicDynamicStateDescriptionThingHandler;
+import org.openhab.core.magic.binding.handler.MagicExtensibleThingHandler;
+import org.openhab.core.magic.binding.handler.MagicFirmwareUpdateThingHandler;
+import org.openhab.core.magic.binding.handler.MagicImageHandler;
+import org.openhab.core.magic.binding.handler.MagicLocationThingHandler;
+import org.openhab.core.magic.binding.handler.MagicOnOffLightHandler;
+import org.openhab.core.magic.binding.handler.MagicOnlineOfflineHandler;
+import org.openhab.core.magic.binding.handler.MagicPlayerHandler;
+import org.openhab.core.magic.binding.handler.MagicRolllershutterHandler;
+import org.openhab.core.magic.binding.handler.MagicThermostatThingHandler;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceConfig.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceConfig.java
index 5ede02cafec..d5f49f60702 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceConfig.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceConfig.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal;
+package org.openhab.core.magic.binding.internal;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.eclipse.smarthome.magic.binding.MagicService;
+import org.openhab.core.magic.binding.MagicService;
 
 /**
  * Configuration holder object for {@link MagicService}
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java
index af90c14b50f..ca93af0b6eb 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/MagicServiceImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal;
+package org.openhab.core.magic.binding.internal;
 
 import java.math.BigDecimal;
 import java.net.URI;
@@ -19,10 +19,10 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.ConfigOptionProvider;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.magic.binding.MagicService;
+import org.openhab.core.config.core.ConfigOptionProvider;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.magic.binding.MagicService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Modified;
@@ -33,8 +33,8 @@
  *
  * @author Henning Treu - Initial contribution
  */
-@Component(configurationPid = "org.eclipse.smarthome.magic", service = ConfigOptionProvider.class, immediate = true, property = {
-        "service.pid=org.eclipse.smarthome.magic", "service.config.description.uri=test:magic",
+@Component(configurationPid = "org.openhab.core.magic", service = ConfigOptionProvider.class, immediate = true, property = {
+        "service.pid=org.openhab.core.magic", "service.config.description.uri=test:magic",
         "service.config.label=Magic", "service.config.category=test" })
 public class MagicServiceImpl implements MagicService {
     private final Logger logger = LoggerFactory.getLogger(MagicServiceImpl.class);
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java
index 140bfbe30ab..6d190988d10 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiActionMarker.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal.automation.modules;
+package org.openhab.core.magic.binding.internal.automation.modules;
 
-import org.eclipse.smarthome.config.core.ConfigurableService;
+import org.openhab.core.config.core.ConfigurableService;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Component;
 
@@ -22,7 +22,7 @@
  * @author Stefan Triller - Initial contribution
  */
 @Component(immediate = true, service = MagicMultiActionMarker.class, property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.MagicMultiAction",
+        Constants.SERVICE_PID + "=org.openhab.core.MagicMultiAction",
         ConfigurableService.SERVICE_PROPERTY_FACTORY_SERVICE + "=true",
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=MagicMultiActionsService",
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=RuleActions",
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java
index 27b81ec8779..defa7b3a70a 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicMultiServiceMultiActions.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal.automation.modules;
+package org.openhab.core.magic.binding.internal.automation.modules;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -35,7 +35,7 @@
  *
  * @author Stefan Triller - Initial contribution
  */
-@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, configurationPid = "org.eclipse.smarthome.MagicMultiAction")
+@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, configurationPid = "org.openhab.core.MagicMultiAction")
 @ActionScope(name = "binding.magic")
 public class MagicMultiServiceMultiActions implements AnnotatedActions {
 
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java
index 19a50d40a4b..7a221d772e3 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicSingleActionService.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal.automation.modules;
+package org.openhab.core.magic.binding.internal.automation.modules;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.ConfigurableService;
+import org.openhab.core.config.core.ConfigurableService;
 import org.openhab.core.automation.AnnotatedActions;
 import org.openhab.core.automation.annotation.ActionInput;
 import org.openhab.core.automation.annotation.ActionOutput;
@@ -33,8 +33,8 @@
  *
  * @author Stefan Triller - Initial contribution
  */
-@Component(configurationPid = "org.eclipse.smarthome.automation.action.magicSingleActionService", property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.automation.action.magicSingleActionService",
+@Component(configurationPid = "org.openhab.core.automation.action.magicSingleActionService", property = {
+        Constants.SERVICE_PID + "=org.openhab.core.automation.action.magicSingleActionService",
         ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=automationAction:magicSingleAction",
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=Magic Single Action Service",
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=RuleActions" })
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicThingActionsService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicThingActionsService.java
index 3315b52406d..9a9b1d49b81 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicThingActionsService.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/automation/modules/MagicThingActionsService.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal.automation.modules;
+package org.openhab.core.magic.binding.internal.automation.modules;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.thing.binding.ThingActions;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicActionModuleThingHandler;
+import org.openhab.core.thing.binding.ThingActions;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.magic.binding.handler.MagicActionModuleThingHandler;
 import org.openhab.core.automation.annotation.ActionInput;
 import org.openhab.core.automation.annotation.ActionOutput;
 import org.openhab.core.automation.annotation.ActionScope;
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/firmware/MagicFirmwareProvider.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/firmware/MagicFirmwareProvider.java
index c98948c9098..86b0a5290aa 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/firmware/MagicFirmwareProvider.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/firmware/MagicFirmwareProvider.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal.firmware;
+package org.openhab.core.magic.binding.internal.firmware;
 
 import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareBuilder;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareProvider;
-import org.eclipse.smarthome.magic.binding.MagicBindingConstants;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareBuilder;
+import org.openhab.core.thing.firmware.FirmwareProvider;
+import org.openhab.core.magic.binding.MagicBindingConstants;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/http/MagicHttpResource.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/http/MagicHttpResource.java
index d83b6549f2e..92c19394d3d 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/http/MagicHttpResource.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/binding/internal/http/MagicHttpResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal.http;
+package org.openhab.core.magic.binding.internal.http;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider.java
index 5965890e1ee..a32e932c39a 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.internal.metadata;
+package org.openhab.core.magic.internal.metadata;
 
 import static java.util.stream.Collectors.toList;
-import static org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder.create;
+import static org.openhab.core.config.core.ConfigDescriptionParameterBuilder.create;
 
 import java.util.List;
 import java.util.Locale;
@@ -21,10 +21,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.config.core.metadata.MetadataConfigDescriptionProvider;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.config.core.metadata.MetadataConfigDescriptionProvider;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider2.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider2.java
index e839d5a8dd0..4e8a6be26da 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider2.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataProvider2.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.internal.metadata;
+package org.openhab.core.magic.internal.metadata;
 
 import java.util.List;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.config.core.metadata.MetadataConfigDescriptionProvider;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.config.core.metadata.MetadataConfigDescriptionProvider;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataUsingService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataUsingService.java
index 65e5f047266..5300f1eac04 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataUsingService.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/internal/metadata/MagicMetadataUsingService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.internal.metadata;
+package org.openhab.core.magic.internal.metadata;
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -18,9 +18,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.items.MetadataPredicates;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.items.MetadataPredicates;
+import org.openhab.core.items.MetadataRegistry;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java
index 37a61187784..758b19e72a1 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.service;
+package org.openhab.core.magic.service;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -27,7 +27,7 @@
  *
  * @author Stefan Triller - Initial contribution
  */
-@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MagicMultiInstanceService.class, configurationPid = "org.eclipse.smarthome.magicMultiInstance")
+@Component(immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE, service = MagicMultiInstanceService.class, configurationPid = "org.openhab.core.magicMultiInstance")
 public class MagicMultiInstanceService {
 
     private final Logger logger = LoggerFactory.getLogger(MagicMultiInstanceService.class);
diff --git a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java
index cd167a29a21..99e9ea1401f 100644
--- a/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java
+++ b/bundles/org.openhab.core.test.magic/src/main/java/org/openhab/core/magic/service/MagicMultiInstanceServiceMarker.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.service;
+package org.openhab.core.magic.service;
 
-import org.eclipse.smarthome.config.core.ConfigurableService;
+import org.openhab.core.config.core.ConfigurableService;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Component;
 
@@ -22,12 +22,12 @@
  */
 
 @Component(immediate = true, service = MagicMultiInstanceServiceMarker.class, property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.magicMultiInstance",
+        Constants.SERVICE_PID + "=org.openhab.core.magicMultiInstance",
         ConfigurableService.SERVICE_PROPERTY_FACTORY_SERVICE + "=true",
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=MagicMultiInstanceService",
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=test",
         ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=test:multipleMagic" })
 public class MagicMultiInstanceServiceMarker {
     // this is a marker service and represents a service factory so multiple configuration instances of type
-    // "org.eclipse.smarthome.magicMultiInstance" can be created.
+    // "org.openhab.core.magicMultiInstance" can be created.
 }
diff --git a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/config.xml
index 69230cd6024..51a74a1cdd2 100644
--- a/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/config.xml
+++ b/bundles/org.openhab.core.test.magic/src/main/resources/ESH-INF/config/config.xml
@@ -128,7 +128,7 @@
 			<label>Select Decimal - options from backend</label>
 			<description>A decimal parameter with options provided by the backend.</description>
 			<limitToOptions>true</limitToOptions>
-			<!-- options are retrieved from org.eclipse.smarthome.binding.magic.internal.MagicServiceImpl. -->
+			<!-- options are retrieved from org.openhab.core.binding.magic.internal.MagicServiceImpl. -->
 		</parameter>
 	</config-description>
 
diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicColorLightHandlerTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicColorLightHandlerTest.java
index 8b8b0f7e9ad..5736c2664fe 100644
--- a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicColorLightHandlerTest.java
+++ b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicColorLightHandlerTest.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerCallback;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandlerTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandlerTest.java
index 82bc7b2a5b3..d4a8beefc52 100644
--- a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandlerTest.java
+++ b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicDimmableLightHandlerTest.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerCallback;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandlerTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandlerTest.java
index 85e45e47857..16278da14ad 100644
--- a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandlerTest.java
+++ b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/handler/MagicOnOffLightHandlerTest.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.handler;
+package org.openhab.core.magic.binding.handler;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerCallback;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java
index 5e480dd1da3..216e9bfb829 100644
--- a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java
+++ b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicHandlerFactoryTest.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal;
+package org.openhab.core.magic.binding.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.*;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.magic.binding.MagicBindingConstants;
-import org.eclipse.smarthome.magic.binding.handler.MagicColorLightHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicDimmableLightHandler;
-import org.eclipse.smarthome.magic.binding.handler.MagicOnOffLightHandler;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.magic.binding.MagicBindingConstants;
+import org.openhab.core.magic.binding.handler.MagicColorLightHandler;
+import org.openhab.core.magic.binding.handler.MagicDimmableLightHandler;
+import org.openhab.core.magic.binding.handler.MagicOnOffLightHandler;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicServiceImplTest.java b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicServiceImplTest.java
index f95567f9143..cf0db27a6ad 100644
--- a/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicServiceImplTest.java
+++ b/bundles/org.openhab.core.test.magic/src/test/java/org/openhab/core/magic/binding/internal/MagicServiceImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.magic.binding.internal;
+package org.openhab.core.magic.binding.internal;
 
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.junit.Assert.*;
@@ -18,8 +18,8 @@
 import java.net.URI;
 import java.util.Collection;
 
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.magic.binding.MagicService;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.magic.binding.MagicService;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.test.magic/web/index.html b/bundles/org.openhab.core.test.magic/web/index.html
index 59bb4ffa028..a21fa0d4dc5 100644
--- a/bundles/org.openhab.core.test.magic/web/index.html
+++ b/bundles/org.openhab.core.test.magic/web/index.html
@@ -24,13 +24,13 @@
 			<div id="navbar" class="navbar-collapse collapse">
 				<ul class="nav navbar-nav navbar-right">
 					<li>
-						<a href="https://www.eclipse.org/smarthome/getting-started.html">Getting Started</a>
+						<a href="https://openhab.org/getting-started.html">Getting Started</a>
 					</li>
 					<li>
-						<a href="https://www.eclipse.org/smarthome/documentation/index.html">Documentation</a>
+						<a href="https://openhab.org/documentation/index.html">Documentation</a>
 					</li>
 					<li>
-						<a href="https://www.eclipse.org/smarthome/blog">Blog</a>
+						<a href="https://openhab.org/blog">Blog</a>
 					</li>
 					<li>
 						<a href="https://github.com/eclipse/smarthome">GitHub</a>
diff --git a/bundles/org.openhab.core.test/bnd.bnd b/bundles/org.openhab.core.test/bnd.bnd
index 1c8f2e8e386..678fabd5dd8 100644
--- a/bundles/org.openhab.core.test/bnd.bnd
+++ b/bundles/org.openhab.core.test/bnd.bnd
@@ -1,4 +1,4 @@
 Bundle-SymbolicName: ${project.artifactId}
 
 # We can provide that capability if someone calls the (not so) magic function
-Provide-Capability: osgi.service;objectClass:List<String>="org.eclipse.smarthome.core.storage.StorageService"
+Provide-Capability: osgi.service;objectClass:List<String>="org.openhab.core.storage.StorageService"
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/AsyncResultWrapper.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/AsyncResultWrapper.java
index 05ee2588910..435cc308bb3 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/AsyncResultWrapper.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/AsyncResultWrapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test;
+package org.openhab.core.test;
 
 /**
  * @author Tanya Georgieva - Initial contribution
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/BundleCloseable.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/BundleCloseable.java
index a763c1acd14..ccfd40676cc 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/BundleCloseable.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/BundleCloseable.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test;
+package org.openhab.core.test;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/SyntheticBundleInstaller.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/SyntheticBundleInstaller.java
index c80c5f0b8f3..c8496564438 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/SyntheticBundleInstaller.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/SyntheticBundleInstaller.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test;
+package org.openhab.core.test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -34,9 +34,9 @@
 import java.util.zip.ZipEntry;
 
 import org.apache.commons.io.IOUtils;
-import org.eclipse.smarthome.core.service.ReadyMarker;
-import org.eclipse.smarthome.core.service.ReadyMarkerUtils;
-import org.eclipse.smarthome.core.service.ReadyService;
+import org.openhab.core.service.ReadyMarker;
+import org.openhab.core.service.ReadyMarkerUtils;
+import org.openhab.core.service.ReadyService;
 import org.junit.Assert;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -254,15 +254,15 @@ private static boolean isBundleAvailable(BundleContext context, String bsn) {
     }
 
     private static boolean isXmlThingTypeBundleAvailable(BundleContext context) {
-        return isBundleAvailable(context, "org.eclipse.smarthome.core.thing.xml");
+        return isBundleAvailable(context, "org.openhab.core.thing.xml");
     }
 
     private static boolean isXmlBindingInfoBundleAvailable(BundleContext context) {
-        return isBundleAvailable(context, "org.eclipse.smarthome.core.binding.xml");
+        return isBundleAvailable(context, "org.openhab.core.binding.xml");
     }
 
     private static boolean isXmlConfigBundleAvailable(BundleContext context) {
-        return isBundleAvailable(context, "org.eclipse.smarthome.config.xml");
+        return isBundleAvailable(context, "org.openhab.core.config.xml");
     }
 
     /**
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestPortUtil.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestPortUtil.java
index 8fe861ff5d5..66d738d08b0 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestPortUtil.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestPortUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test;
+package org.openhab.core.test;
 
 import java.io.IOException;
 import java.net.ServerSocket;
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestServer.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestServer.java
index 2a233f37606..97da6ffc9cb 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestServer.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/TestServer.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test;
+package org.openhab.core.test;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/internal/java/MissingServiceAnalyzer.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/internal/java/MissingServiceAnalyzer.java
index fecb4fc74fb..29982bedc25 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/internal/java/MissingServiceAnalyzer.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/internal/java/MissingServiceAnalyzer.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test.internal.java;
+package org.openhab.core.test.internal.java;
 
 import static java.util.stream.Collectors.*;
 
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaOSGiTest.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaOSGiTest.java
index 640430d9dcc..efe0969bf2d 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaOSGiTest.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test.java;
+package org.openhab.core.test.java;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -27,8 +27,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.test.internal.java.MissingServiceAnalyzer;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.test.internal.java.MissingServiceAnalyzer;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaTest.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaTest.java
index cc81710c9aa..00e9b4e52af 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaTest.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/java/JavaTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test.java;
+package org.openhab.core.test.java;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.BooleanSupplier;
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorage.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorage.java
index b557e831bde..0f9d9bc61a4 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorage.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorage.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test.storage;
+package org.openhab.core.test.storage;
 
 import java.util.Collection;
 import java.util.Map;
@@ -18,7 +18,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.storage.Storage;
+import org.openhab.core.storage.Storage;
 
 /**
  * A {@link Storage} implementation which stores it's data in-memory.
diff --git a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorageService.java b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorageService.java
index 1740cec0b59..d1fb99b6275 100644
--- a/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorageService.java
+++ b/bundles/org.openhab.core.test/src/main/java/org/openhab/core/test/storage/VolatileStorageService.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test.storage;
+package org.openhab.core.test.storage;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
 
 /**
  * The {@link VolatileStorageService} returns {@link VolatileStorage}s
diff --git a/bundles/org.openhab.core.test/src/test/java/org/openhab/core/test/java/JavaTestTest.java b/bundles/org.openhab.core.test/src/test/java/org/openhab/core/test/java/JavaTestTest.java
index b28854f8f5d..cb6b892d009 100644
--- a/bundles/org.openhab.core.test/src/test/java/org/openhab/core/test/java/JavaTestTest.java
+++ b/bundles/org.openhab.core.test/src/test/java/org/openhab/core/test/java/JavaTestTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.test.java;
+package org.openhab.core.test.java;
 
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.*;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/AbstractDescriptionTypeConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/AbstractDescriptionTypeConverter.java
index 22a4af7e636..16127f043b4 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/AbstractDescriptionTypeConverter.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/AbstractDescriptionTypeConverter.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
-import org.eclipse.smarthome.core.thing.type.AbstractDescriptionType;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.xml.util.ConverterAttributeMapValidator;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.xml.util.NodeIterator;
+import org.openhab.core.thing.type.AbstractDescriptionType;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeConverter.java
index f60a0daf007..728d28e3934 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeConverter.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeConverter.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.Map;
 
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
+import org.openhab.core.config.xml.util.NodeIterator;
+import org.openhab.core.thing.ThingTypeUID;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeXmlResult.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeXmlResult.java
index a45e879c846..b2ca33b295d 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeXmlResult.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/BridgeTypeXmlResult.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.type.BridgeType;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.type.BridgeType;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelConverter.java
index 689f09dcdf9..be672de7438 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelConverter.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelConverter.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.core.thing.type.AutoUpdatePolicy;
+import org.openhab.core.config.xml.util.ConverterAttributeMapValidator;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.xml.util.NodeIterator;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.thing.type.AutoUpdatePolicy;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeConverter.java
index 45c0bdce281..03305353963 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeConverter.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeConverter.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.config.xml.util.ConverterAttributeMapValidator;
+import org.openhab.core.config.xml.util.NodeIterator;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeXmlResult.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeXmlResult.java
index 121398c71da..af2b2cc2a5c 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeXmlResult.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelGroupTypeXmlResult.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeBuilder;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeConverter.java
index 32e9b976c0c..8ef8551eac6 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeConverter.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeConverter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.net.URI;
 import java.util.HashSet;
@@ -19,19 +19,19 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.core.thing.type.AutoUpdatePolicy;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.StateChannelTypeBuilder;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.EventDescription;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.xml.util.ConverterAttributeMapValidator;
+import org.openhab.core.config.xml.util.NodeIterator;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.thing.type.AutoUpdatePolicy;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.StateChannelTypeBuilder;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.EventDescription;
+import org.openhab.core.types.StateDescription;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeXmlResult.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeXmlResult.java
index 85e4cb11daf..05b99785a6b 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeXmlResult.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelTypeXmlResult.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.thing.type.ChannelType;
 
 /**
  * The {@link ChannelTypeXmlResult} is an intermediate XML conversion result object which
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelXmlResult.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelXmlResult.java
index bc86263c3a6..faadd3197ca 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelXmlResult.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ChannelXmlResult.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.core.thing.type.AutoUpdatePolicy;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinitionBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.thing.type.AutoUpdatePolicy;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelDefinitionBuilder;
+import org.openhab.core.thing.type.ChannelTypeUID;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/CommandDescriptionConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/CommandDescriptionConverter.java
index 36d0be6049a..81e8a284363 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/CommandDescriptionConverter.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/CommandDescriptionConverter.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
-import org.eclipse.smarthome.config.xml.util.NodeList;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.CommandDescriptionBuilder;
-import org.eclipse.smarthome.core.types.CommandOption;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.xml.util.NodeIterator;
+import org.openhab.core.config.xml.util.NodeList;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.CommandDescriptionBuilder;
+import org.openhab.core.types.CommandOption;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/EventDescriptionConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/EventDescriptionConverter.java
index 33c9337a67c..0676e7b4824 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/EventDescriptionConverter.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/EventDescriptionConverter.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
-import org.eclipse.smarthome.config.xml.util.NodeList;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.core.types.EventDescription;
-import org.eclipse.smarthome.core.types.EventOption;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.xml.util.NodeIterator;
+import org.openhab.core.config.xml.util.NodeList;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.types.EventDescription;
+import org.openhab.core.types.EventOption;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/StateDescriptionConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/StateDescriptionConverter.java
index 0207cbdd669..0be11b4eb3d 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/StateDescriptionConverter.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/StateDescriptionConverter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -18,13 +18,13 @@
 import java.util.Map;
 import java.util.Optional;
 
-import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
-import org.eclipse.smarthome.config.xml.util.NodeList;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateOption;
+import org.openhab.core.config.xml.util.ConverterAttributeMapValidator;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.xml.util.NodeIterator;
+import org.openhab.core.config.xml.util.NodeList;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateOption;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionConverter.java
index 672328e15d8..7ee2d1ff552 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionConverter.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionConverter.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
-import org.eclipse.smarthome.config.xml.util.GenericUnmarshaller;
+import org.openhab.core.config.xml.util.ConverterAttributeMapValidator;
+import org.openhab.core.config.xml.util.GenericUnmarshaller;
 
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionList.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionList.java
index b1d256597e9..8e882090ad4 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionList.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionList.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionReader.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionReader.java
index b30dac7e6af..adfba4f0b12 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionReader.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingDescriptionReader.java
@@ -10,28 +10,28 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup;
-import org.eclipse.smarthome.config.core.FilterCriteria;
-import org.eclipse.smarthome.config.xml.ConfigDescriptionConverter;
-import org.eclipse.smarthome.config.xml.ConfigDescriptionParameterConverter;
-import org.eclipse.smarthome.config.xml.ConfigDescriptionParameterGroupConverter;
-import org.eclipse.smarthome.config.xml.FilterCriteriaConverter;
-import org.eclipse.smarthome.config.xml.util.NodeAttributes;
-import org.eclipse.smarthome.config.xml.util.NodeAttributesConverter;
-import org.eclipse.smarthome.config.xml.util.NodeList;
-import org.eclipse.smarthome.config.xml.util.NodeListConverter;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.config.xml.util.NodeValueConverter;
-import org.eclipse.smarthome.config.xml.util.XmlDocumentReader;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.EventDescription;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
+import org.openhab.core.config.core.FilterCriteria;
+import org.openhab.core.config.xml.ConfigDescriptionConverter;
+import org.openhab.core.config.xml.ConfigDescriptionParameterConverter;
+import org.openhab.core.config.xml.ConfigDescriptionParameterGroupConverter;
+import org.openhab.core.config.xml.FilterCriteriaConverter;
+import org.openhab.core.config.xml.util.NodeAttributes;
+import org.openhab.core.config.xml.util.NodeAttributesConverter;
+import org.openhab.core.config.xml.util.NodeList;
+import org.openhab.core.config.xml.util.NodeListConverter;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.config.xml.util.NodeValueConverter;
+import org.openhab.core.config.xml.util.XmlDocumentReader;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.EventDescription;
+import org.openhab.core.types.StateDescription;
 
 import com.thoughtworks.xstream.XStream;
 
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeConverter.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeConverter.java
index 04f255951f9..0c359e16532 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeConverter.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeConverter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import static java.util.stream.Collectors.toList;
 
@@ -19,11 +19,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.xml.util.ConverterAttributeMapValidator;
-import org.eclipse.smarthome.config.xml.util.NodeIterator;
-import org.eclipse.smarthome.config.xml.util.NodeList;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
+import org.openhab.core.config.xml.util.ConverterAttributeMapValidator;
+import org.openhab.core.config.xml.util.NodeIterator;
+import org.openhab.core.config.xml.util.NodeList;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.thing.ThingTypeUID;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.Converter;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlProvider.java
index 4c1bfbe77b7..7197847860e 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlProvider.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlProvider.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.AbstractXmlConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentBundleTracker;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProvider;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ThingType;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.xml.AbstractXmlConfigDescriptionProvider;
+import org.openhab.core.config.xml.osgi.XmlDocumentBundleTracker;
+import org.openhab.core.config.xml.osgi.XmlDocumentProvider;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ThingType;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlResult.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlResult.java
index fd105e6955a..774861e8364 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlResult.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingTypeXmlResult.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -18,15 +18,15 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.util.NodeValue;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.xml.util.NodeValue;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupDefinition;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingXmlConfigDescriptionProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingXmlConfigDescriptionProvider.java
index cd83d34afa5..e67fb10dc3c 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingXmlConfigDescriptionProvider.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/ThingXmlConfigDescriptionProvider.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.i18n.ConfigI18nLocalizationService;
-import org.eclipse.smarthome.config.xml.AbstractXmlConfigDescriptionProvider;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.i18n.ConfigI18nLocalizationService;
+import org.openhab.core.config.xml.AbstractXmlConfigDescriptionProvider;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelGroupTypeProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelGroupTypeProvider.java
index d27484fdf18..d177b01abcb 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelGroupTypeProvider.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelGroupTypeProvider.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.Collection;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.xml.AbstractXmlBasedProvider;
-import org.eclipse.smarthome.core.thing.UID;
-import org.eclipse.smarthome.core.thing.i18n.ChannelGroupTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.config.xml.AbstractXmlBasedProvider;
+import org.openhab.core.thing.UID;
+import org.openhab.core.thing.i18n.ChannelGroupTypeI18nLocalizationService;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeProvider;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelTypeProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelTypeProvider.java
index 2ee7678ec20..3faa10e5de3 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelTypeProvider.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlChannelTypeProvider.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.Collection;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.xml.AbstractXmlBasedProvider;
-import org.eclipse.smarthome.core.thing.UID;
-import org.eclipse.smarthome.core.thing.i18n.ChannelTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.config.xml.AbstractXmlBasedProvider;
+import org.openhab.core.thing.UID;
+import org.openhab.core.thing.i18n.ChannelTypeI18nLocalizationService;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeUID;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlHelper.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlHelper.java
index d2721c87d5e..0e8c49bec89 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlHelper.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlHelper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 /**
  * Utility class containing helper methods to be used in XML generation.
diff --git a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlThingTypeProvider.java b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlThingTypeProvider.java
index ccd326e6761..7fc4d0d735c 100644
--- a/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlThingTypeProvider.java
+++ b/bundles/org.openhab.core.thing.xml/src/main/java/org/openhab/core/thing/xml/internal/XmlThingTypeProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.util.Collection;
 import java.util.List;
@@ -19,22 +19,22 @@
 import java.util.concurrent.ScheduledExecutorService;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.AbstractXmlBasedProvider;
-import org.eclipse.smarthome.config.xml.AbstractXmlConfigDescriptionProvider;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentBundleTracker;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProvider;
-import org.eclipse.smarthome.config.xml.osgi.XmlDocumentProviderFactory;
-import org.eclipse.smarthome.config.xml.util.XmlDocumentReader;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.service.ReadyService;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.UID;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.i18n.ThingTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ThingType;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.xml.AbstractXmlBasedProvider;
+import org.openhab.core.config.xml.AbstractXmlConfigDescriptionProvider;
+import org.openhab.core.config.xml.osgi.XmlDocumentBundleTracker;
+import org.openhab.core.config.xml.osgi.XmlDocumentProvider;
+import org.openhab.core.config.xml.osgi.XmlDocumentProviderFactory;
+import org.openhab.core.config.xml.util.XmlDocumentReader;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.service.ReadyService;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.UID;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.i18n.ThingTypeI18nLocalizationService;
+import org.openhab.core.thing.type.ChannelGroupTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ThingType;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Activate;
diff --git a/bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/Example.java b/bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/Example.java
index bcdfad52a59..ac43510946b 100644
--- a/bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/Example.java
+++ b/bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/Example.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import java.net.URL;
 
diff --git a/bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/XmlHelperTest.java b/bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/XmlHelperTest.java
index 128dc55a991..1e888d07b1a 100644
--- a/bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/XmlHelperTest.java
+++ b/bundles/org.openhab.core.thing.xml/src/test/java/org/openhab/core/thing/xml/internal/XmlHelperTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.internal;
+package org.openhab.core.thing.xml.internal;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Bridge.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Bridge.java
index ef5eb12c114..7862d3c45b4 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Bridge.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Bridge.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.binding.BridgeHandler;
+import org.openhab.core.thing.binding.BridgeHandler;
 
 /**
  * A {@link Bridge} is a {@link Thing} that connects other {@link Thing}s.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Channel.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Channel.java
index c345a5b0056..7143cfbb8f6 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Channel.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Channel.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -21,12 +21,12 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.type.AutoUpdatePolicy;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.items.Item;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.type.AutoUpdatePolicy;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelTypeUID;
 
 /**
  * {@link Channel} is a part of a {@link Thing} that represents a functionality
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelGroupUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelGroupUID.java
index 55635989ee8..70a8b995370 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelGroupUID.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelGroupUID.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelUID.java
index 47161278352..78a05a43e32 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelUID.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ChannelUID.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/CommonTriggerEvents.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/CommonTriggerEvents.java
index f0fddb6f299..a79d9fd9597 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/CommonTriggerEvents.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/CommonTriggerEvents.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 /**
  * Contains often used trigger events.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java
index ad0a7421357..ab810a538f8 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/DefaultSystemChannelTypeProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -26,18 +26,18 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.LocalizedKey;
-import org.eclipse.smarthome.core.thing.i18n.ChannelTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.types.EventDescription;
-import org.eclipse.smarthome.core.types.EventOption;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.StateOption;
-import org.eclipse.smarthome.core.util.BundleResolver;
+import org.openhab.core.i18n.LocalizedKey;
+import org.openhab.core.thing.i18n.ChannelTypeI18nLocalizationService;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.types.EventDescription;
+import org.openhab.core.types.EventOption;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.StateOption;
+import org.openhab.core.util.BundleResolver;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ManagedThingProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ManagedThingProvider.java
index a21358c3827..000c98610c2 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ManagedThingProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ManagedThingProvider.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
-import org.eclipse.smarthome.core.common.registry.DefaultAbstractManagedProvider;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.common.registry.DefaultAbstractManagedProvider;
+import org.openhab.core.storage.StorageService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Thing.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Thing.java
index c9387bcf067..32f5a93e65d 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Thing.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/Thing.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import java.util.List;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.Identifiable;
+import org.openhab.core.items.Item;
+import org.openhab.core.thing.binding.ThingHandler;
 
 /**
  * A {@link Thing} is a representation of a connected part (e.g. physical device or cloud service) from the real world.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingManager.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingManager.java
index 215ef9d1c83..54c43a05df4 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingManager.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 /**
  * {@link ThingManager} interface defines methods for managing a {@link Thing}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingProvider.java
index a21f2ddd339..326fde10049 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingProvider.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.Provider;
+import org.openhab.core.common.registry.Provider;
 
 /**
  * The {@link ThingProvider} is responsible for providing things.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistry.java
index eb0315eb9d1..90f5e07cecb 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistry.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistry.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationException;
-import org.eclipse.smarthome.core.common.registry.Registry;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.internal.ThingTracker;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.validation.ConfigValidationException;
+import org.openhab.core.common.registry.Registry;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.internal.ThingTracker;
 
 /**
  * {@link ThingRegistry} tracks all {@link Thing}s from different {@link ThingProvider}s and provides access to them.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistryChangeListener.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistryChangeListener.java
index 864da9364ab..a7c50b602ea 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistryChangeListener.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingRegistryChangeListener.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
+import org.openhab.core.common.registry.RegistryChangeListener;
 
 /**
  * {@link ThingRegistryChangeListener} can be implemented to listen for things
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatus.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatus.java
index b6402fbcc46..2db376dbcd8 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatus.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatus.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 /**
  * {@link ThingStatus} defines possible statuses of a {@link ThingStatusInfo}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusDetail.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusDetail.java
index 744381ab647..0cb5915298b 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusDetail.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusDetail.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 /**
  * {@link ThingStatusDetail} defines possible status details of a {@link ThingStatusInfo}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusInfo.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusInfo.java
index caeb6108f73..0d1e7554606 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusInfo.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusInfo.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import java.util.Objects;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeMigrationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeMigrationService.java
index a73a22e9be8..69954271273 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeMigrationService.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeMigrationService.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 
 /**
  * The {@link ThingTypeMigrationService} describes a service to change the thing type
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeUID.java
index 71b487f80e9..05511426bcb 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeUID.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingTypeUID.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingUID.java
index eb3eab5bb2c..36de7886d0a 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingUID.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingUID.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/UID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/UID.java
index a52d6fa3da8..b0bd1074515 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/UID.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/UID.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.AbstractUID;
+import org.openhab.core.common.AbstractUID;
 
 /**
  * Base class for binding related unique identifiers within the SmartHome framework.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseBridgeHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseBridgeHandler.java
index 96af2c795cc..3cdcb52c430 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseBridgeHandler.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseBridgeHandler.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.BridgeBuilder;
 
 /**
  * The {@link BaseBridgeHandler} implements the {@link BridgeHandler} interface and adds some convenience methods for
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProvider.java
index cd4029f885b..e1a1ca49c88 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.List;
 import java.util.Locale;
@@ -19,15 +19,15 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.i18n.ChannelTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.DynamicCommandDescriptionProvider;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.CommandDescriptionBuilder;
-import org.eclipse.smarthome.core.types.CommandOption;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.i18n.ChannelTypeI18nLocalizationService;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.DynamicCommandDescriptionProvider;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.CommandDescriptionBuilder;
+import org.openhab.core.types.CommandOption;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProvider.java
index 35e33c0a98b..58fc22d2cf9 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.List;
 import java.util.Locale;
@@ -19,15 +19,15 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.i18n.ChannelTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.DynamicStateDescriptionProvider;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.StateOption;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.i18n.ChannelTypeI18nLocalizationService;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.DynamicStateDescriptionProvider;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.StateOption;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandler.java
index 51e3ff51495..79c0cd9e31f 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandler.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,23 +20,23 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationException;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingStatusInfoBuilder;
-import org.eclipse.smarthome.core.thing.util.ThingHandlerHelper;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.validation.ConfigValidationException;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder;
+import org.openhab.core.thing.util.ThingHandlerHelper;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandlerFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandlerFactory.java
index 17f6da2b857..08671f9aca9 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandlerFactory.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BaseThingHandlerFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -21,16 +21,16 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.status.ConfigStatusProvider;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.status.ConfigStatusProvider;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeRegistry;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.ComponentContext;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BridgeHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BridgeHandler.java
index 66dee3371fd..0483f038093 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BridgeHandler.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/BridgeHandler.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Thing;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Thing;
 
 /**
  * A {@link BridgeHandler} handles the communication between the openHAB framework and
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusBridgeHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusBridgeHandler.java
index 452e6208c42..023241d9e8a 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusBridgeHandler.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusBridgeHandler.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.status.ConfigStatusCallback;
-import org.eclipse.smarthome.config.core.status.ConfigStatusProvider;
-import org.eclipse.smarthome.core.thing.Bridge;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.status.ConfigStatusCallback;
+import org.openhab.core.config.core.status.ConfigStatusProvider;
+import org.openhab.core.thing.Bridge;
 
 /**
  * The {@link ConfigStatusBridgeHandler} is an extension of {@link BaseBridgeHandler} that implements the
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusThingHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusThingHandler.java
index 1fe14e55244..0c9ef4dd6d8 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusThingHandler.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ConfigStatusThingHandler.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.status.ConfigStatusCallback;
-import org.eclipse.smarthome.config.core.status.ConfigStatusProvider;
-import org.eclipse.smarthome.core.thing.Thing;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.status.ConfigStatusCallback;
+import org.openhab.core.config.core.status.ConfigStatusProvider;
+import org.openhab.core.thing.Thing;
 
 /**
  * The {@link ConfigStatusThingHandler} is an extension of {@link BaseThingHandler} that implements the
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActions.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActions.java
index 75bf772a510..f3844ab5a23 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActions.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActions.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 /**
  * Marker interface for Automation Actions with access to a ThingHandler
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActionsScope.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActionsScope.java
index da61b93c046..03643d40713 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActionsScope.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingActionsScope.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingConfigStatusSource.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingConfigStatusSource.java
index 9e2ba72b680..839bcc74813 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingConfigStatusSource.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingConfigStatusSource.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.status.ConfigStatusSource;
-import org.eclipse.smarthome.core.thing.Thing;
+import org.openhab.core.config.core.status.ConfigStatusSource;
+import org.openhab.core.thing.Thing;
 
 /**
  * An implementation of {@link ConfigStatusSource} for the {@link Thing} entity.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingFactory.java
index cabda29a5aa..3049938ecb5 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingFactory.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.List;
 import java.util.Map;
@@ -18,17 +18,17 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.internal.ThingFactoryHelper;
-import org.eclipse.smarthome.core.thing.type.BridgeType;
-import org.eclipse.smarthome.core.thing.type.ThingType;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.BridgeBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.internal.ThingFactoryHelper;
+import org.openhab.core.thing.type.BridgeType;
+import org.openhab.core.thing.type.ThingType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandler.java
index 8b40fe3b52f..9df5cf01c4a 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandler.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -18,14 +18,14 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationException;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.config.core.validation.ConfigValidationException;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 
 /**
  * A {@link ThingHandler} handles the communication between the openHAB framework and an entity from the real
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerCallback.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerCallback.java
index 88d0c82046e..c439929251e 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerCallback.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerCallback.java
@@ -10,30 +10,30 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.List;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationException;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelGroupUID;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.validation.ConfigValidationException;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelGroupUID;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 
 /**
  * {@link ThingHandlerCallback} is callback interface for {@link ThingHandler}s. The implementation of a
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerFactory.java
index cdc9f300549..d2dfc9cd466 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerFactory.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerFactory.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.status.ConfigStatusProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.status.ConfigStatusProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
 
 /**
  * The {@link ThingHandlerFactory} is responsible for creating {@link Thing}s and {@link ThingHandler}s. Therefore the
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerService.java
index df96608e6a1..9cdb057bbbc 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerService.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingHandlerService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 /**
  *
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingTypeProvider.java
index 2adcf88664f..9b19fa756a9 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingTypeProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/ThingTypeProvider.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import java.util.Collection;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.type.ThingType;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.type.ThingType;
 
 /**
  * The {@link ThingTypeProvider} is responsible for providing thing types.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/BridgeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/BridgeBuilder.java
index 882103ad082..5f940b6eae7 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/BridgeBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/BridgeBuilder.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.builder;
+package org.openhab.core.thing.binding.builder;
 
 import java.util.List;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.internal.BridgeImpl;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.internal.BridgeImpl;
 
 /**
  * This class allows the easy construction of a {@link Bridge} instance using the builder pattern.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ChannelBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ChannelBuilder.java
index fc7a0262d4f..2b6491bb08d 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ChannelBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ChannelBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.builder;
+package org.openhab.core.thing.binding.builder;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -18,13 +18,13 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.type.AutoUpdatePolicy;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.type.AutoUpdatePolicy;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeUID;
 
 /**
  * {@link ChannelBuilder} is responsible for creating {@link Channel}s.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingBuilder.java
index 9a65392df6e..64e1abfc0eb 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.builder;
+package org.openhab.core.thing.binding.builder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -21,14 +21,14 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.internal.ThingImpl;
-import org.eclipse.smarthome.core.thing.util.ThingHelper;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.internal.ThingImpl;
+import org.openhab.core.thing.util.ThingHelper;
 
 /**
  * This class allows the easy construction of a {@link Thing} instance using the builder pattern.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilder.java
index 45b7c950a51..a5b693a80b3 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilder.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.builder;
+package org.openhab.core.thing.binding.builder;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
 
 /**
  * {@link ThingStatusInfoBuilder} is responsible for creating {@link ThingStatusInfo}s.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/Firmware.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/Firmware.java
index d603ca60c13..56c6fe3ead4 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/Firmware.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/Firmware.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.firmware;
+package org.openhab.core.thing.binding.firmware;
 
 import java.io.InputStream;
 import java.net.URL;
@@ -18,12 +18,12 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareProvider;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareRegistry;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareStatusInfo;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateService;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.firmware.FirmwareProvider;
+import org.openhab.core.thing.firmware.FirmwareRegistry;
+import org.openhab.core.thing.firmware.FirmwareStatusInfo;
+import org.openhab.core.thing.firmware.FirmwareUpdateService;
 
 /**
  * <p>
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareBuilder.java
index 3896befd37c..a81fe12aa4d 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.firmware;
+package org.openhab.core.thing.binding.firmware;
 
 import java.io.InputStream;
 import java.net.URL;
@@ -20,8 +20,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.internal.firmware.FirmwareImpl;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.internal.firmware.FirmwareImpl;
 
 /**
  * The builder to create a {@link Firmware}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareRestriction.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareRestriction.java
index ec3ac737fbe..defbdd5612a 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareRestriction.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareRestriction.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.firmware;
+package org.openhab.core.thing.binding.firmware;
 
 import java.util.function.Function;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.firmware.FirmwareProvider;
 
 /**
  * A function for defining specific installation restrictions for a given {@link Firmware}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateBackgroundTransferHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateBackgroundTransferHandler.java
index d3587e2f7d0..18126ea5347 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateBackgroundTransferHandler.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateBackgroundTransferHandler.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.firmware;
+package org.openhab.core.thing.binding.firmware;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareStatus;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateService;
+import org.openhab.core.thing.firmware.FirmwareStatus;
+import org.openhab.core.thing.firmware.FirmwareUpdateService;
 
 /**
  * The {@link FirmwareUpdateBackgroundTransferHandler} is an extension of the {@link FirmwareUpdateHandler} and is to be
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateHandler.java
index a43b2619c1c..cf64b10863e 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateHandler.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareUpdateHandler.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.firmware;
+package org.openhab.core.thing.binding.firmware;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateService;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.firmware.FirmwareUpdateService;
 
 /**
  * The {@link FirmwareUpdateHandler} can be implemented and registered as an OSGi service in order to update the
  * firmware for the physical device of a {@link Thing}. The {@link FirmwareUpdateService} tracks each firmware
  * update handler and starts the firmware update process by the operation
- * {@link FirmwareUpdateService#updateFirmware(org.eclipse.smarthome.core.thing.ThingUID, FirmwareUID, java.util.Locale)}
+ * {@link FirmwareUpdateService#updateFirmware(org.openhab.core.thing.ThingUID, FirmwareUID, java.util.Locale)}
  * .
  *
  * @author Thomas Höfer - Initial contribution
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressCallback.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressCallback.java
index 838081be8c9..486e4ec0780 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressCallback.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressCallback.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.firmware;
+package org.openhab.core.thing.binding.firmware;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressStep.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressStep.java
index 3a665686b42..eb6b579956d 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressStep.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/firmware/ProgressStep.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.firmware;
+package org.openhab.core.thing.binding.firmware;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTO.java
index 5b378e57f26..572f8d74de9 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTO.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.dto;
+package org.openhab.core.thing.dto;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.type.ChannelKind;
 
 /**
  * This is a data transfer object that is used to serialize channels.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTOMapper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTOMapper.java
index 2a8a8b49b16..01eacc73aac 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTOMapper.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDTOMapper.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.dto;
+package org.openhab.core.thing.dto;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelTypeUID;
 
 /**
  * The {@link ChannelDTOMapper} is an utility class to map channels into channel data transfer objects (DTOs).
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDefinitionDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDefinitionDTO.java
index b6209de6c75..df9af54485a 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDefinitionDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelDefinitionDTO.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.dto;
+package org.openhab.core.thing.dto;
 
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.types.StateDescription;
 
 /**
  * This is a data transfer object that is used to serialize channel definitions.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelGroupDefinitionDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelGroupDefinitionDTO.java
index 3ce0ff1bb28..01caf424531 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelGroupDefinitionDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelGroupDefinitionDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.dto;
+package org.openhab.core.thing.dto;
 
 import java.util.List;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelTypeDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelTypeDTO.java
index c6c88c6e6ca..8919ae21ab7 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelTypeDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ChannelTypeDTO.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.dto;
+package org.openhab.core.thing.dto;
 
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterGroupDTO;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterGroupDTO;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.StateDescription;
 
 /**
  * This is a data transfer object that is used with to serialize channel types.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTO.java
index 412cef94630..995560d4281 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.dto;
+package org.openhab.core.thing.dto;
 
 import java.util.List;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTOMapper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTOMapper.java
index efb719c1959..c34f8e3fb9e 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTOMapper.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/StrippedThingTypeDTOMapper.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.dto;
+package org.openhab.core.thing.dto;
 
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.thing.type.BridgeType;
-import org.eclipse.smarthome.core.thing.type.ThingType;
+import org.openhab.core.thing.type.BridgeType;
+import org.openhab.core.thing.type.ThingType;
 
 /**
  * The {@link StrippedThingTypeDTOMapper} is an utility class to map things into stripped thing type data transfer
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTO.java
index a6efe4fee7f..8d198890e06 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.dto;
+package org.openhab.core.thing.dto;
 
 import java.util.List;
 import java.util.Map;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTOMapper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTOMapper.java
index 2ae177bf8dd..66bb0175a76 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTOMapper.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingDTOMapper.java
@@ -10,21 +10,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.dto;
+package org.openhab.core.thing.dto;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.util.ThingHelper;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.BridgeBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.util.ThingHelper;
 
 /**
  * The {@link ThingDTOMapper} is an utility class to map things into data transfer objects (DTO).
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingTypeDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingTypeDTO.java
index 44a72c74649..eff9b763fe7 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingTypeDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/dto/ThingTypeDTO.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.dto;
+package org.openhab.core.thing.dto;
 
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterDTO;
-import org.eclipse.smarthome.config.core.dto.ConfigDescriptionParameterGroupDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterDTO;
+import org.openhab.core.config.core.dto.ConfigDescriptionParameterGroupDTO;
 
 /**
  * This is a data transfer object that is used with to serialize thing types.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/AbstractThingRegistryEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/AbstractThingRegistryEvent.java
index 078cc5d6b6d..78d9d69ae64 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/AbstractThingRegistryEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/AbstractThingRegistryEvent.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.events;
+package org.openhab.core.thing.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.dto.ThingDTO;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.dto.ThingDTO;
 
 /**
  * Abstract implementation of a thing registry event which will be posted by a {@link ThingRegistry} for added, removed
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ChannelTriggeredEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ChannelTriggeredEvent.java
index be119586a3f..e9c27ada4be 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ChannelTriggeredEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ChannelTriggeredEvent.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.events;
+package org.openhab.core.thing.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.thing.ChannelUID;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.thing.ChannelUID;
 
 /**
  * {@link ChannelTriggeredEvent}s can be used to deliver triggers through the openHAB event bus.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingAddedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingAddedEvent.java
index 0db3798574f..64d934f8e60 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingAddedEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingAddedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.events;
+package org.openhab.core.thing.events;
 
-import org.eclipse.smarthome.core.thing.dto.ThingDTO;
+import org.openhab.core.thing.dto.ThingDTO;
 
 /**
  * A {@link ThingAddedEvent} notifies subscribers that a thing has been added.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingEventFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingEventFactory.java
index de5c5302968..126678faaab 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingEventFactory.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingEventFactory.java
@@ -10,23 +10,23 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.events;
+package org.openhab.core.thing.events;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.events.AbstractEventFactory;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.dto.ThingDTO;
-import org.eclipse.smarthome.core.thing.dto.ThingDTOMapper;
-import org.eclipse.smarthome.core.types.Type;
+import org.openhab.core.events.AbstractEventFactory;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.dto.ThingDTO;
+import org.openhab.core.thing.dto.ThingDTOMapper;
+import org.openhab.core.types.Type;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingRemovedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingRemovedEvent.java
index c22b830615d..68e68a9b63c 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingRemovedEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingRemovedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.events;
+package org.openhab.core.thing.events;
 
-import org.eclipse.smarthome.core.thing.dto.ThingDTO;
+import org.openhab.core.thing.dto.ThingDTO;
 
 /**
  * A {@link ThingRemovedEvent} notifies subscribers that a thing has been removed.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoChangedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoChangedEvent.java
index b1a2d800a93..36276563f18 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoChangedEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoChangedEvent.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.events;
+package org.openhab.core.thing.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * {@link ThingStatusInfoChangedEvent}s will be delivered through the openHAB event bus if the status of a
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoEvent.java
index 8f212a88582..458a074d91f 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingStatusInfoEvent.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.events;
+package org.openhab.core.thing.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * {@link ThingStatusInfoEvent}s will be delivered through the openHAB event bus if the status of a thing has
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingUpdatedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingUpdatedEvent.java
index 56fed0f39bb..89dd5661c95 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingUpdatedEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ThingUpdatedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.events;
+package org.openhab.core.thing.events;
 
-import org.eclipse.smarthome.core.thing.dto.ThingDTO;
+import org.openhab.core.thing.dto.ThingDTO;
 
 /**
  * A {@link ThingUpdatedEvent} notifies subscribers that a thing has been updated.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareEventFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareEventFactory.java
index 297f56a1b89..bae344bd94b 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareEventFactory.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareEventFactory.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.events.AbstractEventFactory;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
+import org.openhab.core.events.AbstractEventFactory;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareProvider.java
index b42e8065fa1..c736570bc30 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareProvider.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import java.util.Locale;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.binding.firmware.Firmware;
 
 /**
  * The {@link FirmwareProvider} is registered as an OSGi service and is responsible for providing firmwares. If a locale
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareRegistry.java
index 946449c4caf..3e40c21deed 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareRegistry.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareRegistry.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import java.util.Collection;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.binding.firmware.Firmware;
 
 /**
  * The {@link FirmwareRegistry} is registered as an OSGi service and is responsible for tracking all
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatus.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatus.java
index b5522fdf65c..fb24b6c3b13 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatus.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatus.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
 
 /**
  * The {@link FirmwareStatus} enumeration defines all possible statuses for the {@link Firmware} of a {@link Thing}
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfo.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfo.java
index 80bcf58f655..7da791d84c8 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfo.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfo.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * The {@link FirmwareStatusInfo} represents the {@link FirmwareStatus} of a {@link Thing}. If the firmware status is
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfoEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfoEvent.java
index ffdd9b9a1cd..07fa24a0352 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfoEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareStatusInfoEvent.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * The {@link FirmwareStatusInfoEvent} is sent if the {@link FirmwareStatusInfo} of a {@link Thing} has been changed.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfo.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfo.java
index 103818055a3..94531b2941c 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfo.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfo.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -18,9 +18,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressStep;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.ProgressStep;
 
 /**
  * The {@link FirmwareUpdateProgressInfo} represents the progress indicator for a firmware update.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfoEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfoEvent.java
index 18dffa690d9..595541a9e92 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfoEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateProgressInfoEvent.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.AbstractEvent;
+import org.openhab.core.events.AbstractEvent;
 
 /**
  * The {@link FirmwareUpdateProgressInfoEvent} is sent if there is a new progress step for a firmware update. It is
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResult.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResult.java
index 3acf6b96daa..21c635cb6df 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResult.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResult.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfo.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfo.java
index 1350dfff910..d811c87951d 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfo.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfo.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * The {@link FirmwareUpdateResultInfo} contains information about the result of a firmware update.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfoEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfoEvent.java
index 7b02923edc8..f8f57a25f34 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfoEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateResultInfoEvent.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.AbstractEvent;
+import org.openhab.core.events.AbstractEvent;
 
 /**
  * The {@link FirmwareUpdateResultInfoEvent} is sent if the firmware update has been finished. It is created by the
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateService.java
index 8b91cfffc6b..976e8f370a9 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateService.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateService.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressCallback;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.thing.binding.firmware.ProgressCallback;
 
 /**
  * The firmware update service is registered as an OSGi service and is responsible for tracking all available
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareDTO.java
index 4d240d65454..e98a16ca671 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware.dto;
+package org.openhab.core.thing.firmware.dto;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareStatusDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareStatusDTO.java
index 9213d1f809f..2467e8c0e58 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareStatusDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/firmware/dto/FirmwareStatusDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware.dto;
+package org.openhab.core.thing.firmware.dto;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelGroupTypeI18nLocalizationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelGroupTypeI18nLocalizationService.java
index 05570d2d2d6..5c791a7007c 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelGroupTypeI18nLocalizationService.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelGroupTypeI18nLocalizationService.java
@@ -10,21 +10,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.i18n;
+package org.openhab.core.thing.i18n;
 
 import java.util.List;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.internal.i18n.ChannelI18nUtil;
-import org.eclipse.smarthome.core.thing.internal.i18n.ThingTypeI18nUtil;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.internal.i18n.ChannelI18nUtil;
+import org.openhab.core.thing.internal.i18n.ThingTypeI18nUtil;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeBuilder;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelTypeI18nLocalizationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelTypeI18nLocalizationService.java
index 582eb4de5e3..80613186b06 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelTypeI18nLocalizationService.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ChannelTypeI18nLocalizationService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.i18n;
+package org.openhab.core.thing.i18n;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,19 +18,19 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.internal.i18n.ThingTypeI18nUtil;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.StateChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.TriggerChannelTypeBuilder;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.CommandDescriptionBuilder;
-import org.eclipse.smarthome.core.types.CommandOption;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.StateOption;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.internal.i18n.ThingTypeI18nUtil;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.StateChannelTypeBuilder;
+import org.openhab.core.thing.type.TriggerChannelTypeBuilder;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.CommandDescriptionBuilder;
+import org.openhab.core.types.CommandOption;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.StateOption;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationService.java
index 5c5b4417f37..7c5be8e6d42 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationService.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationService.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.i18n;
+package org.openhab.core.thing.i18n;
 
 import java.util.Arrays;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.i18n.I18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.util.BundleResolver;
+import org.openhab.core.i18n.I18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.util.BundleResolver;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingTypeI18nLocalizationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingTypeI18nLocalizationService.java
index 1177404e5c8..8df16a7567b 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingTypeI18nLocalizationService.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/i18n/ThingTypeI18nLocalizationService.java
@@ -10,25 +10,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.i18n;
+package org.openhab.core.thing.i18n;
 
 import java.util.List;
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.internal.i18n.ChannelGroupI18nUtil;
-import org.eclipse.smarthome.core.thing.internal.i18n.ChannelI18nUtil;
-import org.eclipse.smarthome.core.thing.internal.i18n.ThingTypeI18nUtil;
-import org.eclipse.smarthome.core.thing.type.BridgeType;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.internal.i18n.ChannelGroupI18nUtil;
+import org.openhab.core.thing.internal.i18n.ChannelI18nUtil;
+import org.openhab.core.thing.internal.i18n.ThingTypeI18nUtil;
+import org.openhab.core.thing.type.BridgeType;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupDefinition;
+import org.openhab.core.thing.type.ChannelGroupTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateConfigDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateConfigDescriptionProvider.java
index 87097568d20..0b4f05bd547 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateConfigDescriptionProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateConfigDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import static java.util.stream.Collectors.toList;
 
@@ -20,9 +20,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.config.core.metadata.MetadataConfigDescriptionProvider;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.config.core.metadata.MetadataConfigDescriptionProvider;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateManager.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateManager.java
index 89eba1fffcf..b8bb907d16e 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateManager.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/AutoUpdateManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,25 +18,25 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.type.AutoUpdatePolicy;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.type.AutoUpdatePolicy;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ConfigurationPolicy;
@@ -53,12 +53,12 @@
  */
 @NonNullByDefault
 @Component(immediate = true, service = {
-        AutoUpdateManager.class }, configurationPid = "org.eclipse.smarthome.autoupdate", configurationPolicy = ConfigurationPolicy.OPTIONAL)
+        AutoUpdateManager.class }, configurationPid = "org.openhab.core.autoupdate", configurationPolicy = ConfigurationPolicy.OPTIONAL)
 public class AutoUpdateManager {
 
     private static final String AUTOUPDATE_KEY = "autoupdate";
-    protected static final String EVENT_SOURCE = "org.eclipse.smarthome.core.autoupdate";
-    protected static final String EVENT_SOURCE_OPTIMISTIC = "org.eclipse.smarthome.core.autoupdate.optimistic";
+    protected static final String EVENT_SOURCE = "org.openhab.core.autoupdate";
+    protected static final String EVENT_SOURCE_OPTIMISTIC = "org.openhab.core.autoupdate.optimistic";
 
     protected static final String PROPERTY_ENABLED = "enabled";
     protected static final String PROPERTY_SEND_OPTIMISTIC_UPDATES = "sendOptimisticUpdates";
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/BridgeImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/BridgeImpl.java
index d85f6af2b39..c1c1b4ae944 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/BridgeImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/BridgeImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -19,12 +19,12 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BridgeHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BridgeHandler;
+import org.openhab.core.thing.binding.ThingHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProvider.java
index d548365ff35..9b7b657dc83 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelCommandDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.util.List;
 import java.util.Locale;
@@ -19,15 +19,15 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.DynamicCommandDescriptionProvider;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.CommandDescriptionProvider;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.DynamicCommandDescriptionProvider;
+import org.openhab.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.CommandDescriptionProvider;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelItemProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelItemProvider.java
index 0c06630930d..1d0f5c65629 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelItemProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelItemProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -24,24 +24,24 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemFactory;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.RegistryHook;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemFactory;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.RegistryHook;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -59,7 +59,7 @@
  * @author Markus Rathgeb - Add locale provider support
  * @author Thomas Höfer - Added modified operation
  */
-@Component(configurationPid = "org.eclipse.smarthome.channelitemprovider", immediate = true)
+@Component(configurationPid = "org.openhab.core.channelitemprovider", immediate = true)
 @NonNullByDefault
 public class ChannelItemProvider implements ItemProvider {
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProvider.java
index 57475bf03db..ca1df7d93eb 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ChannelStateDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.util.List;
 import java.util.Locale;
@@ -20,19 +20,19 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.DynamicStateDescriptionProvider;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragment;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentProvider;
+import org.openhab.core.items.Item;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.DynamicStateDescriptionProvider;
+import org.openhab.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragment;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.StateDescriptionFragmentProvider;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java
index 5d9b420ae17..9bb6dba1d61 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -30,49 +30,49 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.AbstractUID;
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemFactory;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.ItemStateConverter;
-import org.eclipse.smarthome.core.items.ItemUtil;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemStateEvent;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.events.ChannelTriggeredEvent;
-import org.eclipse.smarthome.core.thing.events.ThingEventFactory;
-import org.eclipse.smarthome.core.thing.internal.link.ItemChannelLinkConfigDescriptionProvider;
-import org.eclipse.smarthome.core.thing.internal.profiles.ProfileCallbackImpl;
-import org.eclipse.smarthome.core.thing.internal.profiles.SystemProfileFactory;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.profiles.Profile;
-import org.eclipse.smarthome.core.thing.profiles.ProfileAdvisor;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileFactory;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.StateProfile;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.Type;
-import org.eclipse.smarthome.core.types.util.UnitUtils;
+import org.openhab.core.common.AbstractUID;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemFactory;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.ItemStateConverter;
+import org.openhab.core.items.ItemUtil;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemStateEvent;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.events.ChannelTriggeredEvent;
+import org.openhab.core.thing.events.ThingEventFactory;
+import org.openhab.core.thing.internal.link.ItemChannelLinkConfigDescriptionProvider;
+import org.openhab.core.thing.internal.profiles.ProfileCallbackImpl;
+import org.openhab.core.thing.internal.profiles.SystemProfileFactory;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.profiles.Profile;
+import org.openhab.core.thing.profiles.ProfileAdvisor;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileFactory;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.StateProfile;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.Type;
+import org.openhab.core.types.util.UnitUtils;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ProfileContextImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ProfileContextImpl.java
index 13ede16c22e..fe145a59fb8 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ProfileContextImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ProfileContextImpl.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.util.concurrent.ScheduledExecutorService;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.thing.profiles.ProfileContext;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.thing.profiles.ProfileContext;
 
 /**
  * {@link ProfileContext} implementation.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingConfigDescriptionAliasProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingConfigDescriptionAliasProvider.java
index d9e994fc147..d1cf57aa7de 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingConfigDescriptionAliasProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingConfigDescriptionAliasProvider.java
@@ -10,23 +10,23 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.net.URI;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionAliasProvider;
-import org.eclipse.smarthome.config.core.ConfigOptionProvider;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.config.core.ConfigDescriptionAliasProvider;
+import org.openhab.core.config.core.ConfigOptionProvider;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeRegistry;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingFactoryHelper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingFactoryHelper.java
index 67f639b9893..71650988530 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingFactoryHelper.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingFactoryHelper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -18,21 +18,21 @@
 import java.util.function.Function;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.ConfigUtil;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingFactory;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ThingType;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.ConfigUtil;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingFactory;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeRegistry;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ThingType;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingImpl.java
index aed045c7f72..161f5efa149 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -21,17 +21,17 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingStatusInfoBuilder;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder;
 
 /**
  * The {@link ThingImpl} class is a concrete implementation of the {@link Thing}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingManagerImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingManagerImpl.java
index 6d0595d9faa..d6c7a038f04 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingManagerImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingManagerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.net.URI;
 import java.security.AccessController;
@@ -35,59 +35,59 @@
 import java.util.function.Function;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.validation.ConfigDescriptionValidator;
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
-import org.eclipse.smarthome.core.common.registry.ManagedProvider;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.service.ReadyMarker;
-import org.eclipse.smarthome.core.service.ReadyMarkerFilter;
-import org.eclipse.smarthome.core.service.ReadyMarkerUtils;
-import org.eclipse.smarthome.core.service.ReadyService;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelGroupUID;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingManager;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeMigrationService;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.UID;
-import org.eclipse.smarthome.core.thing.binding.BridgeHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingStatusInfoBuilder;
-import org.eclipse.smarthome.core.thing.events.ThingEventFactory;
-import org.eclipse.smarthome.core.thing.i18n.ThingStatusInfoI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
-import org.eclipse.smarthome.core.thing.util.ThingHandlerHelper;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.util.BundleResolver;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.validation.ConfigDescriptionValidator;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.common.registry.Identifiable;
+import org.openhab.core.common.registry.ManagedProvider;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.service.ReadyMarker;
+import org.openhab.core.service.ReadyMarkerFilter;
+import org.openhab.core.service.ReadyMarkerUtils;
+import org.openhab.core.service.ReadyService;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelGroupUID;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingManager;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeMigrationService;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.UID;
+import org.openhab.core.thing.binding.BridgeHandler;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerCallback;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder;
+import org.openhab.core.thing.events.ThingEventFactory;
+import org.openhab.core.thing.i18n.ThingStatusInfoI18nLocalizationService;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeRegistry;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.thing.util.ThingHandlerHelper;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.util.BundleResolver;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingRegistryImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingRegistryImpl.java
index 24d2933e530..273ae84a26c 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingRegistryImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingRegistryImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.util.List;
 import java.util.Map;
@@ -18,22 +18,22 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.AbstractRegistry;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingProvider;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.events.ThingEventFactory;
-import org.eclipse.smarthome.core.thing.internal.ThingTracker.ThingTrackerEvent;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.AbstractRegistry;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingProvider;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.events.ThingEventFactory;
+import org.openhab.core.thing.internal.ThingTracker.ThingTrackerEvent;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingTracker.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingTracker.java
index 29a1258bb21..0c44d215cfd 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingTracker.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingTracker.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistryChangeListener;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistryChangeListener;
 
 /**
  * A {@link ThingTracker} can be used to track added and removed things. In
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/FirmwareUpdateConsoleCommandExtension.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/FirmwareUpdateConsoleCommandExtension.java
index e9efb48eaf4..29153a6615b 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/FirmwareUpdateConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/FirmwareUpdateConsoleCommandExtension.java
@@ -10,24 +10,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.console;
+package org.openhab.core.thing.internal.console;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareRegistry;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareStatusInfo;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateService;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.thing.firmware.FirmwareRegistry;
+import org.openhab.core.thing.firmware.FirmwareStatusInfo;
+import org.openhab.core.thing.firmware.FirmwareUpdateService;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/LinkConsoleCommandExtension.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/LinkConsoleCommandExtension.java
index bfb50b3fa45..e77df6128da 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/LinkConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/LinkConsoleCommandExtension.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.console;
+package org.openhab.core.thing.internal.console;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/ThingConsoleCommandExtension.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/ThingConsoleCommandExtension.java
index 83ca424e664..dfeba1cee3c 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/ThingConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/console/ThingConsoleCommandExtension.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.console;
+package org.openhab.core.thing.internal.console;
 
 import static java.util.Arrays.asList;
 
@@ -21,21 +21,21 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingManager;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.events.ThingEventFactory;
-import org.eclipse.smarthome.core.thing.i18n.ThingStatusInfoI18nLocalizationService;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingManager;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.events.ThingEventFactory;
+import org.openhab.core.thing.i18n.ThingStatusInfoI18nLocalizationService;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareImpl.java
index eed5f510226..52757d564ca 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareImpl.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.firmware;
+package org.openhab.core.thing.internal.firmware;
 
-import static org.eclipse.smarthome.core.thing.Thing.*;
+import static org.openhab.core.thing.Thing.*;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,10 +27,10 @@
 import org.apache.commons.io.IOUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareRestriction;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareRestriction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryImpl.java
index 4bdbaa7f146..4a2cdafa010 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.firmware;
+package org.openhab.core.thing.internal.firmware;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -24,11 +24,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareProvider;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareRegistry;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.firmware.FirmwareProvider;
+import org.openhab.core.thing.firmware.FirmwareRegistry;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java
index d2a1cfaae6d..3b5d28ef818 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceImpl.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.firmware;
+package org.openhab.core.thing.internal.firmware;
 
-import static org.eclipse.smarthome.core.thing.firmware.FirmwareStatusInfo.*;
+import static org.openhab.core.thing.firmware.FirmwareStatusInfo.*;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -33,29 +33,29 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.validation.ConfigDescriptionValidator;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationException;
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateBackgroundTransferHandler;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.core.thing.events.ThingStatusInfoChangedEvent;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareEventFactory;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareRegistry;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareStatus;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareStatusInfo;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateService;
-import org.eclipse.smarthome.core.util.BundleResolver;
+import org.openhab.core.config.core.validation.ConfigDescriptionValidator;
+import org.openhab.core.config.core.validation.ConfigValidationException;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateBackgroundTransferHandler;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.thing.events.ThingStatusInfoChangedEvent;
+import org.openhab.core.thing.firmware.FirmwareEventFactory;
+import org.openhab.core.thing.firmware.FirmwareRegistry;
+import org.openhab.core.thing.firmware.FirmwareStatus;
+import org.openhab.core.thing.firmware.FirmwareStatusInfo;
+import org.openhab.core.thing.firmware.FirmwareUpdateService;
+import org.openhab.core.util.BundleResolver;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ParameterChecks.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ParameterChecks.java
index 37d0325bf6b..92eb736e8c3 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ParameterChecks.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ParameterChecks.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.firmware;
+package org.openhab.core.thing.internal.firmware;
 
 import org.eclipse.jdt.annotation.Nullable;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ProgressCallbackImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ProgressCallbackImpl.java
index 0e4b5f36a5f..112c7d210bf 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ProgressCallbackImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ProgressCallbackImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.firmware;
+package org.openhab.core.thing.internal.firmware;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -18,19 +18,19 @@
 import java.util.Iterator;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressCallback;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressStep;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareEventFactory;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateProgressInfo;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateResult;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateResultInfo;
-import org.eclipse.smarthome.core.util.BundleResolver;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.thing.binding.firmware.ProgressCallback;
+import org.openhab.core.thing.binding.firmware.ProgressStep;
+import org.openhab.core.thing.firmware.FirmwareEventFactory;
+import org.openhab.core.thing.firmware.FirmwareUpdateProgressInfo;
+import org.openhab.core.thing.firmware.FirmwareUpdateResult;
+import org.openhab.core.thing.firmware.FirmwareUpdateResultInfo;
+import org.openhab.core.util.BundleResolver;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelGroupI18nUtil.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelGroupI18nUtil.java
index 694f3877c26..d6afa170b88 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelGroupI18nUtil.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelGroupI18nUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.i18n;
+package org.openhab.core.thing.internal.i18n;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,12 +19,12 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.i18n.ChannelGroupTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.i18n.ThingTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.i18n.ChannelGroupTypeI18nLocalizationService;
+import org.openhab.core.thing.i18n.ThingTypeI18nLocalizationService;
+import org.openhab.core.thing.type.ChannelGroupDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeRegistry;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelI18nUtil.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelI18nUtil.java
index 9a07bccc8a7..a63b8b480d5 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelI18nUtil.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ChannelI18nUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.i18n;
+package org.openhab.core.thing.internal.i18n;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,14 +19,14 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.i18n.ChannelGroupTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.i18n.ChannelTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.i18n.ThingTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinitionBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.i18n.ChannelGroupTypeI18nLocalizationService;
+import org.openhab.core.thing.i18n.ChannelTypeI18nLocalizationService;
+import org.openhab.core.thing.i18n.ThingTypeI18nLocalizationService;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelDefinitionBuilder;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeUID;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ThingTypeI18nUtil.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ThingTypeI18nUtil.java
index 16b755c5bbf..0db9ded40af 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ThingTypeI18nUtil.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/i18n/ThingTypeI18nUtil.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.i18n;
+package org.openhab.core.thing.internal.i18n;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.I18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.i18n.I18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupDefinition;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ChannelTypeUID;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/link/ItemChannelLinkConfigDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/link/ItemChannelLinkConfigDescriptionProvider.java
index a2c02875583..88ce105701f 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/link/ItemChannelLinkConfigDescriptionProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/link/ItemChannelLinkConfigDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.link;
+package org.openhab.core.thing.internal.link;
 
 import java.net.URI;
 import java.util.Collection;
@@ -19,23 +19,23 @@
 import java.util.Locale;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeRegistry;
-import org.eclipse.smarthome.core.thing.profiles.StateProfileType;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfileType;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeRegistry;
+import org.openhab.core.thing.profiles.StateProfileType;
+import org.openhab.core.thing.profiles.TriggerProfileType;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileCallbackImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileCallbackImpl.java
index e74bf2c84a9..45f1efac521 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileCallbackImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileCallbackImpl.java
@@ -10,24 +10,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import java.util.function.Function;
 
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemStateConverter;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.internal.CommunicationManager;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.util.ThingHandlerHelper;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemStateConverter;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.internal.CommunicationManager;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.util.ThingHandlerHelper;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileTypeRegistryImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileTypeRegistryImpl.java
index d25a7c5a003..610775651b3 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileTypeRegistryImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/ProfileTypeRegistryImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,9 +18,9 @@
 import java.util.Locale;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeProvider;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeRegistry;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeProvider;
+import org.openhab.core.thing.profiles.ProfileTypeRegistry;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfile.java
index 3fecde29dcc..780be431dbc 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfile.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWBUTTON_ON_OFF_SWITCH;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWBUTTON_ON_OFF_SWITCH;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.State;
 
 /**
  * The {@link RawButtonOnOffSwitchProfile} transforms raw button switch
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonTogglePlayerProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonTogglePlayerProfile.java
index d0c08f68552..cdd1086e686 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonTogglePlayerProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonTogglePlayerProfile.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWBUTTON_TOGGLE_PLAYER;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWBUTTON_TOGGLE_PLAYER;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.library.types.PlayPauseType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.State;
 
 /**
  * This profile allows a channel of the "system:rawbutton" type to be bound to an item.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleRollershutterProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleRollershutterProfile.java
index 8f7c26615ac..97933102c50 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleRollershutterProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleRollershutterProfile.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWBUTTON_TOGGLE_ROLLERSHUTTER;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWBUTTON_TOGGLE_ROLLERSHUTTER;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.library.types.UpDownType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.UpDownType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.State;
 
 /**
  * This profile allows a channel of the "system:rawbutton" type to be bound to an item.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfile.java
index affeb8c6251..d1918106acf 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfile.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWBUTTON_TOGGLE_SWITCH;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWBUTTON_TOGGLE_SWITCH;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.State;
 
 /**
  * This profile allows a channel of the "system:rawbutton" type to be bound to an item.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerDimmerProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerDimmerProfile.java
index a044f685bcf..c2de26c5101 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerDimmerProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerDimmerProfile.java
@@ -10,24 +10,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWROCKER_DIMMER;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWROCKER_DIMMER;
 
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.library.types.IncreaseDecreaseType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileContext;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.IncreaseDecreaseType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileContext;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 
 /**
  * The {@link RawRockerDimmerProfile} transforms rocker switch channel events into dimmer commands.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerNextPreviousProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerNextPreviousProfile.java
index cab72ec3428..31f70bb2cfc 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerNextPreviousProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerNextPreviousProfile.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWROCKER_NEXT_PREVIOUS;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWROCKER_NEXT_PREVIOUS;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.items.PlayerItem;
-import org.eclipse.smarthome.core.library.types.NextPreviousType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.items.PlayerItem;
+import org.openhab.core.library.types.NextPreviousType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.State;
 
 /**
  * The {@link RawRockerNextPreviousProfile} transforms rocker switch channel events into NEXT and PREVIOUS commands. Can
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerOnOffProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerOnOffProfile.java
index 2ab0a98f296..d0886cd9bc3 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerOnOffProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerOnOffProfile.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWROCKER_ON_OFF;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWROCKER_ON_OFF;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.State;
 
 /**
  * The {@link RawRockerOnOffProfile} transforms rocker switch channel events into ON and OFF commands.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerPlayPauseProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerPlayPauseProfile.java
index 023bd68b5e4..caefe072a72 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerPlayPauseProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerPlayPauseProfile.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWROCKER_PLAY_PAUSE;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWROCKER_PLAY_PAUSE;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.items.PlayerItem;
-import org.eclipse.smarthome.core.library.types.PlayPauseType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.items.PlayerItem;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.State;
 
 /**
  * The {@link RawRockerPlayPauseProfile} transforms rocker switch channel events into PLAY and PAUSE commands. Can be
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerRewindFastforwardProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerRewindFastforwardProfile.java
index bdcd204879c..13c2f4305f4 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerRewindFastforwardProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerRewindFastforwardProfile.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWROCKER_REWIND_FASTFORWARD;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWROCKER_REWIND_FASTFORWARD;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.items.PlayerItem;
-import org.eclipse.smarthome.core.library.types.RewindFastforwardType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.items.PlayerItem;
+import org.openhab.core.library.types.RewindFastforwardType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.State;
 
 /**
  * The {@link RawRockerRewindFastforwardProfile} transforms rocker switch channel events into REWIND and FASTFORWARD
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerStopMoveProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerStopMoveProfile.java
index 239f2c879d8..610d29c9c3e 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerStopMoveProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerStopMoveProfile.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWROCKER_STOP_MOVE;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWROCKER_STOP_MOVE;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.items.RollershutterItem;
-import org.eclipse.smarthome.core.library.types.StopMoveType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.items.RollershutterItem;
+import org.openhab.core.library.types.StopMoveType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.State;
 
 /**
  * The {@link RawRockerStopMoveProfile} transforms rocker switch channel events into STOP and MOVE commands. Can be used
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerUpDownProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerUpDownProfile.java
index c5d61dc45f8..5343f1f311e 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerUpDownProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/RawRockerUpDownProfile.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.RAWROCKER_UP_DOWN;
+import static org.openhab.core.thing.profiles.SystemProfiles.RAWROCKER_UP_DOWN;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.items.RollershutterItem;
-import org.eclipse.smarthome.core.library.types.UpDownType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.items.RollershutterItem;
+import org.openhab.core.library.types.UpDownType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.State;
 
 /**
  * The {@link RawRockerUpDownProfile} transforms rocker switch channel events into UP and DOWM commands. Can be used on
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/StateProfileTypeImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/StateProfileTypeImpl.java
index dcd0b896896..0f79914a579 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/StateProfileTypeImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/StateProfileTypeImpl.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.StateProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.StateProfileType;
 
 /**
  * Default implementation of a {@link StateProfileType}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfile.java
index 31512efea77..fd17e87cb31 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfile.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.StateProfile;
-import org.eclipse.smarthome.core.thing.profiles.SystemProfiles;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.StateProfile;
+import org.openhab.core.thing.profiles.SystemProfiles;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 
 /**
  * This is the default profile for stateful channels.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemFollowProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemFollowProfile.java
index b0a821966f0..a5d1091b40f 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemFollowProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemFollowProfile.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.StateProfile;
-import org.eclipse.smarthome.core.thing.profiles.SystemProfiles;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.StateProfile;
+import org.openhab.core.thing.profiles.SystemProfiles;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfile.java
index ed14f19deee..4a33d16e0ee 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfile.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import java.math.BigDecimal;
 
@@ -19,20 +19,20 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.unit.ImperialUnits;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileContext;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.StateProfile;
-import org.eclipse.smarthome.core.thing.profiles.SystemProfiles;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.Type;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.ImperialUnits;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.SmartHomeUnits;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileContext;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.StateProfile;
+import org.openhab.core.thing.profiles.SystemProfiles;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.Type;
+import org.openhab.core.types.UnDefType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactory.java
index e57a3028771..e38f4bcfe34 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactory.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactory.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.*;
+import static org.openhab.core.thing.profiles.SystemProfiles.*;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -25,23 +25,23 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.LocalizedKey;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.DefaultSystemChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.UID;
-import org.eclipse.smarthome.core.thing.profiles.Profile;
-import org.eclipse.smarthome.core.thing.profiles.ProfileAdvisor;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileContext;
-import org.eclipse.smarthome.core.thing.profiles.ProfileFactory;
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeProvider;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.i18n.ProfileTypeI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.util.BundleResolver;
+import org.openhab.core.i18n.LocalizedKey;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.DefaultSystemChannelTypeProvider;
+import org.openhab.core.thing.UID;
+import org.openhab.core.thing.profiles.Profile;
+import org.openhab.core.thing.profiles.ProfileAdvisor;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileContext;
+import org.openhab.core.thing.profiles.ProfileFactory;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeProvider;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.i18n.ProfileTypeI18nLocalizationService;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.util.BundleResolver;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampChangeProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampChangeProfile.java
index 6e36628cee9..062df05b9ee 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampChangeProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampChangeProfile.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.StateProfile;
-import org.eclipse.smarthome.core.thing.profiles.SystemProfiles;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.StateProfile;
+import org.openhab.core.thing.profiles.SystemProfiles;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 
 /**
  * This is the default implementation for a change timestamp profile.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampUpdateProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampUpdateProfile.java
index 49cf5bdcb6b..390b0a9aad6 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampUpdateProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TimestampUpdateProfile.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.StateProfile;
-import org.eclipse.smarthome.core.thing.profiles.SystemProfiles;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.StateProfile;
+import org.openhab.core.thing.profiles.SystemProfiles;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TriggerProfileTypeImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TriggerProfileTypeImpl.java
index 47df5fe6aec..d6c667c1603 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TriggerProfileTypeImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/TriggerProfileTypeImpl.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfileType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.TriggerProfileType;
+import org.openhab.core.thing.type.ChannelTypeUID;
 
 /**
  * Default implementation of a {@link TriggerProfileTypeImpl}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/i18n/ProfileI18nUtil.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/i18n/ProfileI18nUtil.java
index cdffc48b57b..ca773b88414 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/i18n/ProfileI18nUtil.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/profiles/i18n/ProfileI18nUtil.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles.i18n;
+package org.openhab.core.thing.internal.profiles.i18n;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.I18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.profiles.Profile;
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.i18n.ProfileTypeI18nLocalizationService;
+import org.openhab.core.i18n.I18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.profiles.Profile;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.i18n.ProfileTypeI18nLocalizationService;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/AbstractChannelTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/AbstractChannelTypeBuilder.java
index 051cbd0114f..56b5f7cf768 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/AbstractChannelTypeBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/AbstractChannelTypeBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.type;
+package org.openhab.core.thing.internal.type;
 
 import java.net.URI;
 import java.util.Collection;
@@ -20,9 +20,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeUID;
 
 /**
  * Abstract base class with common methods for {@link ChannelTypeBuilder}
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/StateChannelTypeBuilderImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/StateChannelTypeBuilderImpl.java
index 63926014fca..8103b05896f 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/StateChannelTypeBuilderImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/StateChannelTypeBuilderImpl.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.type;
+package org.openhab.core.thing.internal.type;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.type.AutoUpdatePolicy;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.StateChannelTypeBuilder;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.thing.type.AutoUpdatePolicy;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.StateChannelTypeBuilder;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.StateDescription;
 
 /**
  * StateChannelTypeBuilder to create {@link ChannelType}s of kind STATE
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/TriggerChannelTypeBuilderImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/TriggerChannelTypeBuilderImpl.java
index da26ccd2679..14a7af96d3c 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/TriggerChannelTypeBuilderImpl.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/type/TriggerChannelTypeBuilderImpl.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.type;
+package org.openhab.core.thing.internal.type;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.TriggerChannelTypeBuilder;
-import org.eclipse.smarthome.core.types.EventDescription;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.TriggerChannelTypeBuilder;
+import org.openhab.core.types.EventDescription;
 
 /**
  * Implementation of {@link TriggerChannelTypeBuilder} to build {@link ChannelType}s of kind TRIGGER
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLink.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLink.java
index 36f83e19ac5..440b5a74e0f 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLink.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLink.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link;
+package org.openhab.core.thing.link;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
-import org.eclipse.smarthome.core.items.ItemUtil;
-import org.eclipse.smarthome.core.thing.UID;
+import org.openhab.core.common.registry.Identifiable;
+import org.openhab.core.items.ItemUtil;
+import org.openhab.core.thing.UID;
 
 /**
  * {@link AbstractLink} is the abstract base class of all links.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLinkRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLinkRegistry.java
index 48729400b67..3baa731ddbc 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLinkRegistry.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/AbstractLinkRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link;
+package org.openhab.core.thing.link;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -21,9 +21,9 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.AbstractRegistry;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.thing.UID;
+import org.openhab.core.common.registry.AbstractRegistry;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.thing.UID;
 
 /**
  * {@link AbstractLinkRegistry} is an abstract class for link based registries,
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLink.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLink.java
index ec304c615f2..bcc7900c7ca 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLink.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLink.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link;
+package org.openhab.core.thing.link;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.thing.ChannelUID;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.items.Item;
+import org.openhab.core.thing.ChannelUID;
 
 /**
  * {@link ItemChannelLink} defines a link between an {@link Item} and a {@link Channel}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkProvider.java
index 44e6461de1d..f27bc532547 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkProvider.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link;
+package org.openhab.core.thing.link;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.Provider;
+import org.openhab.core.common.registry.Provider;
 
 /**
  * The {@link ItemChannelLinkProvider} is responsible for providing item channel
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkRegistry.java
index c3362a4e2b0..03d7d25c8ea 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkRegistry.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ItemChannelLinkRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link;
+package org.openhab.core.thing.link;
 
 import java.util.Objects;
 import java.util.Set;
@@ -19,15 +19,15 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.UID;
-import org.eclipse.smarthome.core.thing.link.events.LinkEventFactory;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.UID;
+import org.openhab.core.thing.link.events.LinkEventFactory;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ManagedItemChannelLinkProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ManagedItemChannelLinkProvider.java
index 447d2fa37e3..b512e1260bf 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ManagedItemChannelLinkProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ManagedItemChannelLinkProvider.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link;
+package org.openhab.core.thing.link;
 
 import java.util.Collection;
 
-import org.eclipse.smarthome.core.common.registry.DefaultAbstractManagedProvider;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.common.registry.DefaultAbstractManagedProvider;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.thing.ThingUID;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ThingLinkManager.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ThingLinkManager.java
index 8a884913666..03178ada781 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ThingLinkManager.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/ThingLinkManager.java
@@ -10,32 +10,32 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link;
+package org.openhab.core.thing.link;
 
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.events.AbstractTypedEventSubscriber;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.events.ThingStatusInfoChangedEvent;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.util.ThingHandlerHelper;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.events.AbstractTypedEventSubscriber;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.events.ThingStatusInfoChangedEvent;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.util.ThingHandlerHelper;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -57,10 +57,10 @@
  *         ThingSetupManager)
  * @author Markus Rathgeb - Send link notification if item and link exists and unlink on the first removal
  */
-@Component(immediate = true, configurationPid = "org.eclipse.smarthome.links", service = { ThingLinkManager.class,
+@Component(immediate = true, configurationPid = "org.openhab.core.links", service = { ThingLinkManager.class,
         EventSubscriber.class }, property = { "service.config.description.uri:String=system:links",
                 "service.config.label:String=Item Linking", "service.config.category:String=system",
-                "service.pid:String=org.eclipse.smarthome.links" })
+                "service.pid:String=org.openhab.core.links" })
 @NonNullByDefault
 public class ThingLinkManager extends AbstractTypedEventSubscriber<ThingStatusInfoChangedEvent> {
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/AbstractLinkDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/AbstractLinkDTO.java
index a2fe912a0a4..c9ad5f2dea5 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/AbstractLinkDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/AbstractLinkDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link.dto;
+package org.openhab.core.thing.link.dto;
 
 /**
  * This is an abstract class for link data transfer object that is used to serialize links.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/ItemChannelLinkDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/ItemChannelLinkDTO.java
index 712a043ccb1..3610680227e 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/ItemChannelLinkDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/dto/ItemChannelLinkDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link.dto;
+package org.openhab.core.thing.link.dto;
 
 import java.util.Map;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/AbstractItemChannelLinkRegistryEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/AbstractItemChannelLinkRegistryEvent.java
index 9a5e14f26c2..68a72ba3c3f 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/AbstractItemChannelLinkRegistryEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/AbstractItemChannelLinkRegistryEvent.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link.events;
+package org.openhab.core.thing.link.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.thing.link.dto.ItemChannelLinkDTO;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.thing.link.dto.ItemChannelLinkDTO;
 
 /**
  * {@link AbstractItemChannelLinkRegistryEvent} is an abstract class for item channel link events.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkAddedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkAddedEvent.java
index dc95c8af987..00895272488 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkAddedEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkAddedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link.events;
+package org.openhab.core.thing.link.events;
 
-import org.eclipse.smarthome.core.thing.link.dto.ItemChannelLinkDTO;
+import org.openhab.core.thing.link.dto.ItemChannelLinkDTO;
 
 /**
  * A {@link ItemChannelLinkAddedEvent} notifies subscribers that an item channel link has been added.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkRemovedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkRemovedEvent.java
index ccbb9d886a1..4515018816b 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkRemovedEvent.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/ItemChannelLinkRemovedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link.events;
+package org.openhab.core.thing.link.events;
 
-import org.eclipse.smarthome.core.thing.link.dto.ItemChannelLinkDTO;
+import org.openhab.core.thing.link.dto.ItemChannelLinkDTO;
 
 /**
  * A {@link ItemChannelLinkRemovedEvent} notifies subscribers that an item channel link has been removed.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/LinkEventFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/LinkEventFactory.java
index 910030fe88a..43d00bbb133 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/LinkEventFactory.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/link/events/LinkEventFactory.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link.events;
+package org.openhab.core.thing.link.events;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.events.AbstractEventFactory;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
-import org.eclipse.smarthome.core.thing.link.AbstractLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.dto.ItemChannelLinkDTO;
+import org.openhab.core.events.AbstractEventFactory;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
+import org.openhab.core.thing.link.AbstractLink;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.dto.ItemChannelLinkDTO;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/Profile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/Profile.java
index 9711de326d8..6b96579a3eb 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/Profile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/Profile.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.State;
 
 /**
  * Common ancestor of all profile types.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileAdvisor.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileAdvisor.java
index c9e7e869ec1..6fcfb522c8f 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileAdvisor.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileAdvisor.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.type.ChannelType;
 
 /**
  * Implementors can give advice which {@link Profile}s can/should be used for a given link.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileCallback.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileCallback.java
index 1c779ca8bf0..f1effb1e312 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileCallback.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileCallback.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 
 /**
  * Gives access to the framework features for continuing the communication flow.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileContext.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileContext.java
index c4c77a3d636..7983d963622 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileContext.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileContext.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import java.util.concurrent.ScheduledExecutorService;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 
 /**
  * The profile's context
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileFactory.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileFactory.java
index 727ebfa42a6..46f6b67c8aa 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileFactory.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import java.util.Collection;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileType.java
index 2eb872f9c90..5e97580109c 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileType.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileType.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import java.util.Collection;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
+import org.openhab.core.common.registry.Identifiable;
 
 /**
  * Describes a profile type.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeBuilder.java
index 0f473e214f9..ef54c35f41e 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeBuilder.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.internal.profiles.StateProfileTypeImpl;
-import org.eclipse.smarthome.core.thing.internal.profiles.TriggerProfileTypeImpl;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.internal.profiles.StateProfileTypeImpl;
+import org.openhab.core.thing.internal.profiles.TriggerProfileTypeImpl;
+import org.openhab.core.thing.type.ChannelTypeUID;
 
 /**
  * Builder for {@link ProfileType} instances.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeProvider.java
index d69ad6a8fb2..f246f4fdf33 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import java.util.Collection;
 import java.util.Locale;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeRegistry.java
index 2a4ef030ff9..d3bf06882d7 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeRegistry.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeUID.java
index 67756617faf..9b6360bd470 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeUID.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileTypeUID.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.UID;
+import org.openhab.core.thing.UID;
 
 /**
  * Identifier of a profile type.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfile.java
index 02e2a71c992..30f4f6110a0 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfile.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 
 /**
  * A {@link StateProfile} defined the communication for channels of STATE kind.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfileType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfileType.java
index 75933e53d3a..28cdea13752 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfileType.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/StateProfileType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import java.util.Collection;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/SystemProfiles.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/SystemProfiles.java
index eab47eec7cc..0d53114392f 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/SystemProfiles.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/SystemProfiles.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
-import static org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID.SYSTEM_SCOPE;
+import static org.openhab.core.thing.profiles.ProfileTypeUID.SYSTEM_SCOPE;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.thing.DefaultSystemChannelTypeProvider;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.thing.DefaultSystemChannelTypeProvider;
 
 /**
  * System profile constants.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfile.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfile.java
index e1e1316012c..d1de9508816 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfile.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfile.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfileType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfileType.java
index 09fa7af9bac..65f0e6902d6 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfileType.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/TriggerProfileType.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles;
+package org.openhab.core.thing.profiles;
 
 import java.util.Collection;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ChannelTypeUID;
 
 /**
  * Describes a {@link TriggerProfile} type.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTO.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTO.java
index 37716fb8a74..93e7a414891 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTO.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles.dto;
+package org.openhab.core.thing.profiles.dto;
 
 import java.util.Collection;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTOMapper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTOMapper.java
index e7880fb8603..c110250887d 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTOMapper.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/dto/ProfileTypeDTOMapper.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles.dto;
+package org.openhab.core.thing.profiles.dto;
 
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfileType;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.TriggerProfileType;
 
 /**
  * The {@link ProfileTypeDTOMapper} is an utility class to map profile-types into profile-type data transfer
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/i18n/ProfileTypeI18nLocalizationService.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/i18n/ProfileTypeI18nLocalizationService.java
index d16f434744b..258dfddc70a 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/i18n/ProfileTypeI18nLocalizationService.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/i18n/ProfileTypeI18nLocalizationService.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles.i18n;
+package org.openhab.core.thing.profiles.i18n;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.internal.profiles.i18n.ProfileI18nUtil;
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeBuilder;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.StateProfileType;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfileType;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.internal.profiles.i18n.ProfileI18nUtil;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeBuilder;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.StateProfileType;
+import org.openhab.core.thing.profiles.TriggerProfileType;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AbstractDescriptionType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AbstractDescriptionType.java
index 05f95b2ab82..2bb4a889287 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AbstractDescriptionType.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AbstractDescriptionType.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
-import org.eclipse.smarthome.core.thing.UID;
+import org.openhab.core.common.registry.Identifiable;
+import org.openhab.core.thing.UID;
 
 /**
  * The {@link AbstractDescriptionType} class is the base class for a {@link ThingType},
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AutoUpdatePolicy.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AutoUpdatePolicy.java
index 05cdc937637..a3db49a72bd 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AutoUpdatePolicy.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/AutoUpdatePolicy.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 /**
  * A binding's recommendation to the framework whether a state update should be automatically sent to an item if a
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/BridgeType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/BridgeType.java
index 457d2c370be..ae3434a1fe7 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/BridgeType.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/BridgeType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.net.URI;
 import java.util.List;
@@ -18,8 +18,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.ThingTypeUID;
 
 /**
  * The {@link BridgeType} describes a concrete type of a {@link Bridge}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinition.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinition.java
index 521ffd00af1..c7c597a80a2 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinition.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinition.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.Collections;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.Thing;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.Thing;
 
 /**
  * The {@link ChannelDefinition} class defines a {@link Channel} of a {@link ThingType}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinitionBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinitionBuilder.java
index d53446148a3..f3bb29b761a 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinitionBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelDefinitionBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.Map;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupDefinition.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupDefinition.java
index 7ab5d277cf2..5c322acf5bc 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupDefinition.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupDefinition.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
-import org.eclipse.smarthome.core.thing.Thing;
+import org.openhab.core.thing.Thing;
 
 /**
  * The {@link ChannelGroupDefinition} class defines a {@link ChannelGroupType} of a {@link ThingType}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupType.java
index 3746996d2f5..aee18e82382 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupType.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeBuilder.java
index 4c60fabd9cc..4692a52c143 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.List;
 
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeProvider.java
index 73c1be9464c..f539d562ae3 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.Collection;
 import java.util.Locale;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeRegistry.java
index fac48b7dd95..ef4b3a609f7 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeRegistry.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeUID.java
index 6718283798d..42c24c4c3d1 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeUID.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelGroupTypeUID.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
-import org.eclipse.smarthome.core.thing.UID;
+import org.openhab.core.thing.UID;
 
 /**
  * The {@link ChannelGroupTypeUID} represents a unique identifier for channel group types.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelKind.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelKind.java
index f15a140d575..02c73829175 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelKind.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelKind.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 /**
  * Kind of the channel.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelType.java
index 3b7685b3777..3cb2ee4fe39 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelType.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.net.URI;
 import java.util.Collections;
@@ -18,11 +18,11 @@
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.EventDescription;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.EventDescription;
+import org.openhab.core.types.StateDescription;
 
 /**
  * The {@link ChannelType} describes a concrete type of a {@link Channel}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeBuilder.java
index 66da7d1c3b8..81bfb3b46b4 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeBuilder.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.net.URI;
 import java.util.Collection;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.internal.type.StateChannelTypeBuilderImpl;
-import org.eclipse.smarthome.core.thing.internal.type.TriggerChannelTypeBuilderImpl;
+import org.openhab.core.thing.internal.type.StateChannelTypeBuilderImpl;
+import org.openhab.core.thing.internal.type.TriggerChannelTypeBuilderImpl;
 
 /**
  * Interface for ChannelTypeBuilder
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeProvider.java
index 0c431d3b7d2..c25cb5b61a4 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeRegistry.java
index f3cc7f9a553..e0b9229257b 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeRegistry.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeUID.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeUID.java
index cdacaea05fb..91d16c53794 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeUID.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ChannelTypeUID.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
-import org.eclipse.smarthome.core.thing.UID;
+import org.openhab.core.thing.UID;
 
 /**
  * The {@link ChannelTypeUID} represents a unique identifier for channel types.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicCommandDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicCommandDescriptionProvider.java
index dd436f3284e..9f0bd1aaaa4 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicCommandDescriptionProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicCommandDescriptionProvider.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.types.CommandDescription;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.types.CommandDescription;
 
 /**
  * Implementations may provide channel specific {@link CommandDescription}s. Therefore the provider must be registered
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicStateDescriptionProvider.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicStateDescriptionProvider.java
index 997559531ad..433b89a9836 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicStateDescriptionProvider.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/DynamicStateDescriptionProvider.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.types.StateDescription;
 
 /**
  * The {@link DynamicStateDescriptionProvider} is responsible for providing {@link StateDescription} for a channel
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/StateChannelTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/StateChannelTypeBuilder.java
index f9f829766d9..301a5ed2170 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/StateChannelTypeBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/StateChannelTypeBuilder.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.CommandOption;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.CommandOption;
+import org.openhab.core.types.StateDescription;
 
 /**
  * Interface for builders for {@link ChannelType}s of kind STATE
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingType.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingType.java
index 76c616bfbcd..f93720846d1 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingType.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.net.URI;
 import java.util.Collections;
@@ -19,9 +19,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
 
 /**
  * The {@link ThingType} describes a concrete type of a {@link Thing}.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeBuilder.java
index 5e752179ec8..dc6b3838a3a 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.net.URI;
 import java.util.List;
@@ -19,7 +19,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingTypeUID;
 
 /**
  * A {@link ThingType} builder.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeRegistry.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeRegistry.java
index 6ad29d71209..8cdd42302fc 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeRegistry.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/ThingTypeRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -20,10 +20,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.ThingTypeProvider;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/TriggerChannelTypeBuilder.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/TriggerChannelTypeBuilder.java
index 6f195b6472e..e03ecb87457 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/TriggerChannelTypeBuilder.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/type/TriggerChannelTypeBuilder.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.EventDescription;
+import org.openhab.core.types.EventDescription;
 
 /**
  * Interface for builders for {@link ChannelType}s of kind TRIGGER
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHandlerHelper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHandlerHelper.java
index 4e079ee5cd5..81d4e60edd4 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHandlerHelper.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHandlerHelper.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.util;
+package org.openhab.core.thing.util;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.ThingHandler;
 
 /**
  * This class provides utility methods related to the {@link ThingHandler} class.
diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHelper.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHelper.java
index f77921979bd..e83b235e22f 100644
--- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHelper.java
+++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/util/ThingHelper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.util;
+package org.openhab.core.thing.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,19 +24,19 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.UID;
-import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.dto.ChannelDTO;
-import org.eclipse.smarthome.core.thing.dto.ChannelDTOMapper;
-import org.eclipse.smarthome.core.thing.dto.ThingDTO;
-import org.eclipse.smarthome.core.thing.internal.BridgeImpl;
-import org.eclipse.smarthome.core.thing.internal.ThingImpl;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.UID;
+import org.openhab.core.thing.binding.builder.BridgeBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.dto.ChannelDTO;
+import org.openhab.core.thing.dto.ChannelDTOMapper;
+import org.openhab.core.thing.dto.ThingDTO;
+import org.openhab.core.thing.internal.BridgeImpl;
+import org.openhab.core.thing.internal.ThingImpl;
 
 /**
  * {@link ThingHelper} provides a utility method to create and bind items.
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelGroupUIDTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelGroupUIDTest.java
index 977995f4e6f..57bd273a25d 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelGroupUIDTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelGroupUIDTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelTest.java
index 8f30b7cfe9f..1e57dfc1155 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelUIDTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelUIDTest.java
index af57cf8c163..21d701e486c 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelUIDTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ChannelUIDTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import static org.junit.Assert.*;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ThingUIDTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ThingUIDTest.java
index 62be987e7e7..07246bde399 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ThingUIDTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/ThingUIDTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import static org.junit.Assert.*;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/UIDTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/UIDTest.java
index ca8a4924c6e..f39307f0981 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/UIDTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/UIDTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ChannelBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ChannelBuilderTest.java
index a98d26d909e..3da23e77a50 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ChannelBuilderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ChannelBuilderTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.builder;
+package org.openhab.core.thing.binding.builder;
 
-import static org.eclipse.smarthome.core.thing.DefaultSystemChannelTypeProvider.SYSTEM_OUTDOOR_TEMPERATURE;
+import static org.openhab.core.thing.DefaultSystemChannelTypeProvider.SYSTEM_OUTDOOR_TEMPERATURE;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
@@ -20,13 +20,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingBuilderTest.java
index 3c52c41e71a..70052d8965c 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingBuilderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.builder;
+package org.openhab.core.thing.binding.builder;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -20,12 +20,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.internal.BridgeImpl;
-import org.eclipse.smarthome.core.thing.internal.ThingImpl;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.internal.BridgeImpl;
+import org.openhab.core.thing.internal.ThingImpl;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilderTest.java
index ff77fb9d6b1..9c77eb780ff 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/builder/ThingStatusInfoBuilderTest.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.builder;
+package org.openhab.core.thing.binding.builder;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/firmware/FirmwareEventFactoryTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/firmware/FirmwareEventFactoryTest.java
index 9c73fc54243..8d26949d045 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/firmware/FirmwareEventFactoryTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/firmware/FirmwareEventFactoryTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
@@ -19,11 +19,11 @@
 import java.util.Arrays;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressStep;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.events.Event;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.ProgressStep;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/AutoUpdateManagerTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/AutoUpdateManagerTest.java
index 35d76363b16..48eb0aa183d 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/AutoUpdateManagerTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/AutoUpdateManagerTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.eq;
@@ -23,27 +23,27 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.items.events.ItemStateEvent;
-import org.eclipse.smarthome.core.items.events.ItemStatePredictedEvent;
-import org.eclipse.smarthome.core.library.items.StringItem;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.type.AutoUpdatePolicy;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.MetadataRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.items.events.ItemStateEvent;
+import org.openhab.core.items.events.ItemStatePredictedEvent;
+import org.openhab.core.library.items.StringItem;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.type.AutoUpdatePolicy;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ChannelItemProviderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ChannelItemProviderTest.java
index 20a528529c3..a556610dd5a 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ChannelItemProviderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ChannelItemProviderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -24,23 +24,23 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemFactory;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemFactory;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingImplTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingImplTest.java
index ec052fe5e7e..916eb759181 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingImplTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingImplTest.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import static org.junit.Assert.*;
 
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingManagerImplTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingManagerImplTest.java
index 22d611e670b..76691a880f0 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingManagerImplTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/ThingManagerImplTest.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import org.eclipse.smarthome.core.service.ReadyService;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.util.BundleResolver;
+import org.openhab.core.service.ReadyService;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.util.BundleResolver;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/firmware/ProgressCallbackTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/firmware/ProgressCallbackTest.java
index be0ae0d0164..3290f53f957 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/firmware/ProgressCallbackTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/firmware/ProgressCallbackTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.firmware;
+package org.openhab.core.thing.internal.firmware;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -22,22 +22,22 @@
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareBuilder;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressCallback;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressStep;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateProgressInfoEvent;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateResult;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateResultInfoEvent;
-import org.eclipse.smarthome.core.util.BundleResolver;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareBuilder;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.thing.binding.firmware.ProgressCallback;
+import org.openhab.core.thing.binding.firmware.ProgressStep;
+import org.openhab.core.thing.firmware.FirmwareUpdateProgressInfoEvent;
+import org.openhab.core.thing.firmware.FirmwareUpdateResult;
+import org.openhab.core.thing.firmware.FirmwareUpdateResultInfoEvent;
+import org.openhab.core.util.BundleResolver;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfileTest.java
index 4f34422742d..ba40e44f103 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfileTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonOnOffSwitchProfileTest.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.Command;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java
index 9c01deee3c0..23f3419a645 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfileTest.java
index 82003e6c289..14d7d9858af 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfileTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemDefaultProfileTest.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.thing.profiles.ProfileCallback;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemFollowProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemFollowProfileTest.java
index fa6d9280102..d7d2af1c734 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemFollowProfileTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemFollowProfileTest.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.thing.profiles.ProfileCallback;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfileTest.java
index 614ffc59a23..5014286b2f5 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfileTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/SystemOffsetProfileTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.number.IsCloseTo.closeTo;
@@ -20,15 +20,15 @@
 import javax.measure.Unit;
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.unit.ImperialUnits;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileContext;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.ImperialUnits;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileContext;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/TimestampProfileTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/TimestampProfileTest.java
index a033bf36d91..a5083c7b378 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/TimestampProfileTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/profiles/TimestampProfileTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.*;
@@ -18,11 +18,11 @@
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.types.State;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelGroupTypeBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelGroupTypeBuilderTest.java
index 5b3872a7178..375f588a0f8 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelGroupTypeBuilderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelGroupTypeBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelTypeBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelTypeBuilderTest.java
index 4b2b918bc0b..d65ed210b4e 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelTypeBuilderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ChannelTypeBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -22,10 +22,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.types.EventDescription;
-import org.eclipse.smarthome.core.types.EventOption;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.types.EventDescription;
+import org.openhab.core.types.EventOption;
+import org.openhab.core.types.StateDescription;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ThingTypeBuilderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ThingTypeBuilderTest.java
index 48ef0ee09f9..57fc4344869 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ThingTypeBuilderTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/type/ThingTypeBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -25,7 +25,7 @@
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingTypeUID;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHandlerHelperTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHandlerHelperTest.java
index 0d24e5bba47..31b07f2e487 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHandlerHelperTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHandlerHelperTest.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.util;
+package org.openhab.core.thing.util;
 
-import static org.eclipse.smarthome.core.thing.binding.builder.ThingStatusInfoBuilder.create;
-import static org.eclipse.smarthome.core.thing.util.ThingHandlerHelper.isHandlerInitialized;
+import static org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder.create;
+import static org.openhab.core.thing.util.ThingHandlerHelper.isHandlerInitialized;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHelperTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHelperTest.java
index 59c4be5d881..7f1060baeab 100644
--- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHelperTest.java
+++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/util/ThingHelperTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.util;
+package org.openhab.core.thing.util;
 
 import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toList;
@@ -18,14 +18,14 @@
 
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.internal.ThingImpl;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.internal.ThingImpl;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.transform/bnd.bnd b/bundles/org.openhab.core.transform/bnd.bnd
index 5d1af861918..b2874b99566 100644
--- a/bundles/org.openhab.core.transform/bnd.bnd
+++ b/bundles/org.openhab.core.transform/bnd.bnd
@@ -1,2 +1,2 @@
 Bundle-SymbolicName: ${project.artifactId}
-Bundle-Activator: org.eclipse.smarthome.core.transform.internal.TransformationActivator
\ No newline at end of file
+Bundle-Activator: org.openhab.core.transform.internal.TransformationActivator
\ No newline at end of file
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
index 53b1a582d9b..329a6c055c0 100644
--- a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
+++ b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.transform;
+package org.openhab.core.transform;
 
 import static java.nio.file.StandardWatchEventKinds.*;
 
@@ -31,8 +31,8 @@
 import org.apache.commons.io.FilenameUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.i18n.LocaleProvider;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationException.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationException.java
index 59c5ba045ea..3cabb7c359f 100644
--- a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationException.java
+++ b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.transform;
+package org.openhab.core.transform;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationHelper.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationHelper.java
index c1cdcbdc5ad..4ef6db345d4 100644
--- a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationHelper.java
+++ b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationHelper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.transform;
+package org.openhab.core.transform;
 
 import java.util.Collection;
 import java.util.IllegalFormatException;
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationService.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationService.java
index 25b0bf5e3a2..2bb3efbe957 100644
--- a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationService.java
+++ b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/TransformationService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.transform;
+package org.openhab.core.transform;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/actions/Transformation.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/actions/Transformation.java
index bd887f0b0d9..0d54b39e727 100644
--- a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/actions/Transformation.java
+++ b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/actions/Transformation.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.transform.actions;
+package org.openhab.core.transform.actions;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.transform.TransformationException;
-import org.eclipse.smarthome.core.transform.TransformationHelper;
-import org.eclipse.smarthome.core.transform.TransformationService;
-import org.eclipse.smarthome.core.transform.internal.TransformationActivator;
+import org.openhab.core.transform.TransformationException;
+import org.openhab.core.transform.TransformationHelper;
+import org.openhab.core.transform.TransformationService;
+import org.openhab.core.transform.internal.TransformationActivator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/internal/TransformationActivator.java b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/internal/TransformationActivator.java
index afa6fe82c89..bc266854ef1 100644
--- a/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/internal/TransformationActivator.java
+++ b/bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/internal/TransformationActivator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.transform.internal;
+package org.openhab.core.transform.internal;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/actions/TransformationTest.java b/bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/actions/TransformationTest.java
index 1e134d4a8ff..a76cf096937 100644
--- a/bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/actions/TransformationTest.java
+++ b/bundles/org.openhab.core.transform/src/test/java/org/openhab/core/transform/actions/TransformationTest.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.transform.actions;
+package org.openhab.core.transform.actions;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.transform.TransformationException;
+import org.openhab.core.transform.TransformationException;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/AbstractResourceIconProvider.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/AbstractResourceIconProvider.java
index a7e9959befe..9f8cc537c7a 100644
--- a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/AbstractResourceIconProvider.java
+++ b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/AbstractResourceIconProvider.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.icon;
+package org.openhab.core.ui.icon;
 
 import java.io.InputStream;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.ui.icon.IconSet.Format;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.ui.icon.IconSet.Format;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconProvider.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconProvider.java
index 85971d057f9..ad9b0b70334 100644
--- a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconProvider.java
+++ b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconProvider.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.icon;
+package org.openhab.core.ui.icon;
 
 import java.io.InputStream;
 import java.util.Locale;
 import java.util.Set;
 
-import org.eclipse.smarthome.ui.icon.IconSet.Format;
+import org.openhab.core.ui.icon.IconSet.Format;
 
 /**
  * An icon provider can provide {@link InputStream}s for icons.
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconSet.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconSet.java
index 5d02b46d80d..8a13f4bc9d0 100644
--- a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconSet.java
+++ b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/IconSet.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.icon;
+package org.openhab.core.ui.icon;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/CustomIconProvider.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/CustomIconProvider.java
index a72f8114c93..0ce06d87cb1 100644
--- a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/CustomIconProvider.java
+++ b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/CustomIconProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.icon.internal;
+package org.openhab.core.ui.icon.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,10 +20,10 @@
 import java.util.Locale;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.ui.icon.AbstractResourceIconProvider;
-import org.eclipse.smarthome.ui.icon.IconProvider;
-import org.eclipse.smarthome.ui.icon.IconSet;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.ui.icon.AbstractResourceIconProvider;
+import org.openhab.core.ui.icon.IconProvider;
+import org.openhab.core.ui.icon.IconSet;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconServlet.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconServlet.java
index e53681db463..bc8866aa399 100644
--- a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconServlet.java
+++ b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconServlet.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.icon.internal;
+package org.openhab.core.ui.icon.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,9 +26,9 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.io.http.servlet.SmartHomeServlet;
-import org.eclipse.smarthome.ui.icon.IconProvider;
-import org.eclipse.smarthome.ui.icon.IconSet.Format;
+import org.openhab.core.io.http.servlet.SmartHomeServlet;
+import org.openhab.core.ui.icon.IconProvider;
+import org.openhab.core.ui.icon.IconSet.Format;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconSetResource.java b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconSetResource.java
index 8114e830ac8..b0829c7a909 100644
--- a/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconSetResource.java
+++ b/bundles/org.openhab.core.ui.icon/src/main/java/org/openhab/core/ui/icon/internal/IconSetResource.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.icon.internal;
+package org.openhab.core.ui.icon.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,10 +25,10 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
-import org.eclipse.smarthome.io.rest.LocaleService;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.ui.icon.IconProvider;
-import org.eclipse.smarthome.ui.icon.IconSet;
+import org.openhab.core.io.rest.LocaleService;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.ui.icon.IconProvider;
+import org.openhab.core.ui.icon.IconSet;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/AbstractResourceIconProviderTest.java b/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/AbstractResourceIconProviderTest.java
index 3785fb5ceb8..40755bb1bad 100644
--- a/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/AbstractResourceIconProviderTest.java
+++ b/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/AbstractResourceIconProviderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.icon;
+package org.openhab.core.ui.icon;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -24,7 +24,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.ui.icon.IconSet.Format;
+import org.openhab.core.ui.icon.IconSet.Format;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/internal/IconServletTest.java b/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/internal/IconServletTest.java
index 2bd5dcd0b3c..6bfec98f455 100644
--- a/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/internal/IconServletTest.java
+++ b/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/internal/IconServletTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.icon.internal;
+package org.openhab.core.ui.icon.internal;
 
-import static org.eclipse.smarthome.ui.icon.internal.IconServlet.*;
+import static org.openhab.core.ui.icon.internal.IconServlet.*;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -27,8 +27,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.smarthome.ui.icon.IconProvider;
-import org.eclipse.smarthome.ui.icon.IconSet.Format;
+import org.openhab.core.ui.icon.IconProvider;
+import org.openhab.core.ui.icon.IconSet.Format;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.ui/bnd.bnd b/bundles/org.openhab.core.ui/bnd.bnd
index 7ce9eb4f97b..c13a3330e6a 100644
--- a/bundles/org.openhab.core.ui/bnd.bnd
+++ b/bundles/org.openhab.core.ui/bnd.bnd
@@ -1,5 +1,5 @@
 Bundle-SymbolicName: ${project.artifactId}
-Bundle-Activator: org.eclipse.smarthome.ui.internal.UIActivator
+Bundle-Activator: org.openhab.core.ui.internal.UIActivator
 Private-Package: \
   org.knowm.xchart.*
 Import-Package: \
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/chart/ChartProvider.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/chart/ChartProvider.java
index e10e953f376..675bae67c13 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/chart/ChartProvider.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/chart/ChartProvider.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.chart;
+package org.openhab.core.ui.chart;
 
 import java.awt.image.BufferedImage;
 import java.util.Date;
 
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemNotFoundException;
 
 /**
  * Defines the interface for chart providers. A chart provider interfaces with
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/UIActivator.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/UIActivator.java
index dcbf29b0f5e..2e7b2618d4a 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/UIActivator.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/UIActivator.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal;
+package org.openhab.core.ui.internal;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
index 36c255d99b7..ea22cd18b2a 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/ChartServlet.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.chart;
+package org.openhab.core.ui.internal.chart;
 
 import java.awt.image.BufferedImage;
 import java.io.EOFException;
@@ -36,10 +36,10 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.BooleanUtils;
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.io.http.servlet.SmartHomeServlet;
-import org.eclipse.smarthome.ui.chart.ChartProvider;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.io.http.servlet.SmartHomeServlet;
+import org.openhab.core.ui.chart.ChartProvider;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -69,8 +69,8 @@
  * @author Chris Jackson - Initial contribution
  * @author Holger Reichert - Support for themes, DPI, legend hiding
  */
-@Component(immediate = true, service = ChartServlet.class, configurationPid = "org.eclipse.smarthome.chart", property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.chart",
+@Component(immediate = true, service = ChartServlet.class, configurationPid = "org.openhab.core.chart", property = {
+        Constants.SERVICE_PID + "=org.openhab.core.chart",
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system",
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=Charts",
         ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + "system:chart" })
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartTheme.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartTheme.java
index 9bea5581ad9..ebf4b02e489 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartTheme.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartTheme.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.chart.defaultchartprovider;
+package org.openhab.core.ui.internal.chart.defaultchartprovider;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBlack.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBlack.java
index 6417b323ef6..6622002e59c 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBlack.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBlack.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.chart.defaultchartprovider;
+package org.openhab.core.ui.internal.chart.defaultchartprovider;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBright.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBright.java
index 9b729613893..801fe7d4f5a 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBright.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeBright.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.chart.defaultchartprovider;
+package org.openhab.core.ui.internal.chart.defaultchartprovider;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeDark.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeDark.java
index c91b767993a..3a1566ffb72 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeDark.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeDark.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.chart.defaultchartprovider;
+package org.openhab.core.ui.internal.chart.defaultchartprovider;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeWhite.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeWhite.java
index 0534c1b33ba..7afebee5494 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeWhite.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/ChartThemeWhite.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.chart.defaultchartprovider;
+package org.openhab.core.ui.internal.chart.defaultchartprovider;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java
index 6dab7ed1756..5f83d18a007 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/chart/defaultchartprovider/DefaultChartProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.chart.defaultchartprovider;
+package org.openhab.core.ui.internal.chart.defaultchartprovider;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -28,23 +28,23 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.core.i18n.TimeZoneProvider;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.OpenClosedType;
-import org.eclipse.smarthome.core.persistence.FilterCriteria;
-import org.eclipse.smarthome.core.persistence.FilterCriteria.Ordering;
-import org.eclipse.smarthome.core.persistence.HistoricItem;
-import org.eclipse.smarthome.core.persistence.PersistenceService;
-import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry;
-import org.eclipse.smarthome.core.persistence.QueryablePersistenceService;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.ui.chart.ChartProvider;
-import org.eclipse.smarthome.ui.internal.chart.ChartServlet;
-import org.eclipse.smarthome.ui.items.ItemUIRegistry;
+import org.openhab.core.i18n.TimeZoneProvider;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.OpenClosedType;
+import org.openhab.core.persistence.FilterCriteria;
+import org.openhab.core.persistence.FilterCriteria.Ordering;
+import org.openhab.core.persistence.HistoricItem;
+import org.openhab.core.persistence.PersistenceService;
+import org.openhab.core.persistence.PersistenceServiceRegistry;
+import org.openhab.core.persistence.QueryablePersistenceService;
+import org.openhab.core.types.State;
+import org.openhab.core.ui.chart.ChartProvider;
+import org.openhab.core.ui.internal.chart.ChartServlet;
+import org.openhab.core.ui.items.ItemUIRegistry;
 import org.knowm.xchart.Chart;
 import org.knowm.xchart.ChartBuilder;
 import org.knowm.xchart.Series;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/items/ItemUIRegistryImpl.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/items/ItemUIRegistryImpl.java
index b7f9e27efea..66bc2baefce 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/items/ItemUIRegistryImpl.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/items/ItemUIRegistryImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.items;
+package org.openhab.core.ui.internal.items;
 
 import java.time.DateTimeException;
 import java.time.ZonedDateTime;
@@ -35,59 +35,59 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemBuilder;
-import org.eclipse.smarthome.core.items.ItemBuilderFactory;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemNotUniqueException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.RegistryHook;
-import org.eclipse.smarthome.core.library.items.CallItem;
-import org.eclipse.smarthome.core.library.items.ColorItem;
-import org.eclipse.smarthome.core.library.items.ContactItem;
-import org.eclipse.smarthome.core.library.items.DateTimeItem;
-import org.eclipse.smarthome.core.library.items.DimmerItem;
-import org.eclipse.smarthome.core.library.items.ImageItem;
-import org.eclipse.smarthome.core.library.items.LocationItem;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.items.PlayerItem;
-import org.eclipse.smarthome.core.library.items.RollershutterItem;
-import org.eclipse.smarthome.core.library.items.StringItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.NextPreviousType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.PlayPauseType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.transform.TransformationException;
-import org.eclipse.smarthome.core.transform.TransformationHelper;
-import org.eclipse.smarthome.core.transform.TransformationService;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.StateDescription;
-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.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;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemBuilder;
+import org.openhab.core.items.ItemBuilderFactory;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemNotUniqueException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.RegistryHook;
+import org.openhab.core.library.items.CallItem;
+import org.openhab.core.library.items.ColorItem;
+import org.openhab.core.library.items.ContactItem;
+import org.openhab.core.library.items.DateTimeItem;
+import org.openhab.core.library.items.DimmerItem;
+import org.openhab.core.library.items.ImageItem;
+import org.openhab.core.library.items.LocationItem;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.items.PlayerItem;
+import org.openhab.core.library.items.RollershutterItem;
+import org.openhab.core.library.items.StringItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.NextPreviousType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.transform.TransformationException;
+import org.openhab.core.transform.TransformationHelper;
+import org.openhab.core.transform.TransformationService;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateOption;
+import org.openhab.core.types.Type;
+import org.openhab.core.types.UnDefType;
+import org.openhab.core.types.util.UnitUtils;
+import org.openhab.core.model.sitemap.sitemap.ColorArray;
+import org.openhab.core.model.sitemap.sitemap.Default;
+import org.openhab.core.model.sitemap.sitemap.Group;
+import org.openhab.core.model.sitemap.sitemap.LinkableWidget;
+import org.openhab.core.model.sitemap.sitemap.Mapping;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
+import org.openhab.core.model.sitemap.sitemap.SitemapFactory;
+import org.openhab.core.model.sitemap.sitemap.Slider;
+import org.openhab.core.model.sitemap.sitemap.Switch;
+import org.openhab.core.model.sitemap.sitemap.VisibilityRule;
+import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.ui.internal.UIActivator;
+import org.openhab.core.ui.items.ItemUIProvider;
+import org.openhab.core.ui.items.ItemUIRegistry;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/AsyncProxyServlet.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/AsyncProxyServlet.java
index e6e35192b60..643b9608dbb 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/AsyncProxyServlet.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/AsyncProxyServlet.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.proxy;
+package org.openhab.core.ui.internal.proxy;
 
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/BlockingProxyServlet.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/BlockingProxyServlet.java
index 629fd4dd51d..7aee5f9bcdc 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/BlockingProxyServlet.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/BlockingProxyServlet.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.proxy;
+package org.openhab.core.ui.internal.proxy;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/ProxyServletService.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/ProxyServletService.java
index c75a8e43603..6f2a818a8da 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/ProxyServletService.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/proxy/ProxyServletService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.proxy;
+package org.openhab.core.ui.internal.proxy;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -31,14 +31,14 @@
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.util.B64Code;
 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.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.openhab.core.library.types.StringType;
+import org.openhab.core.types.State;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.sitemap.sitemap.Image;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
+import org.openhab.core.model.sitemap.sitemap.Video;
+import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.ui.items.ItemUIRegistry;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -75,7 +75,7 @@
  * @author Kai Kreuzer - Initial contribution
  * @author John Cocula - added optional Image/Video item= support; refactored to allow use of later spec servlet
  */
-@Component(immediate = true, property = { "service.pid=org.eclipse.smarthome.proxy" })
+@Component(immediate = true, property = { "service.pid=org.openhab.core.proxy" })
 public class ProxyServletService extends HttpServlet {
 
     /** the alias for this servlet */
diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIProvider.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIProvider.java
index f64e0046349..65d2ba9c635 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIProvider.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIProvider.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.items;
+package org.openhab.core.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.sitemap.Widget;
+import org.openhab.core.items.Item;
+import org.openhab.core.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/openhab/core/ui/items/ItemUIRegistry.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIRegistry.java
index 17afc8801b4..cb6594bc2a5 100644
--- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIRegistry.java
+++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.items;
+package org.openhab.core.ui.items;
 
 import javax.measure.Unit;
 
@@ -18,13 +18,13 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-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.sitemap.LinkableWidget;
-import org.eclipse.smarthome.model.sitemap.sitemap.Sitemap;
-import org.eclipse.smarthome.model.sitemap.sitemap.Widget;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.types.State;
+import org.openhab.core.model.sitemap.sitemap.LinkableWidget;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
+import org.openhab.core.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/openhab/core/ui/internal/items/ItemUIRegistryImplTest.java b/bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/items/ItemUIRegistryImplTest.java
index 58fa1de75f9..8776a012b4c 100644
--- a/bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/items/ItemUIRegistryImplTest.java
+++ b/bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/items/ItemUIRegistryImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.items;
+package org.openhab.core.ui.internal.items;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -23,31 +23,31 @@
 import java.util.TimeZone;
 
 import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.library.items.ColorItem;
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.types.State;
-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.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.openhab.core.i18n.UnitProvider;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.items.ColorItem;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateOption;
+import org.openhab.core.types.UnDefType;
+import org.openhab.core.types.util.UnitUtils;
+import org.openhab.core.model.sitemap.sitemap.ColorArray;
+import org.openhab.core.model.sitemap.sitemap.Mapping;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
+import org.openhab.core.model.sitemap.sitemap.SitemapFactory;
+import org.openhab.core.model.sitemap.sitemap.Slider;
+import org.openhab.core.model.sitemap.sitemap.Switch;
+import org.openhab.core.model.sitemap.sitemap.Widget;
+import org.openhab.core.ui.items.ItemUIProvider;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/proxy/ProxyServletServiceTest.java b/bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/proxy/ProxyServletServiceTest.java
index 34f1d912efd..88d662a8e3b 100644
--- a/bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/proxy/ProxyServletServiceTest.java
+++ b/bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/proxy/ProxyServletServiceTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.ui.internal.proxy;
+package org.openhab.core.ui.internal.proxy;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -25,15 +25,15 @@
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.util.B64Code;
 import org.eclipse.jetty.util.StringUtil;
-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.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.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.types.UnDefType;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.sitemap.sitemap.Image;
+import org.openhab.core.model.sitemap.sitemap.Sitemap;
+import org.openhab.core.model.sitemap.sitemap.Switch;
+import org.openhab.core.model.sitemap.sitemap.Video;
+import org.openhab.core.ui.items.ItemUIRegistry;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -58,10 +58,10 @@ public class ProxyServletServiceTest {
     private static final String ITEM_NAME_VALID_VIDEO_URL = "itemValidVideoUrl";
 
     private static final String INVALID_URL = "test";
-    private static final String ITEM_VALID_IMAGE_URL = "https://www.eclipse.org/smarthome/item.jpg";
-    private static final String ITEM_VALID_VIDEO_URL = "https://www.eclipse.org/smarthome/item.mp4";
-    private static final String VALID_IMAGE_URL = "https://www.eclipse.org/smarthome/test.jpg";
-    private static final String VALID_VIDEO_URL = "https://www.eclipse.org/smarthome/test.mp4";
+    private static final String ITEM_VALID_IMAGE_URL = "https://openhab.org/item.jpg";
+    private static final String ITEM_VALID_VIDEO_URL = "https://openhab.org/item.mp4";
+    private static final String VALID_IMAGE_URL = "https://openhab.org/test.jpg";
+    private static final String VALID_VIDEO_URL = "https://openhab.org/test.mp4";
 
     private static ProxyServletService service;
 
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStartEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStartEvent.java
index b803ecd3b18..9cea21bd17d 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStartEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStartEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A {@link STTEvent} fired when the {@link STTService} starts hearing audio.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStopEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStopEvent.java
index 1a1c7556df1..08e7bdc5d8c 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStopEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/AudioStopEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A {@link STTEvent} fired when the {@link STTService} stops hearing audio.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSErrorEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSErrorEvent.java
index af8f6d95a65..26218d6c37c 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSErrorEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSErrorEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A {@link KSEvent} fired when the {@link KSService} encounters an error.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSEvent.java
index 40c5144570f..6ab3a8a34a0 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A tagging interface for keyword spotting events.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSException.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSException.java
index 3246ddb9003..a3cd65e26b6 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSException.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * General purpose keyword spotting exception
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSListener.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSListener.java
index 8d6e05c5c86..be2be65b3f6 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSListener.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * The listener interface for receiving {@link KSEvent} events.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSService.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSService.java
index 8245e82fd92..75ce0f1157c 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSService.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSService.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 import java.util.Locale;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioStream;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioStream;
 
 /**
  * This is the interface that a keyword spotting service has to implement.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSServiceHandle.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSServiceHandle.java
index c25784ca963..80f5dae0d3e 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSServiceHandle.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSServiceHandle.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * An handle to a {@link KSService}
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSpottedEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSpottedEvent.java
index 8756ee016bc..555570cda19 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSpottedEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/KSpottedEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A {@link KSEvent} fired when the {@link KSService} spots a keyword.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStartEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStartEvent.java
index 8614cae48b4..5417e1c73bf 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStartEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStartEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A {@link STTEvent} fired when the {@link STTService} starts recognition.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStopEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStopEvent.java
index 2c2a1e41a1c..39c9a16ad9b 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStopEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/RecognitionStopEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A {@link STTEvent} fired when the {@link STTService} stops recognition.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTEvent.java
index 2a383f189e8..4b704894b95 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A tagging interface for speech-to-text events.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTException.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTException.java
index 98dc8103253..1392d5a9503 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTException.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * General purpose STT exception
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTListener.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTListener.java
index 7d978acb3c6..72fe6b2c3b0 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTListener.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * The listener interface for receiving {@link STTEvent} events.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTService.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTService.java
index 025635b37e6..736b3945ecb 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTService.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTService.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 import java.util.Locale;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioStream;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioStream;
 
 /**
  * This is the interface that a speech-to-text service has to implement.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTServiceHandle.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTServiceHandle.java
index eff3387c413..c9a28b3475f 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTServiceHandle.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/STTServiceHandle.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * An handle to a {@link STTService}
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionErrorEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionErrorEvent.java
index afbbed2aa64..28d861fe631 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionErrorEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionErrorEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A {@link STTEvent} fired when the {@link STTService} encounters an error.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionEvent.java
index 1045c916089..decc5035c2c 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechRecognitionEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A {@link STTEvent} fired when the {@link STTService} recognizes speech.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStartEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStartEvent.java
index a1da7e57c5a..71a1a87745c 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStartEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStartEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A {@link STTEvent} fired when the {@link STTService} starts hearing speech.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStopEvent.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStopEvent.java
index 598fda36030..a7be5be8014 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStopEvent.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/SpeechStopEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * A {@link STTEvent} fired when the {@link STTService} stops hearing speech.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSException.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSException.java
index 37d160491f0..7473a0edcd2 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSException.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 /**
  * General purpose TTS exception
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSService.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSService.java
index 7c04f6b90b8..d4bead2250f 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSService.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/TTSService.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 import java.util.Locale;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioStream;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioStream;
 
 /**
  * This is the interface that a text-to-speech service has to implement.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/Voice.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/Voice.java
index 4413008ee6f..66a3faa7454 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/Voice.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/Voice.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 import java.util.Locale;
 
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/VoiceManager.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/VoiceManager.java
index 4d3a5136d3a..e7e6d3c89f2 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/VoiceManager.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/VoiceManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 import java.util.Collection;
 import java.util.Locale;
@@ -18,11 +18,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.audio.AudioSource;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter;
-import org.eclipse.smarthome.core.voice.text.InterpretationException;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioSource;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.voice.text.HumanLanguageInterpreter;
+import org.openhab.core.voice.text.InterpretationException;
 
 /**
  * This service provides functionality around voice services and is the central service to be used directly by others.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/DialogProcessor.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/DialogProcessor.java
index bccc56466f1..ddb9e4fd479 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/DialogProcessor.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/DialogProcessor.java
@@ -10,41 +10,41 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import java.util.HashSet;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.audio.AudioException;
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.audio.AudioSource;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.UnsupportedAudioFormatException;
-import org.eclipse.smarthome.core.audio.UnsupportedAudioStreamException;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.ItemUtil;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.voice.KSErrorEvent;
-import org.eclipse.smarthome.core.voice.KSEvent;
-import org.eclipse.smarthome.core.voice.KSException;
-import org.eclipse.smarthome.core.voice.KSListener;
-import org.eclipse.smarthome.core.voice.KSService;
-import org.eclipse.smarthome.core.voice.KSpottedEvent;
-import org.eclipse.smarthome.core.voice.RecognitionStopEvent;
-import org.eclipse.smarthome.core.voice.STTEvent;
-import org.eclipse.smarthome.core.voice.STTException;
-import org.eclipse.smarthome.core.voice.STTListener;
-import org.eclipse.smarthome.core.voice.STTService;
-import org.eclipse.smarthome.core.voice.STTServiceHandle;
-import org.eclipse.smarthome.core.voice.SpeechRecognitionErrorEvent;
-import org.eclipse.smarthome.core.voice.SpeechRecognitionEvent;
-import org.eclipse.smarthome.core.voice.TTSException;
-import org.eclipse.smarthome.core.voice.TTSService;
-import org.eclipse.smarthome.core.voice.Voice;
-import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter;
-import org.eclipse.smarthome.core.voice.text.InterpretationException;
+import org.openhab.core.audio.AudioException;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioSource;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.UnsupportedAudioFormatException;
+import org.openhab.core.audio.UnsupportedAudioStreamException;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.ItemUtil;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.voice.KSErrorEvent;
+import org.openhab.core.voice.KSEvent;
+import org.openhab.core.voice.KSException;
+import org.openhab.core.voice.KSListener;
+import org.openhab.core.voice.KSService;
+import org.openhab.core.voice.KSpottedEvent;
+import org.openhab.core.voice.RecognitionStopEvent;
+import org.openhab.core.voice.STTEvent;
+import org.openhab.core.voice.STTException;
+import org.openhab.core.voice.STTListener;
+import org.openhab.core.voice.STTService;
+import org.openhab.core.voice.STTServiceHandle;
+import org.openhab.core.voice.SpeechRecognitionErrorEvent;
+import org.openhab.core.voice.SpeechRecognitionEvent;
+import org.openhab.core.voice.TTSException;
+import org.openhab.core.voice.TTSService;
+import org.openhab.core.voice.Voice;
+import org.openhab.core.voice.text.HumanLanguageInterpreter;
+import org.openhab.core.voice.text.InterpretationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceConsoleCommandExtension.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceConsoleCommandExtension.java
index 368b670405f..7b7012732e9 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceConsoleCommandExtension.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceConsoleCommandExtension.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import java.util.Arrays;
 import java.util.List;
@@ -18,18 +18,18 @@
 
 import org.apache.commons.lang.ArrayUtils;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemNotUniqueException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.voice.TTSService;
-import org.eclipse.smarthome.core.voice.Voice;
-import org.eclipse.smarthome.core.voice.VoiceManager;
-import org.eclipse.smarthome.core.voice.text.InterpretationException;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemNotUniqueException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.voice.TTSService;
+import org.openhab.core.voice.Voice;
+import org.openhab.core.voice.VoiceManager;
+import org.openhab.core.voice.text.InterpretationException;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java
index 28200e85d3a..17f1b62524e 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/VoiceManagerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import static java.util.stream.Collectors.*;
 
@@ -30,27 +30,27 @@
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigOptionProvider;
-import org.eclipse.smarthome.config.core.ConfigurableService;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.audio.AudioSource;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.UnsupportedAudioFormatException;
-import org.eclipse.smarthome.core.audio.UnsupportedAudioStreamException;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.voice.KSService;
-import org.eclipse.smarthome.core.voice.STTService;
-import org.eclipse.smarthome.core.voice.TTSException;
-import org.eclipse.smarthome.core.voice.TTSService;
-import org.eclipse.smarthome.core.voice.Voice;
-import org.eclipse.smarthome.core.voice.VoiceManager;
-import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter;
-import org.eclipse.smarthome.core.voice.text.InterpretationException;
+import org.openhab.core.config.core.ConfigOptionProvider;
+import org.openhab.core.config.core.ConfigurableService;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioSource;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.UnsupportedAudioFormatException;
+import org.openhab.core.audio.UnsupportedAudioStreamException;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.voice.KSService;
+import org.openhab.core.voice.STTService;
+import org.openhab.core.voice.TTSException;
+import org.openhab.core.voice.TTSService;
+import org.openhab.core.voice.Voice;
+import org.openhab.core.voice.VoiceManager;
+import org.openhab.core.voice.text.HumanLanguageInterpreter;
+import org.openhab.core.voice.text.InterpretationException;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -71,8 +71,8 @@
  * @author Christoph Weitkamp - Added parameter to adjust the volume
  * @author Wouter Born - Sort TTS options
  */
-@Component(immediate = true, configurationPid = "org.eclipse.smarthome.voice", property = { //
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.voice", //
+@Component(immediate = true, configurationPid = "org.openhab.core.voice", property = { //
+        Constants.SERVICE_PID + "=org.openhab.core.voice", //
         ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=system", //
         ConfigurableService.SERVICE_PROPERTY_LABEL + "=Voice", //
         ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=" + VoiceManagerImpl.CONFIG_URI //
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/text/StandardInterpreter.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/text/StandardInterpreter.java
index f43c3d16b80..cf24bc6590d 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/text/StandardInterpreter.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/internal/text/StandardInterpreter.java
@@ -10,24 +10,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal.text;
+package org.openhab.core.voice.internal.text;
 
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.IncreaseDecreaseType;
-import org.eclipse.smarthome.core.library.types.NextPreviousType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PlayPauseType;
-import org.eclipse.smarthome.core.library.types.RewindFastforwardType;
-import org.eclipse.smarthome.core.library.types.StopMoveType;
-import org.eclipse.smarthome.core.library.types.UpDownType;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.voice.text.AbstractRuleBasedInterpreter;
-import org.eclipse.smarthome.core.voice.text.Expression;
-import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.IncreaseDecreaseType;
+import org.openhab.core.library.types.NextPreviousType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.library.types.RewindFastforwardType;
+import org.openhab.core.library.types.StopMoveType;
+import org.openhab.core.library.types.UpDownType;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.voice.text.AbstractRuleBasedInterpreter;
+import org.openhab.core.voice.text.Expression;
+import org.openhab.core.voice.text.HumanLanguageInterpreter;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ASTNode.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ASTNode.java
index 4b5f2b26b80..20dd2fba038 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ASTNode.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ASTNode.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 /**
  * Abstract syntax tree node. Result of parsing an expression.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/AbstractRuleBasedInterpreter.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/AbstractRuleBasedInterpreter.java
index aa7c3efba96..6d319008cdd 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/AbstractRuleBasedInterpreter.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/AbstractRuleBasedInterpreter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -22,16 +22,16 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Expression.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Expression.java
index 7579a065677..e04c099d0df 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Expression.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Expression.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionAlternatives.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionAlternatives.java
index bfe9f157c16..ddd18eb2384 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionAlternatives.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionAlternatives.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionCardinality.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionCardinality.java
index 60ce566dc45..7d004984aad 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionCardinality.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionCardinality.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionIdentifier.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionIdentifier.java
index 4850d1a911c..26ae8b19408 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionIdentifier.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionIdentifier.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.HashSet;
 import java.util.ResourceBundle;
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionLet.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionLet.java
index 30b94384a8f..b19f7bd83c8 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionLet.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionLet.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionMatch.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionMatch.java
index 9139e56d86e..f979151615e 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionMatch.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionMatch.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.ResourceBundle;
 import java.util.Set;
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionSequence.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionSequence.java
index 5bb914b57fc..ade7ccc3f49 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionSequence.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/ExpressionSequence.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/HumanLanguageInterpreter.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/HumanLanguageInterpreter.java
index b58cb08a7a4..1a6d367d0d3 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/HumanLanguageInterpreter.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/HumanLanguageInterpreter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.Locale;
 import java.util.Set;
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationException.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationException.java
index 0886f27a872..488e2e242f4 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationException.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 /**
  * An exception used by {@link HumanLanguageInterpreter}s, if an error occurs.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationResult.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationResult.java
index b489fe3866b..5b43d534d51 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationResult.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/InterpretationResult.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 /**
  * Bundles results of an interpretation. Represents final outcome and user feedback. This class is immutable.
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Rule.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Rule.java
index 0dda23f5c46..b7d76a5c918 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Rule.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/Rule.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.ResourceBundle;
 
diff --git a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/TokenList.java b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/TokenList.java
index 2ead087e6e9..62baf22b735 100644
--- a/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/TokenList.java
+++ b/bundles/org.openhab.core.voice/src/main/java/org/openhab/core/voice/text/TokenList.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.text;
+package org.openhab.core.voice.text;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/STTExceptionTest.java b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/STTExceptionTest.java
index 3bf6f047c5e..f943a8653c5 100644
--- a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/STTExceptionTest.java
+++ b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/STTExceptionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionErrorEventTest.java b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionErrorEventTest.java
index a659eb13889..58f27b0d9bb 100644
--- a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionErrorEventTest.java
+++ b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionErrorEventTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionEventTest.java b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionEventTest.java
index 6a8458bfdb1..58ff264eb3a 100644
--- a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionEventTest.java
+++ b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/SpeechRecognitionEventTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/TTSExceptionTest.java b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/TTSExceptionTest.java
index 14521e1c466..4a6b71e8f79 100644
--- a/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/TTSExceptionTest.java
+++ b/bundles/org.openhab.core.voice/src/test/java/org/openhab/core/voice/TTSExceptionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice;
+package org.openhab.core.voice;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Authentication.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Authentication.java
index 91219dd0e7a..3d9e8c753d9 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Authentication.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Authentication.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth;
+package org.openhab.core.auth;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationException.java
index 088546f602b..7885a87db1e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationException.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth;
+package org.openhab.core.auth;
 
 /**
  * Base type for exceptions thrown by authentication layer.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationManager.java
index fda698814d9..009b1e78ad8 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationManager.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth;
+package org.openhab.core.auth;
 
 /**
  * Authentication manager is main entry point for all places which are interested in securing requests and verifying
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationProvider.java
index d6dc49f2194..df7aad8f96e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/AuthenticationProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth;
+package org.openhab.core.auth;
 
 /**
  * Realizations of this type are responsible for checking validity of various credentials and giving back authentication
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Credentials.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Credentials.java
index f00134a0ed2..a696ae0c916 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Credentials.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Credentials.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth;
+package org.openhab.core.auth;
 
 /**
  * Marker interface for credentials which can be handled by authentication providers.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Role.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Role.java
index 6dcd4fada3c..62ca5e5e21c 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Role.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/Role.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth;
+package org.openhab.core.auth;
 
 /**
  * Interface defining constants for roles within ESH.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/SecurityException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/SecurityException.java
index 5c7f010d4c3..e80b3739467 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/SecurityException.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/SecurityException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth;
+package org.openhab.core.auth;
 
 /**
  * Base type for exceptions reporting security concerns.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UnsupportedCredentialsException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UnsupportedCredentialsException.java
index 1a959bf0d28..a10b360ab4c 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UnsupportedCredentialsException.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UnsupportedCredentialsException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth;
+package org.openhab.core.auth;
 
 /**
  * A dedicated exception thrown when extracted credentials can not be matched with any authentication provider.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UsernamePasswordCredentials.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UsernamePasswordCredentials.java
index c38ffc1a795..da5fb0b6adb 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UsernamePasswordCredentials.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/UsernamePasswordCredentials.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth;
+package org.openhab.core.auth;
 
 /**
  * Credentials which represent user name and password.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenRefreshListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenRefreshListener.java
index 8f2b38bf2a0..efe86fed345 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenRefreshListener.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenRefreshListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth.client.oauth2;
+package org.openhab.core.auth.client.oauth2;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenResponse.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenResponse.java
index e0e4e678c8a..fdd387875fb 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenResponse.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/AccessTokenResponse.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth.client.oauth2;
+package org.openhab.core.auth.client.oauth2;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthClientService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthClientService.java
index 35313aaf8a6..e1946c4e2b7 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthClientService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthClientService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth.client.oauth2;
+package org.openhab.core.auth.client.oauth2;
 
 import java.io.IOException;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthException.java
index 578bcb53306..f48ef72032a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthException.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth.client.oauth2;
+package org.openhab.core.auth.client.oauth2;
 
 /**
  * For all exceptions arising during oauth.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthFactory.java
index 4df0866eefa..5a5c0f17475 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth.client.oauth2;
+package org.openhab.core.auth.client.oauth2;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthResponseException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthResponseException.java
index d1386771243..ff6a2840317 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthResponseException.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/OAuthResponseException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth.client.oauth2;
+package org.openhab.core.auth.client.oauth2;
 
 /**
  * This is an exception class for OAUTH specific errors. i.e. The error responses described in the
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/StorageCipher.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/StorageCipher.java
index e06a49e547e..df5c6935052 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/StorageCipher.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/auth/client/oauth2/StorageCipher.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth.client.oauth2;
+package org.openhab.core.auth.client.oauth2;
 
 import java.security.GeneralSecurityException;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfo.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfo.java
index 666664d3cbf..4a3fc656cb2 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfo.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfo.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding;
+package org.openhab.core.binding;
 
 import java.net.URI;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
+import org.openhab.core.common.registry.Identifiable;
 
 /**
  * The {@link BindingInfo} class contains general information about a binding.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoProvider.java
index cbd45c425f6..5b267b82e6d 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding;
+package org.openhab.core.binding;
 
 import java.util.Locale;
 import java.util.Set;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoRegistry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoRegistry.java
index 1439ad17535..c82519d0d88 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoRegistry.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/BindingInfoRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding;
+package org.openhab.core.binding;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/dto/BindingInfoDTO.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/dto/BindingInfoDTO.java
index 87f556d8423..0c26ef4b1fc 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/dto/BindingInfoDTO.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/dto/BindingInfoDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.dto;
+package org.openhab.core.binding.dto;
 
 /**
  * This is a data transfer object that is used to serialize binding info objects.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/i18n/BindingI18nLocalizationService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/i18n/BindingI18nLocalizationService.java
index 3be7acbfb45..6a35eea8748 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/i18n/BindingI18nLocalizationService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/i18n/BindingI18nLocalizationService.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.i18n;
+package org.openhab.core.binding.i18n;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.binding.BindingInfo;
-import org.eclipse.smarthome.core.binding.internal.i18n.BindingI18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.binding.BindingInfo;
+import org.openhab.core.binding.internal.i18n.BindingI18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/internal/i18n/BindingI18nUtil.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/internal/i18n/BindingI18nUtil.java
index 574656be9e5..e8d09449005 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/internal/i18n/BindingI18nUtil.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/binding/internal/i18n/BindingI18nUtil.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.internal.i18n;
+package org.openhab.core.binding.internal.i18n;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.I18nUtil;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
+import org.openhab.core.i18n.I18nUtil;
+import org.openhab.core.i18n.TranslationProvider;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCache.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCache.java
index 29838af5eb5..2cd1c6b9a48 100755
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCache.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCache.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.cache;
+package org.openhab.core.cache;
 
 import java.lang.ref.SoftReference;
 import java.time.Duration;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheAsync.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheAsync.java
index fa982ca5480..eb9f3030b36 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheAsync.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheAsync.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.cache;
+package org.openhab.core.cache;
 
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
@@ -20,7 +20,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 /**
- * Complementary class to {@link org.eclipse.smarthome.core.cache.ExpiringCache}, implementing an asynchronous variant
+ * Complementary class to {@link org.openhab.core.cache.ExpiringCache}, implementing an asynchronous variant
  * of an expiring cache. An instance returns the cached value immediately to the callback if not expired yet, otherwise
  * issue a fetch in another thread and notify callback implementors asynchronously.
  *
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheMap.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheMap.java
index d355c2573a5..c34ef9f3ffe 100755
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheMap.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/cache/ExpiringCacheMap.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.cache;
+package org.openhab.core.cache;
 
 import java.time.Duration;
 import java.util.Collection;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/AbstractUID.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/AbstractUID.java
index 7214fd8ed43..bf75d117625 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/AbstractUID.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/AbstractUID.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common;
+package org.openhab.core.common;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/NamedThreadFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/NamedThreadFactory.java
index 298af98174f..50da13c51e0 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/NamedThreadFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/NamedThreadFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common;
+package org.openhab.core.common;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java
index 7b1bbc3d51c..15c3068a51f 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common;
+package org.openhab.core.common;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedTransferQueue;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCaller.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCaller.java
index 23cca669205..06512772038 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCaller.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCaller.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common;
+package org.openhab.core.common;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCallerBuilder.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCallerBuilder.java
index 33b86dfdef0..ff959fd49ee 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCallerBuilder.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/SafeCallerBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common;
+package org.openhab.core.common;
 
 import java.util.function.Consumer;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadFactoryBuilder.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadFactoryBuilder.java
index 1904dccc57b..8929083f7e6 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadFactoryBuilder.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadFactoryBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common;
+package org.openhab.core.common;
 
 import static java.util.concurrent.Executors.defaultThreadFactory;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadPoolManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadPoolManager.java
index 5b607442062..5a2deda50e6 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadPoolManager.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/ThreadPoolManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common;
+package org.openhab.core.common;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -22,7 +22,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.smarthome.core.internal.common.WrappedScheduledExecutorService;
+import org.openhab.core.internal.common.WrappedScheduledExecutorService;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,7 +38,7 @@
  * <p>
  * The configuration can be done as
  * <br/>
- * {@code org.eclipse.smarthome.threadpool:<poolName>=<poolSize>}
+ * {@code org.openhab.core.threadpool:<poolName>=<poolSize>}
  * <br/>
  * All threads will time out after {@link THREAD_TIMEOUT}.
  *
@@ -47,7 +47,7 @@
 @Component(configurationPid = ThreadPoolManager.CONFIGURATION_PID)
 public class ThreadPoolManager {
 
-    public static final String CONFIGURATION_PID = "org.eclipse.smarthome.threadpool";
+    public static final String CONFIGURATION_PID = "org.openhab.core.threadpool";
 
     /**
      * The common thread pool is reserved for occasional, light weight tasks that run quickly, and
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/osgi/ResourceBundleClassLoader.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/osgi/ResourceBundleClassLoader.java
index 653252cde1e..ce736a6362c 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/osgi/ResourceBundleClassLoader.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/osgi/ResourceBundleClassLoader.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.osgi;
+package org.openhab.core.common.osgi;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractManagedProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractManagedProvider.java
index a37ca257ffd..91638353394 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractManagedProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractManagedProvider.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.registry;
+package org.openhab.core.common.registry;
 
 import java.util.Collection;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractProvider.java
index eeeba480c17..f768a09a144 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.registry;
+package org.openhab.core.common.registry;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java
index f4573b1ac6c..5bdf75fd962 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.registry;
+package org.openhab.core.common.registry;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Collection;
@@ -30,8 +30,8 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/DefaultAbstractManagedProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/DefaultAbstractManagedProvider.java
index 64e11bbbd23..8cdc7d80fe0 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/DefaultAbstractManagedProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/DefaultAbstractManagedProvider.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.registry;
+package org.openhab.core.common.registry;
 
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.storage.StorageService;
 
 /**
  * {@link DefaultAbstractManagedProvider} is a specific {@link AbstractManagedProvider} implementation, where the stored
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Identifiable.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Identifiable.java
index fb8a89e1bea..4e06f50ab45 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Identifiable.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Identifiable.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.registry;
+package org.openhab.core.common.registry;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ManagedProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ManagedProvider.java
index 75e2cceec5e..fc0c6256a13 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ManagedProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ManagedProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.registry;
+package org.openhab.core.common.registry;
 
 import org.eclipse.jdt.annotation.NonNull;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Provider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Provider.java
index 4b3c9fdf7f1..b2bf703464a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Provider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Provider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.registry;
+package org.openhab.core.common.registry;
 
 import java.util.Collection;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ProviderChangeListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ProviderChangeListener.java
index 06159118093..91bed95928a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ProviderChangeListener.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/ProviderChangeListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.registry;
+package org.openhab.core.common.registry;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Registry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Registry.java
index 6606c190f59..e590ed39573 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Registry.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/Registry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.registry;
+package org.openhab.core.common.registry;
 
 import java.util.Collection;
 import java.util.stream.Stream;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/RegistryChangeListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/RegistryChangeListener.java
index dc3c0702407..493494e54c0 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/RegistryChangeListener.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/RegistryChangeListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.registry;
+package org.openhab.core.common.registry;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEvent.java
index 9c67fd458fe..68777fa50f2 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEvent.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.events;
+package org.openhab.core.events;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEventFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEventFactory.java
index e3ecde6b757..f8f0c9df49b 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEventFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractEventFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.events;
+package org.openhab.core.events;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractTypedEventSubscriber.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractTypedEventSubscriber.java
index 1cefb0e46ab..e91ddfa8a96 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractTypedEventSubscriber.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/AbstractTypedEventSubscriber.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.events;
+package org.openhab.core.events;
 
 import java.util.Collections;
 import java.util.Set;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/Event.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/Event.java
index 5c817610220..dac6abfd0b1 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/Event.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/Event.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.events;
+package org.openhab.core.events;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFactory.java
index 751447f4159..b6900ec355f 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.events;
+package org.openhab.core.events;
 
 import java.util.Set;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFilter.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFilter.java
index 92dbbbdd73c..110fbb17858 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFilter.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventFilter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.events;
+package org.openhab.core.events;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventPublisher.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventPublisher.java
index bb828407ce4..68bb6e80b70 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventPublisher.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventPublisher.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.events;
+package org.openhab.core.events;
 
 /**
  * The {@link EventPublisher} posts {@link Event}s through the openHAB event bus in an asynchronous way.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventSubscriber.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventSubscriber.java
index deb1b7c538a..4fe9413b50b 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventSubscriber.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/EventSubscriber.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.events;
+package org.openhab.core.events;
 
 import java.util.Set;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicEventFilter.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicEventFilter.java
index 777371a0f88..99c0de920e7 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicEventFilter.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicEventFilter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.events;
+package org.openhab.core.events;
 
 /**
  * The {@link TopicEventFilter} is a default openHAB {@link EventFilter} implementation that ensures filtering
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/Extension.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/Extension.java
index 8049ac81e67..5bd6d655f7a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/Extension.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/Extension.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.extension;
+package org.openhab.core.extension;
 
 /**
  * This class defines an extension.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEvent.java
index c6f7c60a08a..05b0faded14 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.extension;
+package org.openhab.core.extension;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
+import org.openhab.core.events.AbstractEvent;
 
 /**
  * This is an {@link Event} that is sent on extension operations, such as installing and uninstalling.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEventFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEventFactory.java
index 8cb2b2bdc4c..2337df4d6d8 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEventFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionEventFactory.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.extension;
+package org.openhab.core.extension;
 
 import java.util.Collections;
 
-import org.eclipse.smarthome.core.events.AbstractEventFactory;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
+import org.openhab.core.events.AbstractEventFactory;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionService.java
index 4048fadd3f9..a16c8694f15 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.extension;
+package org.openhab.core.extension;
 
 import java.net.URI;
 import java.util.List;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionType.java
index 2657ce05f6c..be6a45c4148 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/extension/ExtensionType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.extension;
+package org.openhab.core.extension;
 
 /**
  * This class defines an extension type.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/I18nUtil.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/I18nUtil.java
index dc1acd36048..e3460928e39 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/I18nUtil.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/I18nUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.i18n;
+package org.openhab.core.i18n;
 
 import java.util.function.Supplier;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocaleProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocaleProvider.java
index dfe7ce68746..ee6bf1c7b9f 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocaleProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocaleProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.i18n;
+package org.openhab.core.i18n;
 
 import java.util.Locale;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocalizedKey.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocalizedKey.java
index d120b7cb2d3..c6c49ebeff6 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocalizedKey.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocalizedKey.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.i18n;
+package org.openhab.core.i18n;
 
 import java.util.Objects;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocationProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocationProvider.java
index 07f259af472..563ca22608c 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocationProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/LocationProvider.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.i18n;
+package org.openhab.core.i18n;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.library.types.PointType;
+import org.openhab.core.library.types.PointType;
 
 /**
  * This interface describes a provider for a location.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TimeZoneProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TimeZoneProvider.java
index f5ad0f12ec4..86f8cf97084 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TimeZoneProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TimeZoneProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.i18n;
+package org.openhab.core.i18n;
 
 import java.time.ZoneId;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TranslationProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TranslationProvider.java
index 9d6dd320eb0..21e621ee20a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TranslationProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/TranslationProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.i18n;
+package org.openhab.core.i18n;
 
 import java.util.Locale;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/UnitProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/UnitProvider.java
index 849ba559252..51c1cc696fa 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/UnitProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/i18n/UnitProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.i18n;
+package org.openhab.core.i18n;
 
 import javax.measure.Quantity;
 import javax.measure.Unit;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/auth/AuthenticationManagerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/auth/AuthenticationManagerImpl.java
index e8e2373e0b5..5b35a0a630c 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/auth/AuthenticationManagerImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/auth/AuthenticationManagerImpl.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.auth;
+package org.openhab.core.internal.auth;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.eclipse.smarthome.core.auth.Authentication;
-import org.eclipse.smarthome.core.auth.AuthenticationException;
-import org.eclipse.smarthome.core.auth.AuthenticationManager;
-import org.eclipse.smarthome.core.auth.AuthenticationProvider;
-import org.eclipse.smarthome.core.auth.Credentials;
-import org.eclipse.smarthome.core.auth.UnsupportedCredentialsException;
+import org.openhab.core.auth.Authentication;
+import org.openhab.core.auth.AuthenticationException;
+import org.openhab.core.auth.AuthenticationManager;
+import org.openhab.core.auth.AuthenticationProvider;
+import org.openhab.core.auth.Credentials;
+import org.openhab.core.auth.UnsupportedCredentialsException;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/AbstractInvocationHandler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/AbstractInvocationHandler.java
index 2eefccc2be5..4b67c310a63 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/AbstractInvocationHandler.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/AbstractInvocationHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/CombinedClassLoader.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/CombinedClassLoader.java
index 9b82983b2f4..fe3bafdda95 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/CombinedClassLoader.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/CombinedClassLoader.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/DuplicateExecutionException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/DuplicateExecutionException.java
index 44872539d9f..793d5cf91d0 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/DuplicateExecutionException.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/DuplicateExecutionException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 /**
  * Denotes that there already is a thread occupied by the same context.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/Invocation.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/Invocation.java
index 3c1afbcca84..a2269f3e606 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/Invocation.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/Invocation.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import java.lang.reflect.Method;
 import java.util.Deque;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerAsync.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerAsync.java
index 5aafcf0512c..644a7ffcfa2 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerAsync.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerAsync.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerSync.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerSync.java
index a42accf3c24..c353ce047e7 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerSync.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/InvocationHandlerSync.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManager.java
index bae397cb002..e36777442fd 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManager.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import java.util.concurrent.ExecutorService;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManagerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManagerImpl.java
index fa904e0d30c..e6a05d1a19b 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManagerImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallManagerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import java.util.HashMap;
 import java.util.LinkedList;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerBuilderImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerBuilderImpl.java
index b051a46357e..174e92566ba 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerBuilderImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerBuilderImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
@@ -22,8 +22,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.common.SafeCallerBuilder;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.common.SafeCallerBuilder;
 
 /**
  * Builder implementation to create safe-call wrapper objects.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerImpl.java
index 24c6a3b7749..0b4c2749405 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/SafeCallerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -19,9 +19,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.common.SafeCallerBuilder;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.common.SafeCallerBuilder;
+import org.openhab.core.common.ThreadPoolManager;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -33,7 +33,7 @@
  * @author Simon Kaufmann - Initial contribution
  */
 @NonNullByDefault
-@Component(configurationPid = "org.eclipse.smarthome.safecaller", immediate = true)
+@Component(configurationPid = "org.openhab.core.safecaller", immediate = true)
 public class SafeCallerImpl implements SafeCaller {
 
     private static final String SAFE_CALL_POOL_NAME = "safeCall";
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/WrappedScheduledExecutorService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/WrappedScheduledExecutorService.java
index eb96964caf4..3286b66a7ee 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/WrappedScheduledExecutorService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/common/WrappedScheduledExecutorService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/EventHandler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/EventHandler.java
index 56a91fbce42..e3e27b445e4 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/EventHandler.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/EventHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.events;
+package org.openhab.core.internal.events;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -24,11 +24,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.NamedThreadFactory;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
+import org.openhab.core.common.NamedThreadFactory;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventManager.java
index 8379a919df5..1532205258a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventManager.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.events;
+package org.openhab.core.internal.events;
 
 import java.util.Collections;
 import java.util.Map;
@@ -18,9 +18,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
-import org.eclipse.smarthome.core.events.EventSubscriber;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
+import org.openhab.core.events.EventSubscriber;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventPublisher.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventPublisher.java
index 13d5da29ca2..ec4d3c36bc2 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventPublisher.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/OSGiEventPublisher.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.events;
+package org.openhab.core.internal.events;
 
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
@@ -18,8 +18,8 @@
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.event.EventAdmin;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/ThreadedEventHandler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/ThreadedEventHandler.java
index 6727c800ee1..33841ba6ed3 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/ThreadedEventHandler.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/events/ThreadedEventHandler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.events;
+package org.openhab.core.internal.events;
 
 import java.io.Closeable;
 import java.util.Collections;
@@ -22,8 +22,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.events.EventFactory;
-import org.eclipse.smarthome.core.events.EventSubscriber;
+import org.openhab.core.events.EventFactory;
+import org.openhab.core.events.EventSubscriber;
 import org.osgi.service.event.Event;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
index 7a7960136d7..f78c71ed5c2 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.i18n;
+package org.openhab.core.internal.i18n;
 
-import static org.eclipse.smarthome.core.library.unit.MetricPrefix.HECTO;
+import static org.openhab.core.library.unit.MetricPrefix.HECTO;
 
 import java.text.MessageFormat;
 import java.time.DateTimeException;
@@ -37,16 +37,16 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.i18n.LocationProvider;
-import org.eclipse.smarthome.core.i18n.TimeZoneProvider;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.library.dimension.Intensity;
-import org.eclipse.smarthome.core.library.types.PointType;
-import org.eclipse.smarthome.core.library.unit.ImperialUnits;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.i18n.LocationProvider;
+import org.openhab.core.i18n.TimeZoneProvider;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.library.dimension.Intensity;
+import org.openhab.core.library.types.PointType;
+import org.openhab.core.library.unit.ImperialUnits;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.SmartHomeUnits;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.ComponentContext;
@@ -76,8 +76,8 @@
  * @author Stefan Triller - Initial contribution
  * @author Erdoan Hadzhiyusein - Added time zone
  */
-@Component(immediate = true, configurationPid = "org.eclipse.smarthome.i18n", property = {
-        Constants.SERVICE_PID + "=org.eclipse.smarthome.i18n", //
+@Component(immediate = true, configurationPid = "org.openhab.core.i18n", property = {
+        Constants.SERVICE_PID + "=org.openhab.core.i18n", //
         "service.config.label=Regional Settings", //
         "service.config.category=system", //
         "service.config.description.uri=system:i18n" })
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/LanguageResourceBundleManager.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/LanguageResourceBundleManager.java
index d1148f15b63..998a0f0b338 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/LanguageResourceBundleManager.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/LanguageResourceBundleManager.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.i18n;
+package org.openhab.core.internal.i18n;
 
 import java.io.File;
 import java.net.URL;
@@ -21,8 +21,8 @@
 import java.util.ResourceBundle;
 import java.util.ResourceBundle.Control;
 
-import org.eclipse.smarthome.core.common.osgi.ResourceBundleClassLoader;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
+import org.openhab.core.common.osgi.ResourceBundleClassLoader;
+import org.openhab.core.i18n.LocaleProvider;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/ResourceBundleTracker.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/ResourceBundleTracker.java
index 70a4c815ca4..ff91de1334d 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/ResourceBundleTracker.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/ResourceBundleTracker.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.i18n;
+package org.openhab.core.internal.i18n;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -18,7 +18,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
+import org.openhab.core.i18n.LocaleProvider;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/GroupFunctionHelper.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/GroupFunctionHelper.java
index 048661d2cec..3eb6f938bba 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/GroupFunctionHelper.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/GroupFunctionHelper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import java.util.List;
 
@@ -18,13 +18,13 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.dto.GroupFunctionDTO;
-import org.eclipse.smarthome.core.library.types.ArithmeticGroupFunction;
-import org.eclipse.smarthome.core.library.types.DateTimeGroupFunction;
-import org.eclipse.smarthome.core.library.types.QuantityTypeArithmeticGroupFunction;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.dto.GroupFunctionDTO;
+import org.openhab.core.library.types.ArithmeticGroupFunction;
+import org.openhab.core.library.types.DateTimeGroupFunction;
+import org.openhab.core.library.types.QuantityTypeArithmeticGroupFunction;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.types.State;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderFactoryImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderFactoryImpl.java
index 45022428f32..e4d9b248510 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderFactoryImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderFactoryImpl.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemBuilder;
-import org.eclipse.smarthome.core.items.ItemBuilderFactory;
-import org.eclipse.smarthome.core.items.ItemFactory;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemBuilder;
+import org.openhab.core.items.ItemBuilderFactory;
+import org.openhab.core.items.ItemFactory;
+import org.openhab.core.library.CoreItemFactory;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
@@ -57,7 +57,7 @@ protected void removeItemFactory(ItemFactory itemFactory) {
         itemFactories.remove(itemFactory);
     }
 
-    @Reference(target = "(component.name=org.eclipse.smarthome.core.library.CoreItemFactory)")
+    @Reference(target = "(component.name=org.openhab.core.library.CoreItemFactory)")
     protected void setCoreItemFactory(ItemFactory coreItemFactory) {
         itemFactories.add(coreItemFactory);
     }
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderImpl.java
index 5af8adf6ca7..6fa3fd074f3 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemBuilderImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -21,12 +21,12 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.ActiveItem;
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemBuilder;
-import org.eclipse.smarthome.core.items.ItemFactory;
+import org.openhab.core.items.ActiveItem;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemBuilder;
+import org.openhab.core.items.ItemFactory;
 
 /**
  * The {@link ItemBuilder} implementation.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemRegistryImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemRegistryImpl.java
index 8ab76ba3f35..d8beea9b5f2 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemRegistryImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemRegistryImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import static java.util.stream.Collectors.toList;
 
@@ -21,25 +21,25 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.AbstractRegistry;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemNotUniqueException;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.ItemStateConverter;
-import org.eclipse.smarthome.core.items.ItemUtil;
-import org.eclipse.smarthome.core.items.ManagedItemProvider;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
-import org.eclipse.smarthome.core.items.RegistryHook;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.service.CommandDescriptionService;
-import org.eclipse.smarthome.core.service.StateDescriptionService;
+import org.openhab.core.common.registry.AbstractRegistry;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemNotUniqueException;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.ItemStateConverter;
+import org.openhab.core.items.ItemUtil;
+import org.openhab.core.items.ManagedItemProvider;
+import org.openhab.core.items.MetadataRegistry;
+import org.openhab.core.items.RegistryHook;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.service.CommandDescriptionService;
+import org.openhab.core.service.StateDescriptionService;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemStateConverterImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemStateConverterImpl.java
index 17266b8b896..1b5cf9a2685 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemStateConverterImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemStateConverterImpl.java
@@ -10,23 +10,23 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import javax.measure.Quantity;
 import javax.measure.Unit;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemStateConverter;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.UnDefType;
-import org.eclipse.smarthome.core.types.util.UnitUtils;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemStateConverter;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.UnDefType;
+import org.openhab.core.types.util.UnitUtils;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemUpdater.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemUpdater.java
index c4fa802b763..0cdb97a3197 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemUpdater.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ItemUpdater.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.AbstractItemEventSubscriber;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemStateEvent;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.AbstractItemEventSubscriber;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemStateEvent;
+import org.openhab.core.types.State;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ManagedMetadataProviderImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ManagedMetadataProviderImpl.java
index 1c68c490bd7..17a96f1bd16 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ManagedMetadataProviderImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/ManagedMetadataProviderImpl.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.AbstractManagedProvider;
-import org.eclipse.smarthome.core.items.ManagedMetadataProvider;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataPredicates;
-import org.eclipse.smarthome.core.items.MetadataProvider;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.common.registry.AbstractManagedProvider;
+import org.openhab.core.items.ManagedMetadataProvider;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataPredicates;
+import org.openhab.core.items.MetadataProvider;
+import org.openhab.core.storage.StorageService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/MetadataRegistryImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/MetadataRegistryImpl.java
index af28f6414dc..47aa629214b 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/MetadataRegistryImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/items/MetadataRegistryImpl.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.AbstractRegistry;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.ManagedMetadataProvider;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataProvider;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
+import org.openhab.core.common.registry.AbstractRegistry;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.ManagedMetadataProvider;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataProvider;
+import org.openhab.core.items.MetadataRegistry;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/library/unit/UnitInitializer.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/library/unit/UnitInitializer.java
index 55b05e2d8c5..6f77bd79583 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/library/unit/UnitInitializer.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/library/unit/UnitInitializer.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.library.unit;
+package org.openhab.core.internal.library.unit;
 
-import org.eclipse.smarthome.core.library.unit.ImperialUnits;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
+import org.openhab.core.library.unit.ImperialUnits;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.SmartHomeUnits;
 
 /**
  * Make sure static blocks from {@link SIUnits} & {@link ImperialUnits} are executed to initialize the unit parser.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronAdjuster.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronAdjuster.java
index 247ee315f35..636f84aedd7 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronAdjuster.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronAdjuster.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import java.time.DayOfWeek;
 import java.time.temporal.ChronoField;
@@ -31,7 +31,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.scheduler.SchedulerTemporalAdjuster;
+import org.openhab.core.scheduler.SchedulerTemporalAdjuster;
 
 /**
  * This class creates a {@link TemporalAdjuster} that takes a temporal and adjust it to the next deadline based on a
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronSchedulerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronSchedulerImpl.java
index e0023a0d9be..7f003fa364e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronSchedulerImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronSchedulerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -21,11 +21,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.scheduler.CronJob;
-import org.eclipse.smarthome.core.scheduler.CronScheduler;
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
-import org.eclipse.smarthome.core.scheduler.Scheduler;
-import org.eclipse.smarthome.core.scheduler.SchedulerRunnable;
+import org.openhab.core.scheduler.CronJob;
+import org.openhab.core.scheduler.CronScheduler;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.scheduler.Scheduler;
+import org.openhab.core.scheduler.SchedulerRunnable;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/DelegatedSchedulerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/DelegatedSchedulerImpl.java
index 5b22e4dab66..a00fb181be6 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/DelegatedSchedulerImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/DelegatedSchedulerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -21,10 +21,10 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
-import org.eclipse.smarthome.core.scheduler.Scheduler;
-import org.eclipse.smarthome.core.scheduler.SchedulerRunnable;
-import org.eclipse.smarthome.core.scheduler.SchedulerTemporalAdjuster;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.scheduler.Scheduler;
+import org.openhab.core.scheduler.SchedulerRunnable;
+import org.openhab.core.scheduler.SchedulerTemporalAdjuster;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicAdjuster.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicAdjuster.java
index 374dcb1d7ad..610c89dc0d0 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicAdjuster.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicAdjuster.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import java.time.Duration;
 import java.time.temporal.Temporal;
@@ -19,7 +19,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.scheduler.SchedulerTemporalAdjuster;
+import org.openhab.core.scheduler.SchedulerTemporalAdjuster;
 
 /**
  * This is a Temporal Adjuster that takes a list of delays.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImpl.java
index 74823d03070..f869e4c823e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImpl.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import java.time.Duration;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.scheduler.PeriodicScheduler;
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
-import org.eclipse.smarthome.core.scheduler.Scheduler;
-import org.eclipse.smarthome.core.scheduler.SchedulerRunnable;
+import org.openhab.core.scheduler.PeriodicScheduler;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.scheduler.Scheduler;
+import org.openhab.core.scheduler.SchedulerRunnable;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/SchedulerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/SchedulerImpl.java
index a2cb1d465c4..deb4fbe397d 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/SchedulerImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/SchedulerImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -30,11 +30,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
-import org.eclipse.smarthome.core.scheduler.Scheduler;
-import org.eclipse.smarthome.core.scheduler.SchedulerRunnable;
-import org.eclipse.smarthome.core.scheduler.SchedulerTemporalAdjuster;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.scheduler.Scheduler;
+import org.openhab.core.scheduler.SchedulerRunnable;
+import org.openhab.core.scheduler.SchedulerTemporalAdjuster;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/BundleResolverImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/BundleResolverImpl.java
index f4076117ddb..03d7c08e509 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/BundleResolverImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/BundleResolverImpl.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.service;
+package org.openhab.core.internal.service;
 
-import org.eclipse.smarthome.core.util.BundleResolver;
+import org.openhab.core.util.BundleResolver;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.component.annotations.Component;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/CommandDescriptionServiceImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/CommandDescriptionServiceImpl.java
index da3704e26fd..1c933e9fa5a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/CommandDescriptionServiceImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/CommandDescriptionServiceImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.service;
+package org.openhab.core.internal.service;
 
 import java.util.List;
 import java.util.Locale;
@@ -18,9 +18,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.service.CommandDescriptionService;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.CommandDescriptionProvider;
+import org.openhab.core.service.CommandDescriptionService;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.CommandDescriptionProvider;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/ReadyServiceImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/ReadyServiceImpl.java
index b8cf8d5c44f..2ca79f26bfd 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/ReadyServiceImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/ReadyServiceImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.service;
+package org.openhab.core.internal.service;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -20,9 +20,9 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Consumer;
 
-import org.eclipse.smarthome.core.service.ReadyMarker;
-import org.eclipse.smarthome.core.service.ReadyMarkerFilter;
-import org.eclipse.smarthome.core.service.ReadyService;
+import org.openhab.core.service.ReadyMarker;
+import org.openhab.core.service.ReadyMarkerFilter;
+import org.openhab.core.service.ReadyService;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/StateDescriptionServiceImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/StateDescriptionServiceImpl.java
index 9fd61695bc0..2c8d60d79d0 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/StateDescriptionServiceImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/service/StateDescriptionServiceImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.service;
+package org.openhab.core.internal.service;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -21,13 +21,13 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.internal.types.StateDescriptionFragmentImpl;
-import org.eclipse.smarthome.core.service.StateDescriptionService;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragment;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentProvider;
-import org.eclipse.smarthome.core.types.StateDescriptionProvider;
-import org.eclipse.smarthome.core.types.StateOption;
+import org.openhab.core.internal.types.StateDescriptionFragmentImpl;
+import org.openhab.core.service.StateDescriptionService;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragment;
+import org.openhab.core.types.StateDescriptionFragmentProvider;
+import org.openhab.core.types.StateDescriptionProvider;
+import org.openhab.core.types.StateOption;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/CommandDescriptionImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/CommandDescriptionImpl.java
index 799eba195f1..566e641e5b1 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/CommandDescriptionImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/CommandDescriptionImpl.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.types;
+package org.openhab.core.internal.types;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.CommandOption;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.CommandOption;
 
 /**
  * The {@link CommandDescriptionImpl} groups state command properties.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/StateDescriptionFragmentImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/StateDescriptionFragmentImpl.java
index 5fa1e9c5104..3e833ca7bfd 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/StateDescriptionFragmentImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/StateDescriptionFragmentImpl.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.types;
+package org.openhab.core.internal.types;
 
 import java.math.BigDecimal;
 import java.util.Collections;
@@ -18,10 +18,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragment;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.StateOption;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragment;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.StateOption;
 
 /**
  * Data holder for StateDescriptionFragment creation.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ActiveItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ActiveItem.java
index e317e5afa8f..bec85f49f52 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ActiveItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ActiveItem.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java
index c8b28627741..27c811b6072 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,20 +27,20 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.service.CommandDescriptionService;
-import org.eclipse.smarthome.core.service.StateDescriptionService;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.CommandDescriptionBuilder;
-import org.eclipse.smarthome.core.types.CommandOption;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.common.ThreadPoolManager;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.service.CommandDescriptionService;
+import org.openhab.core.service.StateDescriptionService;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.CommandDescriptionBuilder;
+import org.openhab.core.types.CommandOption;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.UnDefType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupFunction.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupFunction.java
index f185d366d30..418e9992501 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupFunction.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupFunction.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.Iterator;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * Group functions are used by active group items to calculate a state for the group
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupItem.java
index 3c1fa82a391..59e5b67d679 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupItem.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,10 +25,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/Item.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/Item.java
index aa80dde8811..ba97c401e28 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/Item.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/Item.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.List;
 import java.util.Locale;
@@ -18,16 +18,16 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.CommandOption;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateOption;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.common.registry.Identifiable;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.CommandOption;
+import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateOption;
+import org.openhab.core.types.UnDefType;
 
 /**
  * <p>
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilder.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilder.java
index a31f791e17f..e743d549ccc 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilder.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.Collection;
 import java.util.Set;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilderFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilderFactory.java
index 506dfc8d0f4..aea895df93a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilderFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemBuilderFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemFactory.java
index 4e69f2d5328..bf885ceee1f 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemLookupException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemLookupException.java
index f18ef89b236..ff677ce15d0 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemLookupException.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemLookupException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 /**
  * This is an abstract parent exception to be extended by any exceptions
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotFoundException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotFoundException.java
index a0e5d7fbb2d..13523e2cd84 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotFoundException.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotFoundException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 /**
  * This exception is thrown by the {@link ItemRegistry} if an item could
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotUniqueException.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotUniqueException.java
index 8f134c094ff..f22cda17bd5 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotUniqueException.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemNotUniqueException.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.Collection;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemPredicates.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemPredicates.java
index 5ec03460494..d6cda3bb953 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemPredicates.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemPredicates.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.function.Predicate;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemProvider.java
index da8f6c8f42d..c76ab64eb40 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemProvider.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.Provider;
+import org.openhab.core.common.registry.Provider;
 
 /**
  * An item provider provides instances of {@link GenericItem}. These
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistry.java
index a92fbecca4f..f68de5e8450 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistry.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistry.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Registry;
-import org.eclipse.smarthome.core.internal.items.ItemBuilderImpl;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
+import org.openhab.core.common.registry.Registry;
+import org.openhab.core.internal.items.ItemBuilderImpl;
+import org.openhab.core.library.CoreItemFactory;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistryChangeListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistryChangeListener.java
index a68ee919222..b0b82d42636 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistryChangeListener.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemRegistryChangeListener.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.Collection;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
+import org.openhab.core.common.registry.RegistryChangeListener;
 
 /**
  * This is a listener interface which should be implemented where ever the item registry is
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemStateConverter.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemStateConverter.java
index 60f23753d1c..f6a0bad0a69 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemStateConverter.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemStateConverter.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.State;
 
 /**
  * Convert a {@link State} to an {@link Item} accepted {@link State}.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemUtil.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemUtil.java
index 8a8fd0b3d92..22849b96c6e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemUtil.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ItemUtil.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.Objects;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.internal.service.BundleResolverImpl;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.internal.service.BundleResolverImpl;
+import org.openhab.core.types.State;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedItemProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedItemProvider.java
index 220cb47d0ba..dba07545b83 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedItemProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedItemProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -27,11 +27,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.AbstractManagedProvider;
-import org.eclipse.smarthome.core.items.ManagedItemProvider.PersistedItem;
-import org.eclipse.smarthome.core.items.dto.GroupFunctionDTO;
-import org.eclipse.smarthome.core.items.dto.ItemDTOMapper;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.common.registry.AbstractManagedProvider;
+import org.openhab.core.items.ManagedItemProvider.PersistedItem;
+import org.openhab.core.items.dto.GroupFunctionDTO;
+import org.openhab.core.items.dto.ItemDTOMapper;
+import org.openhab.core.storage.StorageService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedMetadataProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedMetadataProvider.java
index 2107997de73..ed762a8f72e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedMetadataProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/ManagedMetadataProvider.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.ManagedProvider;
-import org.eclipse.smarthome.core.storage.StorageService;
+import org.openhab.core.common.registry.ManagedProvider;
+import org.openhab.core.storage.StorageService;
 
 /**
  * {@link ManagedMetadataProvider} is an OSGi service interface that allows to add or remove
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/Metadata.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/Metadata.java
index b8b63c48fc0..a2214f1969a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/Metadata.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/Metadata.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -19,7 +19,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.Identifiable;
+import org.openhab.core.common.registry.Identifiable;
 
 /**
  * This is a data class for storing meta-data for a given item and namespace.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataKey.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataKey.java
index 28f76f2b8c5..43e289ab555 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataKey.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataKey.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.AbstractUID;
+import org.openhab.core.common.AbstractUID;
 
 /**
  * This class represents the key of a {@link Metadata} entity.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataPredicates.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataPredicates.java
index ffe29db5cb3..296e5f35961 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataPredicates.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataPredicates.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.function.Predicate;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataProvider.java
index f2fbe633b64..8de67a3d870 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataProvider.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.Provider;
+import org.openhab.core.common.registry.Provider;
 
 /**
  * This is a marker interface for metadata provider implementations that should be used to register those as an OSGi
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataRegistry.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataRegistry.java
index 6d977e19a0b..660f0707d67 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataRegistry.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/MetadataRegistry.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.Registry;
+import org.openhab.core.common.registry.Registry;
 
 /**
  * The MetadataRegistry is the central place, where additional information about items is kept.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/RegistryHook.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/RegistryHook.java
index fd71cac8609..b1a26964801 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/RegistryHook.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/RegistryHook.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
-import org.eclipse.smarthome.core.common.registry.Identifiable;
+import org.openhab.core.common.registry.Identifiable;
 
 /**
  * A listener to be informed before entities are added respectively after they are removed.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/StateChangeListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/StateChangeListener.java
index 9a3db730857..24e04a8e823 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/StateChangeListener.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/StateChangeListener.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.State;
 
 /**
  * <p>
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupFunctionDTO.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupFunctionDTO.java
index 04cee000a51..23391be8614 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupFunctionDTO.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupFunctionDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.dto;
+package org.openhab.core.items.dto;
 
 /**
  * This is a data transfer object that is used to serialize group functions.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupItemDTO.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupItemDTO.java
index 31480d9f303..b41fa509b8e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupItemDTO.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/GroupItemDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.dto;
+package org.openhab.core.items.dto;
 
 /**
  * This is a data transfer object that is used to serialize group items.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTO.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTO.java
index 89a91fa7f66..c065925154e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTO.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.dto;
+package org.openhab.core.items.dto;
 
 import java.util.List;
 import java.util.Set;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTOMapper.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTOMapper.java
index b130c0c531f..44d88b562e4 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTOMapper.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/ItemDTOMapper.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.dto;
+package org.openhab.core.items.dto;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,15 +20,15 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.internal.items.GroupFunctionHelper;
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemBuilder;
-import org.eclipse.smarthome.core.items.ItemBuilderFactory;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.TypeParser;
+import org.openhab.core.internal.items.GroupFunctionHelper;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemBuilder;
+import org.openhab.core.items.ItemBuilderFactory;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.types.State;
+import org.openhab.core.types.TypeParser;
 import org.slf4j.LoggerFactory;
 
 /**
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/MetadataDTO.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/MetadataDTO.java
index 57be57e7000..7214394a338 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/MetadataDTO.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/dto/MetadataDTO.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.dto;
+package org.openhab.core.items.dto;
 
 import java.util.Map;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriber.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriber.java
index de85619f548..14729cf7da5 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriber.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriber.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
 import java.util.Collections;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
 
 /**
  * <p>
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemRegistryEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemRegistryEvent.java
index 2bc4dfb89d6..b4e49e4838d 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemRegistryEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/AbstractItemRegistryEvent.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.dto.ItemDTO;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.dto.ItemDTO;
 
 /**
  * Abstract implementation of an item registry event which will be posted by the {@link ItemRegistry} for added, removed
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/GroupItemStateChangedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/GroupItemStateChangedEvent.java
index c69dc65ad53..b33e208dd7e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/GroupItemStateChangedEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/GroupItemStateChangedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.State;
 
 /**
  * {@link GroupItemStateChangedEvent}s can be used to deliver group item state changes through the openHAB event bus. In
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemAddedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemAddedEvent.java
index 75f0fdce479..87ed9a70f54 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemAddedEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemAddedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
-import org.eclipse.smarthome.core.items.dto.ItemDTO;
+import org.openhab.core.items.dto.ItemDTO;
 
 /**
  * An {@link ItemAddedEvent} notifies subscribers that an item has been added.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemCommandEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemCommandEvent.java
index 6f6b59697ac..f196938c3c9 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemCommandEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemCommandEvent.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.types.Command;
 
 /**
  * {@link ItemCommandEvent}s can be used to deliver commands through the openHAB event bus.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemEventFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemEventFactory.java
index acc5e71d50d..1bfbf7550a0 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemEventFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemEventFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -20,17 +20,17 @@
 import java.util.stream.Stream;
 
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.core.events.AbstractEventFactory;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.dto.ItemDTO;
-import org.eclipse.smarthome.core.items.dto.ItemDTOMapper;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.Type;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.events.AbstractEventFactory;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.dto.ItemDTO;
+import org.openhab.core.items.dto.ItemDTOMapper;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.Type;
+import org.openhab.core.types.UnDefType;
 import org.osgi.service.component.annotations.Component;
 
 /**
@@ -44,7 +44,7 @@ public class ItemEventFactory extends AbstractEventFactory {
 
     private static final String TYPE_POSTFIX = "Type";
 
-    private static final String CORE_LIBRARY_PACKAGE = "org.eclipse.smarthome.core.library.types.";
+    private static final String CORE_LIBRARY_PACKAGE = "org.openhab.core.library.types.";
 
     private static final String ITEM_COMAND_EVENT_TOPIC = "smarthome/items/{itemName}/command";
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemRemovedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemRemovedEvent.java
index 47e81041514..032d0cc8494 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemRemovedEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemRemovedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
-import org.eclipse.smarthome.core.items.dto.ItemDTO;
+import org.openhab.core.items.dto.ItemDTO;
 
 /**
  * An {@link ItemRemovedEvent} notifies subscribers that an item has been removed.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateChangedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateChangedEvent.java
index e0886579cf9..72f92b8a3a7 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateChangedEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateChangedEvent.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.types.State;
 
 /**
  * {@link ItemStateChangedEvent}s can be used to deliver item state changes through the openHAB event bus. In contrast
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateEvent.java
index 45124917965..a4c2f06e079 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStateEvent.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.types.State;
 
 /**
  * {@link ItemStateEvent}s can be used to deliver item status updates through the openHAB event bus.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStatePredictedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStatePredictedEvent.java
index 796b9548f07..6621b0868e9 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStatePredictedEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemStatePredictedEvent.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
-import org.eclipse.smarthome.core.events.AbstractEvent;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.events.AbstractEvent;
+import org.openhab.core.types.State;
 
 /**
  * This event announces potential item state outcomes when a command was received.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemUpdatedEvent.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemUpdatedEvent.java
index 191e4c24db3..7ec9fb639eb 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemUpdatedEvent.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/events/ItemUpdatedEvent.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
-import org.eclipse.smarthome.core.items.dto.ItemDTO;
+import org.openhab.core.items.dto.ItemDTO;
 
 /**
  * An {@link ItemUpdatedEvent} notifies subscribers that an item has been updated.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/CoreItemFactory.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/CoreItemFactory.java
index aa45c5d4222..2d243c064cf 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/CoreItemFactory.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/CoreItemFactory.java
@@ -10,25 +10,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library;
+package org.openhab.core.library;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.ItemFactory;
-import org.eclipse.smarthome.core.items.ItemUtil;
-import org.eclipse.smarthome.core.library.items.CallItem;
-import org.eclipse.smarthome.core.library.items.ColorItem;
-import org.eclipse.smarthome.core.library.items.ContactItem;
-import org.eclipse.smarthome.core.library.items.DateTimeItem;
-import org.eclipse.smarthome.core.library.items.DimmerItem;
-import org.eclipse.smarthome.core.library.items.ImageItem;
-import org.eclipse.smarthome.core.library.items.LocationItem;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.items.PlayerItem;
-import org.eclipse.smarthome.core.library.items.RollershutterItem;
-import org.eclipse.smarthome.core.library.items.StringItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.ItemFactory;
+import org.openhab.core.items.ItemUtil;
+import org.openhab.core.library.items.CallItem;
+import org.openhab.core.library.items.ColorItem;
+import org.openhab.core.library.items.ContactItem;
+import org.openhab.core.library.items.DateTimeItem;
+import org.openhab.core.library.items.DimmerItem;
+import org.openhab.core.library.items.ImageItem;
+import org.openhab.core.library.items.LocationItem;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.items.PlayerItem;
+import org.openhab.core.library.items.RollershutterItem;
+import org.openhab.core.library.items.StringItem;
+import org.openhab.core.library.items.SwitchItem;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/ArealDensity.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/ArealDensity.java
index d001f79a374..fefc849788a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/ArealDensity.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/ArealDensity.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.dimension;
+package org.openhab.core.library.dimension;
 
 import javax.measure.Quantity;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataAmount.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataAmount.java
index 8c7ca615f3e..3fcf0110a10 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataAmount.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataAmount.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.dimension;
+package org.openhab.core.library.dimension;
 
 import javax.measure.Quantity;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataTransferRate.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataTransferRate.java
index 33c41101d21..4efa32440de 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataTransferRate.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/DataTransferRate.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.dimension;
+package org.openhab.core.library.dimension;
 
 import javax.measure.Quantity;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Density.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Density.java
index 413a9185864..b0c80526d72 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Density.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Density.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.dimension;
+package org.openhab.core.library.dimension;
 
 import javax.measure.Quantity;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Intensity.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Intensity.java
index 806ca61101d..74f0f258f8d 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Intensity.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/Intensity.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.dimension;
+package org.openhab.core.library.dimension;
 
 import javax.measure.Quantity;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/VolumetricFlowRate.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/VolumetricFlowRate.java
index b695c4e61c7..40ef5f1b2f7 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/VolumetricFlowRate.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/dimension/VolumetricFlowRate.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.dimension;
+package org.openhab.core.library.dimension;
 
 import javax.measure.Quantity;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/CallItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/CallItem.java
index 74cccdfd052..181f46b0463 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/CallItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/CallItem.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.StringListType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.StringListType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * This item identifies a telephone call by its origin and destination.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ColorItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ColorItem.java
index 61b77df69f8..93d6ac70370 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ColorItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ColorItem.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -18,16 +18,16 @@
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.IncreaseDecreaseType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.IncreaseDecreaseType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * A ColorItem can be used for color values, e.g. for LED lights
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ContactItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ContactItem.java
index 29d46ac1860..f1f0e212114 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ContactItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ContactItem.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.OpenClosedType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.OpenClosedType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * A ContactItem can be used for sensors that return an "open" or "close" as a state.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DateTimeItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DateTimeItem.java
index ad17462e2e7..6a341b0801e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DateTimeItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DateTimeItem.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * A DateTimeItem stores a timestamp including a valid time zone.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DimmerItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DimmerItem.java
index efaed492446..a371efed038 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DimmerItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/DimmerItem.java
@@ -10,21 +10,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.IncreaseDecreaseType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.IncreaseDecreaseType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * A DimmerItem can be used as a switch (ON/OFF), but it also accepts percent values
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ImageItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ImageItem.java
index cd2048a4f28..7f68bb30119 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ImageItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/ImageItem.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.RawType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.RawType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * An ImageItem holds the binary image data as its status.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/LocationItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/LocationItem.java
index 8689fe8d8f8..618071e9688 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/LocationItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/LocationItem.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,14 +18,14 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.PointType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.PointType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * A LocationItem can be used to store GPS related informations, addresses...
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/NumberItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/NumberItem.java
index e58de73d68c..2142fe662d1 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/NumberItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/NumberItem.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -23,18 +23,18 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.ItemUtil;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.UnDefType;
-import org.eclipse.smarthome.core.types.util.UnitUtils;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.ItemUtil;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.UnDefType;
+import org.openhab.core.types.util.UnitUtils;
 
 /**
  * A NumberItem has a decimal value and is usually used for all kinds
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/PlayerItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/PlayerItem.java
index c26b43a51a4..f70b5f94c35 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/PlayerItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/PlayerItem.java
@@ -10,22 +10,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.NextPreviousType;
-import org.eclipse.smarthome.core.library.types.PlayPauseType;
-import org.eclipse.smarthome.core.library.types.RewindFastforwardType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.NextPreviousType;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.library.types.RewindFastforwardType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * An {@link PlayerItem} allows to control a player, e.g. an audio player.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/RollershutterItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/RollershutterItem.java
index 743b979ecf1..2a45ba20345 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/RollershutterItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/RollershutterItem.java
@@ -10,22 +10,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.StopMoveType;
-import org.eclipse.smarthome.core.library.types.UpDownType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.StopMoveType;
+import org.openhab.core.library.types.UpDownType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * A RollershutterItem allows the control of roller shutters, i.e.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/StringItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/StringItem.java
index 7f1323ef8cd..751b071b6ca 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/StringItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/StringItem.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,15 +18,15 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.TypeParser;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.TypeParser;
+import org.openhab.core.types.UnDefType;
 
 /**
  * A StringItem can be used for any kind of string to either send or receive
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/SwitchItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/SwitchItem.java
index 5fa63630310..f1340a8d104 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/SwitchItem.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/items/SwitchItem.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * A SwitchItem represents a normal switch that can be ON or OFF.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/ArithmeticGroupFunction.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/ArithmeticGroupFunction.java
index 6035079d028..dff78ccbcb5 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/ArithmeticGroupFunction.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/ArithmeticGroupFunction.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -18,10 +18,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.Item;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * This interface is only a container for functions that require the core type library
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeGroupFunction.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeGroupFunction.java
index 6b529250f23..a665b5b11e6 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeGroupFunction.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeGroupFunction.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.time.ZonedDateTime;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.Item;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * This interface is a container for group functions that require {@link DateTimeType}s for its calculations.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeType.java
index 9a0fd58a036..0f8f4348e97 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DateTimeType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.time.DateTimeException;
 import java.time.Instant;
@@ -28,9 +28,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  *
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DecimalType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DecimalType.java
index 5cfa5682d0f..f104013cdce 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DecimalType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/DecimalType.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.math.BigDecimal;
 import java.util.IllegalFormatConversionException;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  * The decimal type uses a BigDecimal internally and thus can be used for
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/HSBType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/HSBType.java
index 37298edb9ea..0f2b39ea916 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/HSBType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/HSBType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -22,10 +22,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.ComplexType;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.ComplexType;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  * The HSBType is a complex type with constituents for hue, saturation and
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/IncreaseDecreaseType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/IncreaseDecreaseType.java
index fbeef3bd12f..c5aa49c01ff 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/IncreaseDecreaseType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/IncreaseDecreaseType.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
 
 /**
  *
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/NextPreviousType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/NextPreviousType.java
index 3af98efb58d..6a852cf73e1 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/NextPreviousType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/NextPreviousType.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.items.PlayerItem;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
+import org.openhab.core.library.items.PlayerItem;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
 
 /**
  * This type is used by the {@link PlayerItem}.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OnOffType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OnOffType.java
index 3c4c95bcbea..0cde58cccb9 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OnOffType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OnOffType.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  *
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OpenClosedType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OpenClosedType.java
index 8f76a5c99e7..27771f0d75c 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OpenClosedType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/OpenClosedType.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  *
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PercentType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PercentType.java
index 1c388107430..aed460593c5 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PercentType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PercentType.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.unit.SmartHomeUnits;
+import org.openhab.core.types.State;
 
 /**
  * The PercentType extends the {@link DecimalType} by putting constraints for its value on top (0-100).
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PlayPauseType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PlayPauseType.java
index e150c90a1fc..1c0bfddb8bd 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PlayPauseType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PlayPauseType.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.items.PlayerItem;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.items.PlayerItem;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  * This type is used by the {@link PlayerItem}.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PointType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PointType.java
index 87eca656ca2..39396a63de0 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PointType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/PointType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
@@ -22,10 +22,10 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.ComplexType;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.ComplexType;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  * This type can be used for items that are dealing with GPS or
@@ -60,7 +60,7 @@ public class PointType implements ComplexType, Command, State {
      * Default constructor creates a point at sea level where the equator
      * (0° latitude) and the prime meridian (0° longitude) intersect.
      * A nullary constructor is needed by
-     * {@link org.eclipse.smarthome.core.internal.items.ItemUpdater#receiveUpdate})
+     * {@link org.openhab.core.internal.items.ItemUpdater#receiveUpdate})
      */
     public PointType() {
     }
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityType.java
index a3af244902d..9fca8e3af4b 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.eclipse.jdt.annotation.DefaultLocation.*;
 
@@ -28,12 +28,12 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.internal.library.unit.UnitInitializer;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.util.UnitUtils;
+import org.openhab.core.internal.library.unit.UnitInitializer;
+import org.openhab.core.library.unit.SmartHomeUnits;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.util.UnitUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,7 +73,7 @@ public class QuantityType<T extends Quantity<T>> extends Number
 
     /**
      * Creates a dimensionless {@link QuantityType} with scalar 0 and unit {@link AbstractUnit#ONE}.
-     * A default constructor is needed by {@link org.eclipse.smarthome.core.internal.items.ItemUpdater#receiveUpdate})
+     * A default constructor is needed by {@link org.openhab.core.internal.items.ItemUpdater#receiveUpdate})
      */
     @SuppressWarnings("unchecked")
     public QuantityType() {
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunction.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunction.java
index e5d80005c75..4936653c674 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunction.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunction.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -19,12 +19,12 @@
 import javax.measure.Quantity;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * This interface is a container for dimension based functions that require {@link QuantityType}s for its calculations.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RawType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RawType.java
index 33838263b9a..0545fa9a40f 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RawType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RawType.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.util.Arrays;
 import java.util.Base64;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  * This type can be used for all binary data such as images, documents, sounds etc.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RewindFastforwardType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RewindFastforwardType.java
index 15d544f2135..a7b4a456eec 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RewindFastforwardType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/RewindFastforwardType.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.items.PlayerItem;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.items.PlayerItem;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  * This type is used by the {@link PlayerItem}.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StopMoveType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StopMoveType.java
index d5f15f4112f..860de34ac9f 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StopMoveType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StopMoveType.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
 
 /**
  *
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringListType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringListType.java
index 80addba3e35..a36156e4136 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringListType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringListType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -20,8 +20,8 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 
 /**
  * This type can be used for items that are dealing with telephony functionality.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringType.java
index 9db73645206..0e4408e9d68 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/StringType.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.util.Objects;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  *
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/UpDownType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/UpDownType.java
index 0cf32e64395..064c719ad1b 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/UpDownType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/types/UpDownType.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import java.math.BigDecimal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.PrimitiveType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.PrimitiveType;
+import org.openhab.core.types.State;
 
 /**
  *
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/BinaryPrefix.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/BinaryPrefix.java
index 56077bfb839..bbe24013ced 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/BinaryPrefix.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/BinaryPrefix.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.unit;
+package org.openhab.core.library.unit;
 
 import java.math.BigInteger;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/CustomUnits.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/CustomUnits.java
index 6fead7d08ce..1be063e577b 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/CustomUnits.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/CustomUnits.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.unit;
+package org.openhab.core.library.unit;
 
 import tec.uom.se.AbstractSystemOfUnits;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/ImperialUnits.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/ImperialUnits.java
index f11f3eceb72..228ee30dee5 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/ImperialUnits.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/ImperialUnits.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.unit;
+package org.openhab.core.library.unit;
 
 import java.math.BigInteger;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/MetricPrefix.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/MetricPrefix.java
index 36ba7010f05..8f189830f59 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/MetricPrefix.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/MetricPrefix.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.unit;
+package org.openhab.core.library.unit;
 
 import javax.measure.Quantity;
 import javax.measure.Unit;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SIUnits.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SIUnits.java
index c4cb989ccbd..873fec6dc35 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SIUnits.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SIUnits.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.unit;
+package org.openhab.core.library.unit;
 
 import javax.measure.Unit;
 import javax.measure.quantity.Area;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SmartHomeUnits.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SmartHomeUnits.java
index 6e7071ad774..bc105eb6f4a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SmartHomeUnits.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SmartHomeUnits.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.unit;
+package org.openhab.core.library.unit;
 
 import java.math.BigInteger;
 
@@ -49,12 +49,12 @@
 import javax.measure.spi.SystemOfUnits;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.library.dimension.ArealDensity;
-import org.eclipse.smarthome.core.library.dimension.DataAmount;
-import org.eclipse.smarthome.core.library.dimension.DataTransferRate;
-import org.eclipse.smarthome.core.library.dimension.Density;
-import org.eclipse.smarthome.core.library.dimension.Intensity;
-import org.eclipse.smarthome.core.library.dimension.VolumetricFlowRate;
+import org.openhab.core.library.dimension.ArealDensity;
+import org.openhab.core.library.dimension.DataAmount;
+import org.openhab.core.library.dimension.DataTransferRate;
+import org.openhab.core.library.dimension.Density;
+import org.openhab.core.library.dimension.Intensity;
+import org.openhab.core.library.dimension.VolumetricFlowRate;
 
 import tec.uom.se.AbstractUnit;
 import tec.uom.se.format.SimpleUnitFormat;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/net/CidrAddress.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/CidrAddress.java
index a06761e204b..9d6f0178f66 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/net/CidrAddress.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/CidrAddress.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.net;
+package org.openhab.core.net;
 
 import java.net.InetAddress;
 import java.net.InterfaceAddress;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/net/HttpServiceUtil.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/HttpServiceUtil.java
index ffd56622684..b0523413085 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/net/HttpServiceUtil.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/HttpServiceUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.net;
+package org.openhab.core.net;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetUtil.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetUtil.java
index afdb8607e52..35b11fc61fd 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetUtil.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.net;
+package org.openhab.core.net;
 
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -38,8 +38,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.common.ThreadPoolManager;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Modified;
@@ -56,7 +56,7 @@
  * @author Gary Tse - Network address change listener
  * @author Tim Roberts - Added primary address change to network address change listener
  */
-@Component(configurationPid = "org.eclipse.smarthome.network", property = { "service.pid=org.eclipse.smarthome.network",
+@Component(configurationPid = "org.openhab.core.network", property = { "service.pid=org.openhab.core.network",
         "service.config.description.uri=system:network", "service.config.label=Network Settings",
         "service.config.category=system" })
 @NonNullByDefault
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressChangeListener.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressChangeListener.java
index 492224c06fb..5ef8bb7c0c8 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressChangeListener.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressChangeListener.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.net;
+package org.openhab.core.net;
 
 import java.util.List;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressService.java
index e5216583006..fe75fd694b7 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/net/NetworkAddressService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.net;
+package org.openhab.core.net;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronJob.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronJob.java
index e10a7b1d0b6..4303561870e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronJob.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronJob.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.scheduler;
+package org.openhab.core.scheduler;
 
 import java.util.Map;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronScheduler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronScheduler.java
index 8df02a258d9..0b883a189e1 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronScheduler.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/CronScheduler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.scheduler;
+package org.openhab.core.scheduler;
 
 import java.util.Map;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/PeriodicScheduler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/PeriodicScheduler.java
index 47b817b3629..8b75524dd21 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/PeriodicScheduler.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/PeriodicScheduler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.scheduler;
+package org.openhab.core.scheduler;
 
 import java.time.Duration;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/ScheduledCompletableFuture.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/ScheduledCompletableFuture.java
index edaa4e5ea8b..143f2eb2786 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/ScheduledCompletableFuture.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/ScheduledCompletableFuture.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.scheduler;
+package org.openhab.core.scheduler;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ScheduledFuture;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/Scheduler.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/Scheduler.java
index 273bff66c54..3ed4d692f47 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/Scheduler.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/Scheduler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.scheduler;
+package org.openhab.core.scheduler;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerRunnable.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerRunnable.java
index 0ebd4ec7f4d..cdcd1495042 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerRunnable.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerRunnable.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.scheduler;
+package org.openhab.core.scheduler;
 
 /**
  * Runnable that can throw checked exceptions.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerTemporalAdjuster.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerTemporalAdjuster.java
index 7b6dbe860b6..f3b2539a6dd 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerTemporalAdjuster.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/scheduler/SchedulerTemporalAdjuster.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.scheduler;
+package org.openhab.core.scheduler;
 
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAdjuster;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/AbstractWatchService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/AbstractWatchService.java
index 6ff8a19adf9..317275650d6 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/AbstractWatchService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/AbstractWatchService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.service;
+package org.openhab.core.service;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/CommandDescriptionService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/CommandDescriptionService.java
index 7352bd1b857..8b2fddce734 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/CommandDescriptionService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/CommandDescriptionService.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.service;
+package org.openhab.core.service;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.CommandDescription;
+import org.openhab.core.types.CommandDescription;
 
 /**
  * An implementation of this service provides locale specific {@link CommandDescription}s for the given item.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java
index 060c61ddb26..7fa5ab343d8 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarker.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.service;
+package org.openhab.core.service;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerFilter.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerFilter.java
index f80aeda0e3c..44f2064eb92 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerFilter.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerFilter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.service;
+package org.openhab.core.service;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerUtils.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerUtils.java
index df3dc9f09c8..8a0889c1364 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerUtils.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyMarkerUtils.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.service;
+package org.openhab.core.service;
 
 import java.util.Arrays;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyService.java
index 3d69a94e42c..de690253ec8 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/ReadyService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.service;
+package org.openhab.core.service;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/StateDescriptionService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/StateDescriptionService.java
index f63f24788af..8bad2e56b7e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/StateDescriptionService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/StateDescriptionService.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.service;
+package org.openhab.core.service;
 
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.types.StateDescription;
+import org.openhab.core.types.StateDescription;
 
 /**
  * Implementations of this service provide strategies for merging info from
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/WatchQueueReader.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/WatchQueueReader.java
index 2b015daf1b6..bf013875e29 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/service/WatchQueueReader.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/service/WatchQueueReader.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.service;
+package org.openhab.core.service;
 
 import static java.nio.file.StandardWatchEventKinds.*;
 
@@ -44,7 +44,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.ThreadPoolManager;
+import org.openhab.core.common.ThreadPoolManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorage.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorage.java
index 34b16052a1b..64f1a87ecfe 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorage.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorage.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.storage;
+package org.openhab.core.storage;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorageService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorageService.java
index 9e2f52a7037..e2ff8c4539f 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorageService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/DeletableStorageService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.storage;
+package org.openhab.core.storage;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/Storage.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/Storage.java
index c31d7f81b9f..0c09197a55e 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/Storage.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/Storage.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.storage;
+package org.openhab.core.storage;
 
 import java.util.AbstractMap;
 import java.util.Collection;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/StorageService.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/StorageService.java
index 55fee3adede..4bfc798def6 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/StorageService.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/storage/StorageService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.storage;
+package org.openhab.core.storage;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/Command.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/Command.java
index 5fe1373664c..dbbd51a8f08 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/Command.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/Command.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescription.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescription.java
index 368dd898843..bd75723d4da 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescription.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescription.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.util.List;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionBuilder.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionBuilder.java
index 15a8180f309..0703dbf897f 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionBuilder.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionBuilder.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.internal.types.CommandDescriptionImpl;
+import org.openhab.core.internal.types.CommandDescriptionImpl;
 
 /**
  * Used to build instances of {@link CommandDescription}.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionProvider.java
index 76c3c51cdf5..f414d2dd204 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.util.Locale;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandOption.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandOption.java
index 94f7edc17ec..6eb6b3bd991 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandOption.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/CommandOption.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/ComplexType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/ComplexType.java
index 8456c5a5b4c..63498aec948 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/ComplexType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/ComplexType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.util.SortedMap;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventDescription.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventDescription.java
index c3aab10be4d..3144864e248 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventDescription.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventDescription.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventOption.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventOption.java
index d5d4b68d619..c65aa32538a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventOption.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventOption.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 /**
  * Describes one possible value an event might have.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventType.java
index bf7b8b67fac..6fb17ffaa9a 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/EventType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/PrimitiveType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/PrimitiveType.java
index 028231313c9..33fdb42b934 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/PrimitiveType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/PrimitiveType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/RefreshType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/RefreshType.java
index ca757298229..a802cbca9a8 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/RefreshType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/RefreshType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/State.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/State.java
index d925ec4895e..9412db10c73 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/State.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/State.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescription.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescription.java
index 04c2454f4ad..c2c94d00f7d 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescription.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescription.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.math.BigDecimal;
 import java.util.Collections;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragment.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragment.java
index e6dccc37cc9..c86cd500178 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragment.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragment.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentBuilder.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentBuilder.java
index 2c27a6ed50d..02607f5f285 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentBuilder.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentBuilder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -18,7 +18,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.internal.types.StateDescriptionFragmentImpl;
+import org.openhab.core.internal.types.StateDescriptionFragmentImpl;
 
 /**
  * Builds a {@link StateDescriptionFragment} with the relevant parts only.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentProvider.java
index b044bdf0b4d..22addc26c48 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionFragmentProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.util.Locale;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionProvider.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionProvider.java
index af4a9b227da..e57df73bd42 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionProvider.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.util.Locale;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateOption.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateOption.java
index 368d808e6eb..6a8c15c7288 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateOption.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/StateOption.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/Type.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/Type.java
index d5925825558..c742b20ebb3 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/Type.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/Type.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.util.Formatter;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/TypeParser.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/TypeParser.java
index 5efd10712f5..946b7f50579 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/TypeParser.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/TypeParser.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -29,7 +29,7 @@ public final class TypeParser {
     private TypeParser() {
     }
 
-    private static final String CORE_LIBRARY_PACKAGE = "org.eclipse.smarthome.core.library.types.";
+    private static final String CORE_LIBRARY_PACKAGE = "org.openhab.core.library.types.";
 
     /**
      * Parses a string into a type.
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/UnDefType.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/UnDefType.java
index 4c492935af7..713aeb3cea5 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/UnDefType.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/UnDefType.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/util/UnitUtils.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/util/UnitUtils.java
index 279b32349b4..345a50c0fdc 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/types/util/UnitUtils.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/types/util/UnitUtils.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types.util;
+package org.openhab.core.types.util;
 
 import static java.util.stream.Collectors.toSet;
 
@@ -30,10 +30,10 @@
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.internal.library.unit.UnitInitializer;
-import org.eclipse.smarthome.core.library.unit.ImperialUnits;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
+import org.openhab.core.internal.library.unit.UnitInitializer;
+import org.openhab.core.library.unit.ImperialUnits;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.SmartHomeUnits;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,7 +56,7 @@ public class UnitUtils {
     public static final String UNIT_PERCENT_FORMAT_STRING = "%%";
 
     private static final String JAVAX_MEASURE_QUANTITY_PREFIX = "javax.measure.quantity.";
-    private static final String FRAMEWORK_DIMENSION_PREFIX = "org.eclipse.smarthome.core.library.dimension.";
+    private static final String FRAMEWORK_DIMENSION_PREFIX = "org.openhab.core.library.dimension.";
 
     private static final Collection<Class<? extends SystemOfUnits>> ALL_SYSTEM_OF_UNITS = Arrays.asList(SIUnits.class,
             ImperialUnits.class, SmartHomeUnits.class, Units.class);
@@ -68,10 +68,10 @@ public class UnitUtils {
     /**
      * Parses a String denoting a dimension (e.g. Length, Temperature, Mass,..) into a {@link Class} instance of an
      * interface from {@link javax.measure.Quantity}. The interfaces reside in {@code javax.measure.quantity} and
-     * framework specific interfaces in {@code org.eclipse.smarthome.core.library.dimension}.
+     * framework specific interfaces in {@code org.openhab.core.library.dimension}.
      *
      * @param dimension the simple name of an interface from the package {@code javax.measure.quantity} or
-     *            {@code org.eclipse.smarthome.core.library.dimension}.
+     *            {@code org.openhab.core.library.dimension}.
      * @return the {@link Class} instance of the interface or {@code null} if the given dimension is blank.
      * @throws IllegalArgumentException in case no class instance could be parsed from the given dimension.
      */
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/util/BundleResolver.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/util/BundleResolver.java
index 7f99b80ebed..87b5743e9de 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/util/BundleResolver.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/util/BundleResolver.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.util;
+package org.openhab.core.util;
 
 import org.osgi.framework.Bundle;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/util/HexUtils.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/util/HexUtils.java
index d75ba0398ad..7b888b94610 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/util/HexUtils.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/util/HexUtils.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.util;
+package org.openhab.core.util;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/util/UIDUtils.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/util/UIDUtils.java
index 198969cbe16..9a3062d64ed 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/util/UIDUtils.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/util/UIDUtils.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.util;
+package org.openhab.core.util;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/auth/client/oauth2/AccessTokenResponseTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/auth/client/oauth2/AccessTokenResponseTest.java
index 3c617e1ee8b..4090410d2b9 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/auth/client/oauth2/AccessTokenResponseTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/auth/client/oauth2/AccessTokenResponseTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.auth.client.oauth2;
+package org.openhab.core.auth.client.oauth2;
 
 import static org.junit.Assert.*;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheMapTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheMapTest.java
index 05e2bb44855..3278aea029c 100755
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheMapTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheMapTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.cache;
+package org.openhab.core.cache;
 
 import static org.junit.Assert.*;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheTest.java
index fc8200b7b69..7214f3df0cc 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/cache/ExpiringCacheTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.cache;
+package org.openhab.core.cache;
 
 import static org.junit.Assert.*;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/QueueingThreadPoolExecutorTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/QueueingThreadPoolExecutorTest.java
index 668196e07d2..c39689890bd 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/QueueingThreadPoolExecutorTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/QueueingThreadPoolExecutorTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common;
+package org.openhab.core.common;
 
 import static org.junit.Assert.*;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadFactoryBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadFactoryBuilderTest.java
index ac10b8611bd..0f8141ebbc9 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadFactoryBuilderTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadFactoryBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common;
+package org.openhab.core.common;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.core.StringStartsWith.startsWith;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadPoolManagerTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadPoolManagerTest.java
index 2172fc3e813..dd258a59355 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadPoolManagerTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/ThreadPoolManagerTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common;
+package org.openhab.core.common;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.*;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java
index 27e72f6f2ce..8b55a4e95da 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/common/osgi/ResourceBundleClassLoaderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.common.osgi;
+package org.openhab.core.common.osgi;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/i18n/I18nProviderImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/i18n/I18nProviderImplTest.java
index 0046118750c..e185af35480 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/i18n/I18nProviderImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/i18n/I18nProviderImplTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.i18n;
+package org.openhab.core.internal.i18n;
 
-import static org.eclipse.smarthome.core.internal.i18n.I18nProviderImpl.*;
+import static org.openhab.core.internal.i18n.I18nProviderImpl.*;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.when;
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import org.eclipse.smarthome.core.library.types.PointType;
+import org.openhab.core.library.types.PointType;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java
index 214a7b752c1..cdc1484d353 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -20,11 +20,11 @@
 import java.util.Arrays;
 import java.util.Collections;
 
-import org.eclipse.smarthome.core.items.ActiveItem;
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemFactory;
+import org.openhab.core.items.ActiveItem;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemFactory;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemStateConverterImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemStateConverterImplTest.java
index dc234608aea..16b018567c0 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemStateConverterImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemStateConverterImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -19,16 +19,16 @@
 import javax.measure.quantity.Length;
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.unit.ImperialUnits;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.items.Item;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.ImperialUnits;
+import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.UnDefType;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemTagTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemTagTest.java
index 3a950cf8424..9303d63ef76 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemTagTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/ItemTagTest.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 
-import org.eclipse.smarthome.core.library.items.SwitchItem;
+import org.openhab.core.library.items.SwitchItem;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/MetadataRegistryImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/MetadataRegistryImplTest.java
index 98ca6d041cb..f2603cde8ad 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/MetadataRegistryImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/items/MetadataRegistryImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -19,10 +19,10 @@
 
 import java.util.Collections;
 
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ManagedMetadataProvider;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ManagedMetadataProvider;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterMiscTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterMiscTest.java
index ea7befb5090..a992f895c7e 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterMiscTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterMiscTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterTest.java
index d127468b1d1..3bff733faa6 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronAdjusterTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronSchedulerImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronSchedulerImplTest.java
index 756e9fe74b8..469b3cbd787 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronSchedulerImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/CronSchedulerImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import static org.junit.Assert.*;
 
@@ -19,8 +19,8 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.eclipse.smarthome.core.scheduler.CronJob;
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.scheduler.CronJob;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/DelegatedSchedulerTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/DelegatedSchedulerTest.java
index 01922932436..6658c14e940 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/DelegatedSchedulerTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/DelegatedSchedulerTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -24,7 +24,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiFunction;
 
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImplTest.java
index d7d833f77dc..4d8d638036d 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/PeriodicSchedulerImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import static org.junit.Assert.*;
 
@@ -21,7 +21,7 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/SchedulerImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/SchedulerImplTest.java
index 3340def8b4a..dfff0e8629f 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/SchedulerImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/scheduler/SchedulerImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.scheduler;
+package org.openhab.core.internal.scheduler;
 
 import static org.junit.Assert.*;
 
@@ -30,9 +30,9 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.eclipse.smarthome.core.scheduler.ScheduledCompletableFuture;
-import org.eclipse.smarthome.core.scheduler.SchedulerRunnable;
-import org.eclipse.smarthome.core.scheduler.SchedulerTemporalAdjuster;
+import org.openhab.core.scheduler.ScheduledCompletableFuture;
+import org.openhab.core.scheduler.SchedulerRunnable;
+import org.openhab.core.scheduler.SchedulerTemporalAdjuster;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/ReadyServiceImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/ReadyServiceImplTest.java
index ff97ae1f48a..61dd6c10dbb 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/ReadyServiceImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/ReadyServiceImplTest.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.service;
+package org.openhab.core.internal.service;
 
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.*;
 
-import org.eclipse.smarthome.core.service.ReadyMarker;
-import org.eclipse.smarthome.core.service.ReadyMarkerFilter;
-import org.eclipse.smarthome.core.service.ReadyService.ReadyTracker;
+import org.openhab.core.service.ReadyMarker;
+import org.openhab.core.service.ReadyMarkerFilter;
+import org.openhab.core.service.ReadyService.ReadyTracker;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java
index 9bd7064af25..9d96bf1a6dd 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.service;
+package org.openhab.core.internal.service;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -21,13 +21,13 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragment;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentProvider;
-import org.eclipse.smarthome.core.types.StateDescriptionProvider;
-import org.eclipse.smarthome.core.types.StateOption;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragment;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.StateDescriptionFragmentProvider;
+import org.openhab.core.types.StateDescriptionProvider;
+import org.openhab.core.types.StateOption;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/types/StateDescriptionFragmentImplTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/types/StateDescriptionFragmentImplTest.java
index 9d8d9133b4d..2016bd35ca0 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/types/StateDescriptionFragmentImplTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/internal/types/StateDescriptionFragmentImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.types;
+package org.openhab.core.internal.types;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -18,9 +18,9 @@
 import java.math.BigDecimal;
 import java.util.Collections;
 
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragment;
-import org.eclipse.smarthome.core.types.StateOption;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragment;
+import org.openhab.core.types.StateOption;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java
index 8c660793ad2..05b6a751c10 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/GenericItemTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.junit.Assert.*;
@@ -22,20 +22,20 @@
 import java.util.Locale;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.items.events.ItemStateChangedEvent;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.RawType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.service.CommandDescriptionService;
-import org.eclipse.smarthome.core.service.StateDescriptionService;
-import org.eclipse.smarthome.core.types.CommandDescription;
-import org.eclipse.smarthome.core.types.CommandOption;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.StateOption;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.items.events.ItemStateChangedEvent;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.RawType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.service.CommandDescriptionService;
+import org.openhab.core.service.StateDescriptionService;
+import org.openhab.core.types.CommandDescription;
+import org.openhab.core.types.CommandOption;
+import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.StateOption;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/MetadataKeyTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/MetadataKeyTest.java
index 8d82ea27818..1e756c5c9ec 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/MetadataKeyTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/MetadataKeyTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/TestItem.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/TestItem.java
index 09128dba33a..12177f33e6b 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/TestItem.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/TestItem.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 
 /**
  * {@link GenericItem} implementation used for testing.
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/dto/ItemDTOMapperTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/dto/ItemDTOMapperTest.java
index 6a85f977a9a..6f74ae84baf 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/dto/ItemDTOMapperTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/dto/ItemDTOMapperTest.java
@@ -13,15 +13,15 @@
 /**
  * @author Stefan Triller - Initial contribution
  */
-package org.eclipse.smarthome.core.items.dto;
+package org.openhab.core.items.dto;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.types.ArithmeticGroupFunction;
-import org.eclipse.smarthome.core.library.types.StringType;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.types.ArithmeticGroupFunction;
+import org.openhab.core.library.types.StringType;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/AbstractEventFactoryTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/AbstractEventFactoryTest.java
index 8f1630f4c37..1044fac49c5 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/AbstractEventFactoryTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/AbstractEventFactoryTest.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
 import static org.junit.Assert.*;
 
-import org.eclipse.smarthome.core.events.AbstractEventFactory;
+import org.openhab.core.events.AbstractEventFactory;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/ItemEventFactoryTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/ItemEventFactoryTest.java
index 39fc7cf43e3..30e782f7b84 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/ItemEventFactoryTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/items/events/ItemEventFactoryTest.java
@@ -10,22 +10,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.dto.ItemDTOMapper;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.RawType;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.events.Event;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.dto.ItemDTOMapper;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.RawType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 import org.junit.Test;
 
 import com.google.gson.Gson;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/CoreItemFactoryTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/CoreItemFactoryTest.java
index c71cd329ccf..a3648554381 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/CoreItemFactoryTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/CoreItemFactoryTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library;
+package org.openhab.core.library;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.core.IsEqual.equalTo;
@@ -21,8 +21,8 @@
 
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.items.NumberItem;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.items.NumberItem;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/dimension/VolumetricFlowRateTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/dimension/VolumetricFlowRateTest.java
index f79dc18e295..8f24db8a92e 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/dimension/VolumetricFlowRateTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/dimension/VolumetricFlowRateTest.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.dimension;
+package org.openhab.core.library.dimension;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
 import javax.measure.Unit;
 
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
-import org.eclipse.smarthome.core.types.util.UnitUtils;
+import org.openhab.core.library.unit.SmartHomeUnits;
+import org.openhab.core.types.util.UnitUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/CallItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/CallItemTest.java
index 0f6a45b4c66..cb2309052d5 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/CallItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/CallItemTest.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.library.types.StringListType;
+import org.openhab.core.library.types.StringListType;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ColorItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ColorItemTest.java
index 0199a50492e..efa5a8b8fd9 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ColorItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ColorItemTest.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ContactItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ContactItemTest.java
index 002dbcb42e5..aa891e28e1a 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ContactItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ContactItemTest.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.library.types.OpenClosedType;
+import org.openhab.core.library.types.OpenClosedType;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DateTimeItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DateTimeItemTest.java
index 6e0883b4262..e0ca52957d2 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DateTimeItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DateTimeItemTest.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.library.types.DateTimeType;
+import org.openhab.core.library.types.DateTimeType;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DimmerItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DimmerItemTest.java
index e8e4b611d2f..61dc57b41e0 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DimmerItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/DimmerItemTest.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
 import java.math.BigDecimal;
 
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.items.Item;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.types.State;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ImageItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ImageItemTest.java
index 3d7bdefa4ae..e7d180deb5a 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ImageItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/ImageItemTest.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.library.types.RawType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.RawType;
+import org.openhab.core.types.State;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/LocationItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/LocationItemTest.java
index f973487b102..f547b17df35 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/LocationItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/LocationItemTest.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.PointType;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.PointType;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/NumberItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/NumberItemTest.java
index e4c3ff5bdc1..fd37e16c0fd 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/NumberItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/NumberItemTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -19,18 +19,18 @@
 
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.unit.ImperialUnits;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.service.StateDescriptionService;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.UnDefType;
-import org.eclipse.smarthome.core.types.util.UnitUtils;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.ImperialUnits;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.service.StateDescriptionService;
+import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.UnDefType;
+import org.openhab.core.types.util.UnitUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/PlayerItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/PlayerItemTest.java
index 5d2fb101a35..5b68e203567 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/PlayerItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/PlayerItemTest.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.library.types.PlayPauseType;
-import org.eclipse.smarthome.core.library.types.RewindFastforwardType;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.library.types.RewindFastforwardType;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/RollershutterItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/RollershutterItemTest.java
index a083747ca81..af53ddd0bcd 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/RollershutterItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/RollershutterItemTest.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.UpDownType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.UpDownType;
+import org.openhab.core.types.State;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StateUtil.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StateUtil.java
index ecaa0229160..7c0d278463f 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StateUtil.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StateUtil.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.*;
 
@@ -21,23 +21,23 @@
 
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.OpenClosedType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.PlayPauseType;
-import org.eclipse.smarthome.core.library.types.PointType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.types.RawType;
-import org.eclipse.smarthome.core.library.types.RewindFastforwardType;
-import org.eclipse.smarthome.core.library.types.StringListType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.library.types.UpDownType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.OpenClosedType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.PlayPauseType;
+import org.openhab.core.library.types.PointType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.types.RawType;
+import org.openhab.core.library.types.RewindFastforwardType;
+import org.openhab.core.library.types.StringListType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.library.types.UpDownType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 
 /**
  * Utility class for testing states on items
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StringItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StringItemTest.java
index 397a47b9c4d..f91d690d60d 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StringItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/StringItemTest.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.library.types.DateTimeType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.library.types.DateTimeType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.types.State;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/SwitchItemTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/SwitchItemTest.java
index f5ee36dcad0..b957a1c31ba 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/SwitchItemTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/items/SwitchItemTest.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.items;
+package org.openhab.core.library.items;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/ArithmeticGroupFunctionTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/ArithmeticGroupFunctionTest.java
index a5c871f7f1b..cb14a183365 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/ArithmeticGroupFunctionTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/ArithmeticGroupFunctionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,14 +19,14 @@
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.library.items.DimmerItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.Item;
+import org.openhab.core.library.items.DimmerItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeGroupFunctionTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeGroupFunctionTest.java
index d6812523a42..f0a5ba75ddf 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeGroupFunctionTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeGroupFunctionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.junit.Assert.assertTrue;
 
@@ -20,12 +20,12 @@
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.Item;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java
index df657e389ba..d8c043bdf28 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DateTimeTypeTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DecimalTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DecimalTypeTest.java
index 0e3b75410d3..6239e313ed0 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DecimalTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/DecimalTypeTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.junit.Assert.*;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/HSBTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/HSBTypeTest.java
index cef88d1a73d..77dab41ab74 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/HSBTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/HSBTypeTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OnOffTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OnOffTypeTest.java
index abf0a2019db..98cf873bdf7 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OnOffTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OnOffTypeTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OpenClosedTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OpenClosedTypeTest.java
index 26a29712a36..d829906f025 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OpenClosedTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/OpenClosedTypeTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PercentTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PercentTypeTest.java
index a8aeb4af1e4..949ff29ff65 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PercentTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PercentTypeTest.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.junit.Assert.*;
 
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
+import org.openhab.core.library.unit.SmartHomeUnits;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PointTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PointTypeTest.java
index 789fadf6803..ba8c2a6687c 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PointTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/PointTypeTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java
index 46b9e654da5..3c1e36f66e8 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
@@ -25,14 +25,14 @@
 import javax.measure.quantity.Pressure;
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java
index 131bf64d0e5..d224e155994 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/QuantityTypeTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
-import static org.eclipse.smarthome.core.library.unit.MetricPrefix.CENTI;
+import static org.openhab.core.library.unit.MetricPrefix.CENTI;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 
@@ -25,13 +25,13 @@
 import javax.measure.quantity.Speed;
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.library.dimension.DataAmount;
-import org.eclipse.smarthome.core.library.dimension.DataTransferRate;
-import org.eclipse.smarthome.core.library.dimension.Density;
-import org.eclipse.smarthome.core.library.dimension.Intensity;
-import org.eclipse.smarthome.core.library.unit.MetricPrefix;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
+import org.openhab.core.library.dimension.DataAmount;
+import org.openhab.core.library.dimension.DataTransferRate;
+import org.openhab.core.library.dimension.Density;
+import org.openhab.core.library.dimension.Intensity;
+import org.openhab.core.library.unit.MetricPrefix;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.SmartHomeUnits;
 import org.junit.Test;
 
 import tec.uom.se.quantity.QuantityDimension;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringListTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringListTypeTest.java
index 57f3514b62c..6c692a362b3 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringListTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringListTypeTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.junit.Assert.*;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringTypeTest.java
index b6f20684961..6f7c647b55e 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/StringTypeTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.junit.Assert.*;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/UpDownTypeTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/UpDownTypeTest.java
index 19a68315858..8d557edd3ea 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/UpDownTypeTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/types/UpDownTypeTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.types;
+package org.openhab.core.library.types;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/SmartHomeUnitsTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/SmartHomeUnitsTest.java
index 30c8f638270..1cc99f648a0 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/SmartHomeUnitsTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/SmartHomeUnitsTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.library.unit;
+package org.openhab.core.library.unit;
 
-import static org.eclipse.smarthome.core.library.unit.MetricPrefix.HECTO;
+import static org.openhab.core.library.unit.MetricPrefix.HECTO;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.number.IsCloseTo.closeTo;
 import static org.junit.Assert.*;
@@ -26,10 +26,10 @@
 import javax.measure.quantity.Speed;
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.library.dimension.ArealDensity;
-import org.eclipse.smarthome.core.library.dimension.Density;
-import org.eclipse.smarthome.core.library.dimension.Intensity;
-import org.eclipse.smarthome.core.library.types.QuantityType;
+import org.openhab.core.library.dimension.ArealDensity;
+import org.openhab.core.library.dimension.Density;
+import org.openhab.core.library.dimension.Intensity;
+import org.openhab.core.library.types.QuantityType;
 import org.junit.Test;
 
 import tec.uom.se.quantity.Quantities;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/net/HttpServiceUtilTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/net/HttpServiceUtilTest.java
index 4233a7b72be..93c69864ebd 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/net/HttpServiceUtilTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/net/HttpServiceUtilTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.net;
+package org.openhab.core.net;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/net/NetUtilTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/net/NetUtilTest.java
index c3db818452b..bb328ddd3d3 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/net/NetUtilTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/net/NetUtilTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.net;
+package org.openhab.core.net;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/types/CommandDescriptionBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/CommandDescriptionBuilderTest.java
index 0e7e04465ad..270d78f624c 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/types/CommandDescriptionBuilderTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/CommandDescriptionBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/types/StateDescriptionFragmentBuilderTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/StateDescriptionFragmentBuilderTest.java
index a61358ba1e9..8dd8eebbe7c 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/types/StateDescriptionFragmentBuilderTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/StateDescriptionFragmentBuilderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types;
+package org.openhab.core.types;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/types/util/UnitUtilsTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/util/UnitUtilsTest.java
index dc2fa6ca20e..68c3c7f2098 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/types/util/UnitUtilsTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/types/util/UnitUtilsTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.types.util;
+package org.openhab.core.types.util;
 
-import static org.eclipse.smarthome.core.library.unit.MetricPrefix.*;
+import static org.openhab.core.library.unit.MetricPrefix.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.number.IsCloseTo.closeTo;
 import static org.junit.Assert.*;
@@ -24,11 +24,11 @@
 import javax.measure.quantity.Power;
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.library.dimension.Intensity;
-import org.eclipse.smarthome.core.library.unit.ImperialUnits;
-import org.eclipse.smarthome.core.library.unit.MetricPrefix;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
+import org.openhab.core.library.dimension.Intensity;
+import org.openhab.core.library.unit.ImperialUnits;
+import org.openhab.core.library.unit.MetricPrefix;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.SmartHomeUnits;
 import org.junit.Test;
 
 /**
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/util/HexUtilsTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/util/HexUtilsTest.java
index bcc7a8c1f9f..dd76871f82f 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/util/HexUtilsTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/util/HexUtilsTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.util;
+package org.openhab.core.util;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/util/UIDUtilsTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/util/UIDUtilsTest.java
index 99f307976eb..83ce93c799b 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/util/UIDUtilsTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/util/UIDUtilsTest.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.util;
+package org.openhab.core.util;
 
 import java.util.function.Consumer;
 
-import org.eclipse.smarthome.core.common.AbstractUID;
+import org.openhab.core.common.AbstractUID;
 import org.hamcrest.core.IsEqual;
 import org.junit.Assert;
 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 aca07ed9dcd..1f1aee80a19 100644
--- a/features/karaf/openhab-core/src/main/feature/feature.xml
+++ b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -145,7 +145,7 @@
     <bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.http.auth.basic/${project.version}</bundle>
 
     <feature>openhab-core-io-http-auth</feature>
-    <config name="org.eclipse.smarthome.auth">
+    <config name="org.openhab.core.auth">
       enabled = true
     </config>
   </feature>
@@ -223,8 +223,8 @@
 
   <feature name="openhab-core-io-transport-serial" version="${project.version}">
     <feature>openhab-core-base</feature>
-    <requirement>osgi.service;filter:="(objectClass=org.eclipse.smarthome.io.transport.serial.SerialPortManager)"</requirement>
-    <requirement>osgi.service;filter:="(objectClass=org.eclipse.smarthome.io.transport.serial.SerialPortProvider)"</requirement>
+    <requirement>osgi.service;filter:="(objectClass=org.openhab.core.io.transport.serial.SerialPortManager)"</requirement>
+    <requirement>osgi.service;filter:="(objectClass=org.openhab.core.io.transport.serial.SerialPortProvider)"</requirement>
     <feature dependency="true">openhab-core-io-transport-serial-rxtx</feature>
 
     <bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.serial/${project.version}</bundle>
@@ -451,10 +451,10 @@
     <!-- <bundle start-level="30">mvn:org.openhab.core.bundles/org.openhab.ui.start/${project.version}</bundle> -->
     <bundle start-level="90">mvn:org.openhab.core.bundles/org.openhab.core.boot/${project.version}</bundle>
     <bundle>mvn:org.openhab.core.bundles/org.openhab.core.karaf/${project.version}</bundle>
-    <config name="org.eclipse.smarthome.audio">
+    <config name="org.openhab.core.audio">
       defaultSink = enhancedjavasound
     </config>
-    <config name="org.eclipse.smarthome.voice">
+    <config name="org.openhab.core.voice">
       defaultHLI = rulehli
     </config>
   </feature>
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AbstractTestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AbstractTestAgent.java
index dcf6a844ffb..d48a4542d02 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AbstractTestAgent.java
+++ b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AbstractTestAgent.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.test.internal;
+package org.openhab.core.auth.oauth2client.test.internal;
 
 import java.io.IOException;
 import java.util.Map;
 import java.util.UUID;
 
-import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthClientService;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthException;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthFactory;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthResponseException;
+import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
+import org.openhab.core.auth.client.oauth2.OAuthClientService;
+import org.openhab.core.auth.client.oauth2.OAuthException;
+import org.openhab.core.auth.client.oauth2.OAuthFactory;
+import org.openhab.core.auth.client.oauth2.OAuthResponseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java
index 4874d52a33f..bc071da6b68 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java
+++ b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.test.internal;
+package org.openhab.core.auth.oauth2client.test.internal;
 
 import java.util.Map;
 
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthFactory;
+import org.openhab.core.auth.client.oauth2.OAuthFactory;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ConfigurationPolicy;
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java
index e9974f1f03f..ad11f12afaa 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java
+++ b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.test.internal;
+package org.openhab.core.auth.oauth2client.test.internal;
 
 import java.util.Map;
 
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthFactory;
+import org.openhab.core.auth.client.oauth2.OAuthFactory;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ConfigurationPolicy;
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/TestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/TestAgent.java
index 71c470e16b3..3c768c61ae8 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/TestAgent.java
+++ b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/TestAgent.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.test.internal;
+package org.openhab.core.auth.oauth2client.test.internal;
 
 import java.io.IOException;
 
-import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthClientService;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthException;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthResponseException;
+import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
+import org.openhab.core.auth.client.oauth2.OAuthClientService;
+import org.openhab.core.auth.client.oauth2.OAuthException;
+import org.openhab.core.auth.client.oauth2.OAuthResponseException;
 
 /**
  * For testing
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/cipher/CipherTest.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/cipher/CipherTest.java
index 96ecea4ded8..6dc486b3297 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/cipher/CipherTest.java
+++ b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/cipher/CipherTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.test.internal.cipher;
+package org.openhab.core.auth.oauth2client.test.internal.cipher;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -22,7 +22,7 @@
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.eclipse.smarthome.auth.oauth2client.internal.cipher.SymmetricKeyCipher;
+import org.openhab.core.auth.oauth2client.internal.cipher.SymmetricKeyCipher;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.InvalidSyntaxException;
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java
index b811fa70aa1..121f628545a 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java
+++ b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/openhab/core/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java
@@ -10,23 +10,23 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.auth.oauth2client.test.internal.console;
+package org.openhab.core.auth.oauth2client.test.internal.console;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.smarthome.auth.oauth2client.test.internal.AbstractTestAgent;
-import org.eclipse.smarthome.auth.oauth2client.test.internal.AuthorizationCodeTestAgent;
-import org.eclipse.smarthome.auth.oauth2client.test.internal.ResourceOwnerTestAgent;
-import org.eclipse.smarthome.auth.oauth2client.test.internal.TestAgent;
-import org.eclipse.smarthome.core.auth.client.oauth2.AccessTokenResponse;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthClientService;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthException;
-import org.eclipse.smarthome.core.auth.client.oauth2.OAuthResponseException;
-import org.eclipse.smarthome.io.console.Console;
-import org.eclipse.smarthome.io.console.extensions.AbstractConsoleCommandExtension;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.auth.oauth2client.test.internal.AbstractTestAgent;
+import org.openhab.core.auth.oauth2client.test.internal.AuthorizationCodeTestAgent;
+import org.openhab.core.auth.oauth2client.test.internal.ResourceOwnerTestAgent;
+import org.openhab.core.auth.oauth2client.test.internal.TestAgent;
+import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
+import org.openhab.core.auth.client.oauth2.OAuthClientService;
+import org.openhab.core.auth.client.oauth2.OAuthException;
+import org.openhab.core.auth.client.oauth2.OAuthResponseException;
+import org.openhab.core.io.console.Console;
+import org.openhab.core.io.console.extensions.AbstractConsoleCommandExtension;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java
index 0afc6337b60..492d0ab4002 100644
--- a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java
+++ b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationJsonTest.java
@@ -23,23 +23,23 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.core.types.UnDefType;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.types.UnDefType;
+import org.openhab.core.test.java.JavaOSGiTest;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationTest.java b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationTest.java
index d9d975e5ad4..b53c2369a92 100644
--- a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationTest.java
+++ b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationTest.java
@@ -31,23 +31,23 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/HostFragmentSupportTest.java b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/HostFragmentSupportTest.java
index 6855978068a..2a0c7c70125 100644
--- a/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/HostFragmentSupportTest.java
+++ b/itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/HostFragmentSupportTest.java
@@ -19,8 +19,8 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java
index 268092f257d..1ac04087a08 100644
--- a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java
+++ b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java
@@ -26,22 +26,22 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.test.java.JavaOSGiTest;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java
index 80de288904b..1f082cca761 100644
--- a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java
+++ b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java
@@ -26,23 +26,23 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.types.TypeParser;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.types.TypeParser;
+import org.openhab.core.test.java.JavaOSGiTest;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/itests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/java/org/openhab/core/automation/module/script/defaultscope/internal/ScopeTest.java b/itests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/java/org/openhab/core/automation/module/script/defaultscope/internal/ScopeTest.java
index 331d33aa2a5..0403d1f9222 100644
--- a/itests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/java/org/openhab/core/automation/module/script/defaultscope/internal/ScopeTest.java
+++ b/itests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/java/org/openhab/core/automation/module/script/defaultscope/internal/ScopeTest.java
@@ -19,7 +19,7 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.openhab.core.automation.module.script.ScriptEngineContainer;
diff --git a/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleTest.java b/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleTest.java
index f0e38acc726..0c0a8c16a9f 100644
--- a/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleTest.java
+++ b/itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/ScriptRuleTest.java
@@ -22,21 +22,21 @@
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.test.java.JavaOSGiTest;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.Before;
 import org.junit.Test;
 import org.openhab.core.automation.Action;
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
index 7e8362cd341..75907494fb8 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
@@ -25,22 +25,22 @@
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.test.java.JavaOSGiTest;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.Before;
 import org.junit.Test;
 import org.openhab.core.automation.Action;
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
index 54c6b151d27..9ced33fdc3f 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
@@ -21,7 +21,7 @@
 import java.util.Collections;
 import java.util.Locale;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.junit.Test;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.internal.module.handler.DayOfWeekConditionHandler;
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
index 352c0fe941a..5310bcaae5c 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
@@ -24,17 +24,17 @@
 import java.util.Random;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.test.java.JavaOSGiTest;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.Before;
 import org.junit.Test;
 import org.openhab.core.automation.Action;
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayConditionHandlerTest.java
index 2ad062a3525..9a43962c361 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayConditionHandlerTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayConditionHandlerTest.java
@@ -22,7 +22,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.Configuration;
+import org.openhab.core.config.core.Configuration;
 import org.junit.Test;
 import org.openhab.core.automation.Condition;
 import org.openhab.core.automation.internal.module.handler.DayOfWeekConditionHandler;
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java
index 7b8707e6e4a..cf3858d85fe 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java
@@ -15,8 +15,8 @@
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.test.java.JavaOSGiTest;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.Before;
 import org.junit.Test;
 import org.openhab.core.automation.RuleRegistry;
diff --git a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java
index 201ea3482a0..97b5fdc404f 100644
--- a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java
+++ b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java
@@ -28,22 +28,22 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.test.java.JavaOSGiTest;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.Before;
 import org.junit.Test;
 import org.openhab.core.automation.Action;
diff --git a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/RuleEngineTest.java b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/RuleEngineTest.java
index f97da3dad8f..165101d2e66 100644
--- a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/RuleEngineTest.java
+++ b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/RuleEngineTest.java
@@ -20,13 +20,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.FilterCriteria;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.FilterCriteria;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/RuleRegistryTest.java b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/RuleRegistryTest.java
index 65a7a03fd00..6cbd651cc03 100644
--- a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/RuleRegistryTest.java
+++ b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/RuleRegistryTest.java
@@ -20,7 +20,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/TestModuleTypeProvider.java b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/TestModuleTypeProvider.java
index e0625cf169d..b99128707b3 100644
--- a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/TestModuleTypeProvider.java
+++ b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/internal/TestModuleTypeProvider.java
@@ -26,7 +26,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
+import org.openhab.core.common.registry.ProviderChangeListener;
 import org.openhab.core.automation.type.ActionType;
 import org.openhab.core.automation.type.ConditionType;
 import org.openhab.core.automation.type.Input;
diff --git a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoI18nTest.java b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoI18nTest.java
index 9289d0c5792..eaf1d3631a1 100644
--- a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoI18nTest.java
+++ b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoI18nTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.xml.test;
+package org.openhab.core.binding.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -20,10 +20,10 @@
 import java.util.Locale;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.binding.BindingInfo;
-import org.eclipse.smarthome.core.binding.BindingInfoRegistry;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.binding.BindingInfo;
+import org.openhab.core.binding.BindingInfoRegistry;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.service.cm.Configuration;
@@ -91,7 +91,7 @@ public void assertUsingDefaultLocale() throws Exception {
         ConfigurationAdmin configAdmin = getService(ConfigurationAdmin.class);
         assertThat(configAdmin, is(notNullValue()));
 
-        Configuration config = configAdmin.getConfiguration("org.eclipse.smarthome.i18n", null);
+        Configuration config = configAdmin.getConfiguration("org.openhab.core.i18n", null);
         assertThat(config, is(notNullValue()));
 
         Dictionary<String, Object> properties = config.getProperties();
diff --git a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoTest.java b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoTest.java
index 2288bb9b9b7..a7f3d15b506 100644
--- a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoTest.java
+++ b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.xml.test;
+package org.openhab.core.binding.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -20,12 +20,12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.core.binding.BindingInfo;
-import org.eclipse.smarthome.core.binding.BindingInfoRegistry;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.binding.BindingInfo;
+import org.openhab.core.binding.BindingInfoRegistry;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInstaller.java b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInstaller.java
index e4253757a60..71756af7107 100644
--- a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInstaller.java
+++ b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInstaller.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.binding.xml.test;
+package org.openhab.core.binding.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
 import java.util.function.Consumer;
 
-import org.eclipse.smarthome.core.binding.BindingInfoRegistry;
-import org.eclipse.smarthome.test.BundleCloseable;
-import org.eclipse.smarthome.test.SyntheticBundleInstaller;
+import org.openhab.core.binding.BindingInfoRegistry;
+import org.openhab.core.test.BundleCloseable;
+import org.openhab.core.test.SyntheticBundleInstaller;
 import org.osgi.framework.BundleContext;
 
 /**
diff --git a/itests/org.openhab.core.config.core.tests/src/main/java/org/openhab/core/config/core/ConfigOptionRegistryOSGiTest.java b/itests/org.openhab.core.config.core.tests/src/main/java/org/openhab/core/config/core/ConfigOptionRegistryOSGiTest.java
index 56167f57897..b4730d8b390 100644
--- a/itests/org.openhab.core.config.core.tests/src/main/java/org/openhab/core/config/core/ConfigOptionRegistryOSGiTest.java
+++ b/itests/org.openhab.core.config.core.tests/src/main/java/org/openhab/core/config/core/ConfigOptionRegistryOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.core;
+package org.openhab.core.config.core;
 
 import static java.util.Collections.singleton;
 import static org.hamcrest.CoreMatchers.*;
@@ -22,7 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java b/itests/org.openhab.core.config.discovery.mdns.tests/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java
index ec0015f57ac..2d4d885dd25 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/src/main/java/org/openhab/core/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.mdns.internal;
+package org.openhab.core.config.discovery.mdns.internal;
 
-import static org.eclipse.smarthome.config.discovery.DiscoveryService.CONFIG_PROPERTY_BACKGROUND_DISCOVERY;
+import static org.openhab.core.config.discovery.DiscoveryService.CONFIG_PROPERTY_BACKGROUND_DISCOVERY;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
 import java.util.Hashtable;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryService;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.service.cm.Configuration;
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMock.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMock.java
index 01973dfb1e5..28c2ace41b3 100644
--- a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMock.java
+++ b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMock.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import java.util.Collections;
 import java.util.Random;
 
-import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.internal.DiscoveryResultImpl;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * The {@link DiscoveryServiceMock} is a mock for a {@link
- * org.eclipse.smarthome.config.discovery.DiscoveryService} which can simulate a working and faulty
+ * org.openhab.core.config.discovery.DiscoveryService} which can simulate a working and faulty
  * discovery.<br>
  * If this mock is configured to be faulty, an exception is thrown if the discovery is enforced or
  * aborted.
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMockOfBridge.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMockOfBridge.java
index 7a4be2bfaf8..76a44bbe957 100644
--- a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMockOfBridge.java
+++ b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceMockOfBridge.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import java.util.Random;
 
-import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
+import org.openhab.core.config.discovery.internal.DiscoveryResultImpl;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * @author Andre Fuechsel - Initial contribution
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java
index 5a6ca5810f4..dbc37d12810 100644
--- a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java
+++ b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/DiscoveryServiceRegistryOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery;
+package org.openhab.core.config.discovery;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -21,11 +21,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.smarthome.config.discovery.inbox.Inbox;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.discovery.inbox.Inbox;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/inbox/DynamicThingUpdateOSGiTest.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/inbox/DynamicThingUpdateOSGiTest.java
index 563999c9ffa..3ef6df30e6a 100644
--- a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/inbox/DynamicThingUpdateOSGiTest.java
+++ b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/inbox/DynamicThingUpdateOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.inbox;
+package org.openhab.core.config.discovery.inbox;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -20,24 +20,24 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryService;
-import org.eclipse.smarthome.config.discovery.internal.DiscoveryResultImpl;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingStatusInfoBuilder;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.config.discovery.internal.DiscoveryResultImpl;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerCallback;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java
index 4fe9e86f81f..5aa680b665d 100644
--- a/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java
+++ b/itests/org.openhab.core.config.discovery.tests/src/main/java/org/openhab/core/config/discovery/internal/InboxOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.internal;
+package org.openhab.core.config.discovery.internal;
 
 import static java.util.Collections.*;
 import static java.util.stream.Collectors.*;
@@ -36,40 +36,40 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.discovery.AbstractDiscoveryService;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultBuilder;
-import org.eclipse.smarthome.config.discovery.DiscoveryResultFlag;
-import org.eclipse.smarthome.config.discovery.inbox.Inbox;
-import org.eclipse.smarthome.config.discovery.inbox.InboxFilterCriteria;
-import org.eclipse.smarthome.config.discovery.inbox.InboxListener;
-import org.eclipse.smarthome.config.discovery.inbox.events.InboxAddedEvent;
-import org.eclipse.smarthome.config.discovery.inbox.events.InboxRemovedEvent;
-import org.eclipse.smarthome.config.discovery.inbox.events.InboxUpdatedEvent;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
-import org.eclipse.smarthome.test.AsyncResultWrapper;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.discovery.AbstractDiscoveryService;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultBuilder;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.config.discovery.inbox.Inbox;
+import org.openhab.core.config.discovery.inbox.InboxFilterCriteria;
+import org.openhab.core.config.discovery.inbox.InboxListener;
+import org.openhab.core.config.discovery.inbox.events.InboxAddedEvent;
+import org.openhab.core.config.discovery.inbox.events.InboxRemovedEvent;
+import org.openhab.core.config.discovery.inbox.events.InboxUpdatedEvent;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.binding.builder.BridgeBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.test.AsyncResultWrapper;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
index 92bcb17689d..4e5b07a1f4a 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal;
+package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptySet;
@@ -24,9 +24,9 @@
 import java.io.IOException;
 import java.util.HashSet;
 
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
-import org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal.DeltaUsbSerialScanner.Delta;
-import org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.testutil.UsbSerialDeviceInformationGenerator;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.linuxsysfs.internal.DeltaUsbSerialScanner.Delta;
+import org.openhab.core.config.discovery.usbserial.linuxsysfs.testutil.UsbSerialDeviceInformationGenerator;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
index 8e050918776..8da24795f25 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal;
+package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal;
 
 import static java.util.Arrays.asList;
-import static org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal.PollingUsbSerialScanner.PAUSE_BETWEEN_SCANS_IN_SECONDS_ATTRIBUTE;
+import static org.openhab.core.config.discovery.usbserial.linuxsysfs.internal.PollingUsbSerialScanner.PAUSE_BETWEEN_SCANS_IN_SECONDS_ATTRIBUTE;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
@@ -22,9 +22,9 @@
 import java.util.HashSet;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscoveryListener;
-import org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.testutil.UsbSerialDeviceInformationGenerator;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDiscoveryListener;
+import org.openhab.core.config.discovery.usbserial.linuxsysfs.testutil.UsbSerialDeviceInformationGenerator;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
index 040914b9d25..276c65c66db 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal;
+package org.openhab.core.config.discovery.usbserial.linuxsysfs.internal;
 
 import static java.lang.Integer.toHexString;
 import static java.nio.file.Files.*;
 import static java.nio.file.attribute.PosixFilePermission.*;
 import static java.util.Arrays.asList;
-import static org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.internal.SysfsUsbSerialScanner.*;
+import static org.openhab.core.config.discovery.usbserial.linuxsysfs.internal.SysfsUsbSerialScanner.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
@@ -30,7 +30,7 @@
 import java.util.HashSet;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
 import org.hamcrest.Matcher;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/testutil/UsbSerialDeviceInformationGenerator.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/testutil/UsbSerialDeviceInformationGenerator.java
index fff08121af0..e816b18738b 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/testutil/UsbSerialDeviceInformationGenerator.java
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/main/java/org/openhab/core/config/discovery/usbserial/linuxsysfs/testutil/UsbSerialDeviceInformationGenerator.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.testutil;
+package org.openhab.core.config.discovery.usbserial.linuxsysfs.testutil;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
 
 /**
  * Generate simple instances of {@link UsbSerialDeviceInformation} that can be used in tests.
diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
index 0f9e633ad00..b60b5584777 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -9,7 +9,7 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial
 # additionally blacklist the linuxsysfs bundle to ensure our one is preferred.
 
 Provide-Capability: \
-    osgi.service;objectClass:List<String>="org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscovery"
+    osgi.service;objectClass:List<String>="org.openhab.core.config.discovery.usbserial.UsbSerialDiscovery"
 -runblacklist: \
     bnd.identity;id='org.openhab.core.config.discovery.usbserial.linuxsysfs'
 
diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java b/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
index 53e6ccaf118..421ae938389 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.internal;
+package org.openhab.core.config.discovery.usbserial.internal;
 
 import static java.util.Arrays.asList;
-import static org.eclipse.smarthome.config.discovery.DiscoveryService.CONFIG_PROPERTY_BACKGROUND_DISCOVERY;
+import static org.openhab.core.config.discovery.DiscoveryService.CONFIG_PROPERTY_BACKGROUND_DISCOVERY;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
@@ -27,15 +27,15 @@
 import java.util.Hashtable;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.discovery.DiscoveryListener;
-import org.eclipse.smarthome.config.discovery.DiscoveryResult;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscovery;
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDiscoveryParticipant;
-import org.eclipse.smarthome.config.discovery.usbserial.testutil.UsbSerialDeviceInformationGenerator;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.discovery.DiscoveryListener;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDiscovery;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDiscoveryParticipant;
+import org.openhab.core.config.discovery.usbserial.testutil.UsbSerialDeviceInformationGenerator;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java b/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java
index e822d947c31..202d081dfbf 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/src/main/java/org/openhab/core/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.discovery.usbserial.testutil;
+package org.openhab.core.config.discovery.usbserial.testutil;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.eclipse.smarthome.config.discovery.usbserial.UsbSerialDeviceInformation;
+import org.openhab.core.config.discovery.usbserial.UsbSerialDeviceInformation;
 
 /**
  * Generate simple instances of {@link UsbSerialDeviceInformation} that can be used in tests.
diff --git a/itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java b/itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java
index ed65daed327..b7fc92b349e 100644
--- a/itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java
+++ b/itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.dispatch.internal;
+package org.openhab.core.config.dispatch.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -27,8 +27,8 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
diff --git a/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/BindingInstaller.java b/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/BindingInstaller.java
index 1afc46e75c9..058812741fa 100644
--- a/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/BindingInstaller.java
+++ b/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/BindingInstaller.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.test;
+package org.openhab.core.config.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
 import java.util.function.Consumer;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.test.BundleCloseable;
-import org.eclipse.smarthome.test.SyntheticBundleInstaller;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.test.BundleCloseable;
+import org.openhab.core.test.SyntheticBundleInstaller;
 import org.osgi.framework.BundleContext;
 
 /**
diff --git a/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionI18nTest.java b/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionI18nTest.java
index ca5b885d695..d0221a3ca36 100644
--- a/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionI18nTest.java
+++ b/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionI18nTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.test;
+package org.openhab.core.config.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -20,11 +20,11 @@
 import java.util.Locale;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionsTest.java b/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionsTest.java
index 5d9890d58ca..df1531b4821 100644
--- a/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionsTest.java
+++ b/itests/org.openhab.core.config.xml.tests/src/main/java/org/openhab/core/config/xml/test/ConfigDescriptionsTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.config.xml.test;
+package org.openhab.core.config.xml.test;
 
 import static java.util.stream.Collectors.joining;
 import static org.hamcrest.CoreMatchers.*;
@@ -24,14 +24,14 @@
 import java.util.Locale;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.test.BundleCloseable;
-import org.eclipse.smarthome.test.SyntheticBundleInstaller;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.test.BundleCloseable;
+import org.openhab.core.test.SyntheticBundleInstaller;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.ephemeris.tests/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java b/itests/org.openhab.core.ephemeris.tests/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java
index f8370156091..83156de5c0f 100644
--- a/itests/org.openhab.core.ephemeris.tests/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java
+++ b/itests/org.openhab.core.ephemeris.tests/src/main/java/org/openhab/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.ephemeris.internal;
+package org.openhab.core.ephemeris.internal;
 
-import static org.eclipse.smarthome.core.ephemeris.internal.EphemerisManagerImpl.*;
+import static org.openhab.core.ephemeris.internal.EphemerisManagerImpl.*;
 import static org.junit.Assert.*;
 
 import java.net.URI;
@@ -31,9 +31,9 @@
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.ephemeris.EphemerisManager;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.ephemeris.EphemerisManager;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.hamcrest.CoreMatchers;
 import org.junit.Assume;
 import org.junit.Before;
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResourceOSGITest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResourceOSGITest.java
index b4d6222756e..b54958ebd09 100644
--- a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResourceOSGITest.java
+++ b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResourceOSGITest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.discovery;
+package org.openhab.core.io.rest.core.internal.discovery;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -19,13 +19,13 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.discovery.inbox.Inbox;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.discovery.inbox.Inbox;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java
index 992cf1ca1d6..e6b0fb75783 100644
--- a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java
+++ b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/item/ItemResourceOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.item;
+package org.openhab.core.io.rest.core.internal.item;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -31,19 +31,19 @@
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.io.IOUtils;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ManagedItemProvider;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataProvider;
-import org.eclipse.smarthome.core.items.dto.GroupItemDTO;
-import org.eclipse.smarthome.core.items.dto.MetadataDTO;
-import org.eclipse.smarthome.core.library.items.DimmerItem;
-import org.eclipse.smarthome.core.library.items.StringItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.io.rest.RESTResource;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ManagedItemProvider;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataProvider;
+import org.openhab.core.items.dto.GroupItemDTO;
+import org.openhab.core.items.dto.MetadataDTO;
+import org.openhab.core.library.items.DimmerItem;
+import org.openhab.core.library.items.StringItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.io.rest.RESTResource;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResourceTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResourceTest.java
index df436e7be03..ad71b611108 100644
--- a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResourceTest.java
+++ b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/persistence/PersistenceResourceTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.persistence;
+package org.openhab.core.io.rest.core.internal.persistence;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -21,14 +21,14 @@
 import java.util.List;
 import java.util.TimeZone;
 
-import org.eclipse.smarthome.core.i18n.TimeZoneProvider;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.persistence.HistoricItem;
-import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry;
-import org.eclipse.smarthome.core.persistence.QueryablePersistenceService;
-import org.eclipse.smarthome.core.persistence.dto.ItemHistoryDTO;
-import org.eclipse.smarthome.core.persistence.dto.ItemHistoryDTO.HistoryDataBean;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.i18n.TimeZoneProvider;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.persistence.HistoricItem;
+import org.openhab.core.persistence.PersistenceServiceRegistry;
+import org.openhab.core.persistence.QueryablePersistenceService;
+import org.openhab.core.persistence.dto.ItemHistoryDTO;
+import org.openhab.core.persistence.dto.ItemHistoryDTO.HistoryDataBean;
+import org.openhab.core.types.State;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResourceTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResourceTest.java
index 6c30847236d..8a666e062b5 100644
--- a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResourceTest.java
+++ b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/profile/ProfileTypeResourceTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.profile;
+package org.openhab.core.io.rest.core.internal.profile;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -22,16 +22,16 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeBuilder;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeRegistry;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.dto.ProfileTypeDTO;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeBuilder;
+import org.openhab.core.thing.profiles.ProfileTypeRegistry;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.dto.ProfileTypeDTO;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResourceOSGiTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResourceOSGiTest.java
index 0c47e8d3edf..2399ab6e2c1 100644
--- a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResourceOSGiTest.java
+++ b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/internal/service/ConfigurableServiceResourceOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.internal.service;
+package org.openhab.core.io.rest.core.internal.service;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -26,9 +26,9 @@
 
 import javax.ws.rs.core.Response;
 
-import org.eclipse.smarthome.io.rest.core.service.ConfigurableServiceDTO;
-import org.eclipse.smarthome.test.AsyncResultWrapper;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.io.rest.core.service.ConfigurableServiceDTO;
+import org.openhab.core.test.AsyncResultWrapper;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.service.cm.Configuration;
@@ -135,7 +135,7 @@ public void assertConfigurationManagementWorks() {
 
         response = configurableServiceResource.deleteConfiguration("id");
         assertThat(response.getStatus(), is(200));
-        assertThat(((org.eclipse.smarthome.config.core.Configuration) response.getEntity()).getProperties().get("a"),
+        assertThat(((org.openhab.core.config.core.Configuration) response.getEntity()).getProperties().get("a"),
                 is(equalTo("c")));
 
         response = configurableServiceResource.getConfiguration("id");
diff --git a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperWithTransformOSGiTest.java b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperWithTransformOSGiTest.java
index 70913cfb6f6..1bb8844edca 100644
--- a/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperWithTransformOSGiTest.java
+++ b/itests/org.openhab.core.io.rest.core.tests/src/main/java/org/openhab/core/io/rest/core/item/EnrichedItemDTOMapperWithTransformOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.io.rest.core.item;
+package org.openhab.core.io.rest.core.item;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -20,12 +20,12 @@
 import java.math.BigDecimal;
 import java.util.Collections;
 
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.service.StateDescriptionService;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateOption;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.service.StateDescriptionService;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateOption;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/itests/org.openhab.core.model.core.tests/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserverTest.java b/itests/org.openhab.core.model.core.tests/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserverTest.java
index 28486ef9277..0b20b1287b5 100644
--- a/itests/org.openhab.core.model.core.tests/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserverTest.java
+++ b/itests/org.openhab.core.model.core.tests/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserverTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.core.internal.folder;
+package org.openhab.core.model.core.internal.folder;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -32,12 +32,12 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.SystemUtils;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.core.service.AbstractWatchService;
-import org.eclipse.smarthome.model.core.ModelParser;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.core.ModelRepositoryChangeListener;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.service.AbstractWatchService;
+import org.openhab.core.model.core.ModelParser;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.core.ModelRepositoryChangeListener;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericItemProviderTest.java b/itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericItemProviderTest.java
index 2b5cab4df1c..7db6c9c64cf 100644
--- a/itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericItemProviderTest.java
+++ b/itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericItemProviderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.item.internal;
+package org.openhab.core.model.item.internal;
 
 import static java.util.stream.Collectors.*;
 import static org.hamcrest.CoreMatchers.*;
@@ -31,32 +31,32 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupFunction;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataRegistry;
-import org.eclipse.smarthome.core.items.events.AbstractItemRegistryEvent;
-import org.eclipse.smarthome.core.items.events.ItemAddedEvent;
-import org.eclipse.smarthome.core.items.events.ItemRemovedEvent;
-import org.eclipse.smarthome.core.items.events.ItemUpdatedEvent;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.ArithmeticGroupFunction;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.UnDefType;
-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.test.java.JavaOSGiTest;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupFunction;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataRegistry;
+import org.openhab.core.items.events.AbstractItemRegistryEvent;
+import org.openhab.core.items.events.ItemAddedEvent;
+import org.openhab.core.items.events.ItemRemovedEvent;
+import org.openhab.core.items.events.ItemUpdatedEvent;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.ArithmeticGroupFunction;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.UnDefType;
+import org.openhab.core.model.core.EventType;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.core.ModelRepositoryChangeListener;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericMetadataProviderTest.java b/itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericMetadataProviderTest.java
index e26382201e1..961eb008674 100644
--- a/itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericMetadataProviderTest.java
+++ b/itests/org.openhab.core.model.item.tests/src/main/java/org/openhab/core/model/item/internal/GenericMetadataProviderTest.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.item.internal;
+package org.openhab.core.model.item.internal;
 
 import static org.junit.Assert.*;
 
 import java.util.Collection;
 
-import org.eclipse.smarthome.core.items.Metadata;
+import org.openhab.core.items.Metadata;
 import org.junit.Test;
 
 /**
diff --git a/itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/extensions/PersistenceExtensionsTest.java b/itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/extensions/PersistenceExtensionsTest.java
index 7755b874b76..0c637f76c62 100644
--- a/itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/extensions/PersistenceExtensionsTest.java
+++ b/itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/extensions/PersistenceExtensionsTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.persistence.extensions;
+package org.openhab.core.model.persistence.extensions;
 
 import static org.junit.Assert.*;
 
@@ -18,14 +18,14 @@
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.persistence.HistoricItem;
-import org.eclipse.smarthome.core.persistence.PersistenceService;
-import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.model.persistence.tests.TestPersistenceService;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.persistence.HistoricItem;
+import org.openhab.core.persistence.PersistenceService;
+import org.openhab.core.persistence.PersistenceServiceRegistry;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.model.persistence.tests.TestPersistenceService;
 import org.joda.time.DateMidnight;
 import org.joda.time.DateTime;
 import org.junit.After;
diff --git a/itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/tests/TestPersistenceService.java b/itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/tests/TestPersistenceService.java
index 0383755762a..38e9194e64c 100644
--- a/itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/tests/TestPersistenceService.java
+++ b/itests/org.openhab.core.model.persistence.tests/src/main/java/org/openhab/core/model/persistence/tests/TestPersistenceService.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.persistence.tests;
+package org.openhab.core.model.persistence.tests;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -19,14 +19,14 @@
 import java.util.Locale;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.persistence.FilterCriteria;
-import org.eclipse.smarthome.core.persistence.FilterCriteria.Ordering;
-import org.eclipse.smarthome.core.persistence.HistoricItem;
-import org.eclipse.smarthome.core.persistence.PersistenceItemInfo;
-import org.eclipse.smarthome.core.persistence.QueryablePersistenceService;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.items.Item;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.persistence.FilterCriteria;
+import org.openhab.core.persistence.FilterCriteria.Ordering;
+import org.openhab.core.persistence.HistoricItem;
+import org.openhab.core.persistence.PersistenceItemInfo;
+import org.openhab.core.persistence.QueryablePersistenceService;
+import org.openhab.core.types.State;
 
 /**
  * A simple persistence service used for unit tests
diff --git a/itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleExecutionTest.java b/itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleExecutionTest.java
index d1e55f5dd96..01d36f089d0 100644
--- a/itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleExecutionTest.java
+++ b/itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleExecutionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.runtime.internal.engine;
+package org.openhab.core.model.rule.runtime.internal.engine;
 
 import static org.junit.Assert.*;
 
@@ -21,22 +21,22 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.GenericItem;
-import org.eclipse.smarthome.core.items.GroupItem;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.rule.rules.Rule;
-import org.eclipse.smarthome.model.rule.runtime.RuleEngine;
-import org.eclipse.smarthome.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.items.GroupItem;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.rule.rules.Rule;
+import org.openhab.core.model.rule.runtime.RuleEngine;
+import org.openhab.core.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerTest.java b/itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerTest.java
index 3d3405fc91d..76e476ebf36 100644
--- a/itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerTest.java
+++ b/itests/org.openhab.core.model.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/internal/engine/RuleTriggerTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.rule.runtime.internal.engine;
+package org.openhab.core.model.rule.runtime.internal.engine;
 
 import static org.junit.Assert.*;
 
@@ -18,15 +18,15 @@
 import java.util.Iterator;
 import java.util.function.Function;
 
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.rule.rules.ChangedEventTrigger;
-import org.eclipse.smarthome.model.rule.rules.CommandEventTrigger;
-import org.eclipse.smarthome.model.rule.rules.EventEmittedTrigger;
-import org.eclipse.smarthome.model.rule.rules.EventTrigger;
-import org.eclipse.smarthome.model.rule.rules.Rule;
-import org.eclipse.smarthome.model.rule.runtime.RuleEngine;
-import org.eclipse.smarthome.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.rule.rules.ChangedEventTrigger;
+import org.openhab.core.model.rule.rules.CommandEventTrigger;
+import org.openhab.core.model.rule.rules.EventEmittedTrigger;
+import org.openhab.core.model.rule.rules.EventTrigger;
+import org.openhab.core.model.rule.rules.Rule;
+import org.openhab.core.model.rule.runtime.RuleEngine;
+import org.openhab.core.model.rule.runtime.internal.engine.RuleTriggerManager.TriggerTypes;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/actions/ScriptExecutionTest.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/actions/ScriptExecutionTest.java
index c718f32ab44..c6c55e36557 100644
--- a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/actions/ScriptExecutionTest.java
+++ b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/actions/ScriptExecutionTest.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.actions;
+package org.openhab.core.model.script.actions;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.joda.time.Instant.now;
 import static org.junit.Assert.assertThat;
 
-import org.eclipse.smarthome.model.script.scheduler.test.MockClosure.MockClosure0;
-import org.eclipse.smarthome.model.script.scheduler.test.MockClosure.MockClosure1;
-import org.eclipse.smarthome.model.script.scheduler.test.MockScheduler;
+import org.openhab.core.model.script.scheduler.test.MockClosure.MockClosure0;
+import org.openhab.core.model.script.scheduler.test.MockClosure.MockClosure1;
+import org.openhab.core.model.script.scheduler.test.MockScheduler;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.quartz.SchedulerException;
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/engine/ScriptEngineOSGiTest.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/engine/ScriptEngineOSGiTest.java
index f2245ffd17c..841573d77e5 100644
--- a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/engine/ScriptEngineOSGiTest.java
+++ b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/engine/ScriptEngineOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.engine;
+package org.openhab.core.model.script.engine;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -21,22 +21,22 @@
 import javax.measure.quantity.Length;
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.unit.MetricPrefix;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.model.script.ScriptServiceUtil;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.MetricPrefix;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.library.unit.SmartHomeUnits;
+import org.openhab.core.types.State;
+import org.openhab.core.model.script.ScriptServiceUtil;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -105,18 +105,18 @@ public void testInterpreter() throws ScriptParsingException, ScriptExecutionExce
         OnOffType switch1State = runScript("Switch1.state = ON;Switch1.state = OFF;Switch1.state = ON;Switch1.state");
 
         assertNotNull(switch1State);
-        assertEquals("org.eclipse.smarthome.core.library.types.OnOffType", switch1State.getClass().getName());
+        assertEquals("org.openhab.core.library.types.OnOffType", switch1State.getClass().getName());
         assertEquals("ON", switch1State.toString());
     }
 
     @SuppressWarnings("null")
     @Test
     public void testAssignQuantityType() throws ScriptParsingException, ScriptExecutionException {
-        runScript("NumberA.state = 20.0|°C as org.eclipse.smarthome.core.types.State");
+        runScript("NumberA.state = 20.0|°C as org.openhab.core.types.State");
 
         State numberState = itemRegistry.get(NUMBER_ITEM_TEMPERATURE).getState();
         assertNotNull(numberState);
-        assertEquals("org.eclipse.smarthome.core.library.types.QuantityType", numberState.getClass().getName());
+        assertEquals("org.openhab.core.library.types.QuantityType", numberState.getClass().getName());
         assertEquals("20.0 °C", numberState.toString());
     }
 
@@ -228,7 +228,7 @@ public void testpostUpdateQuantityType() throws ScriptParsingException, ScriptEx
     @Test
     public void testAssignAndCompareQuantityType() throws ScriptParsingException, ScriptExecutionException {
         assertFalse(
-                runScript("NumberA.state = 20.0|°C as org.eclipse.smarthome.core.types.State; NumberA.state < 20|°F"));
+                runScript("NumberA.state = 20.0|°C as org.openhab.core.types.State; NumberA.state < 20|°F"));
     }
 
     @Test
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/lib/NumberExtensionsTest.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/lib/NumberExtensionsTest.java
index 02fe8d11f28..140b7f7ebd1 100644
--- a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/lib/NumberExtensionsTest.java
+++ b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/lib/NumberExtensionsTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.lib;
+package org.openhab.core.model.script.lib;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -21,10 +21,10 @@
 import javax.measure.quantity.Length;
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.unit.SmartHomeUnits;
-import org.eclipse.smarthome.core.types.Type;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.SmartHomeUnits;
+import org.openhab.core.types.Type;
 import org.junit.Test;
 
 /**
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/AbstractScheduler.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/AbstractScheduler.java
index 857c1c0964e..e6d15ada0c1 100644
--- a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/AbstractScheduler.java
+++ b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/AbstractScheduler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.scheduler.test;
+package org.openhab.core.model.script.scheduler.test;
 
 import java.util.Date;
 import java.util.List;
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockClosure.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockClosure.java
index 575b4731907..f5a432fe8a9 100644
--- a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockClosure.java
+++ b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockClosure.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.scheduler.test;
+package org.openhab.core.model.script.scheduler.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.joda.time.Instant.now;
 import static org.junit.Assert.assertThat;
 
-import org.eclipse.smarthome.model.script.actions.Timer;
+import org.openhab.core.model.script.actions.Timer;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure0;
 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockScheduler.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockScheduler.java
index 9b495368ff3..d53b4f4ff56 100644
--- a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockScheduler.java
+++ b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/scheduler/test/MockScheduler.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.script.scheduler.test;
+package org.openhab.core.model.script.scheduler.test;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/tests/lib/NumberExtensionsTest.java b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/tests/lib/NumberExtensionsTest.java
index 56ac5c84ded..2fe512e225d 100644
--- a/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/tests/lib/NumberExtensionsTest.java
+++ b/itests/org.openhab.core.model.script.tests/src/main/java/org/openhab/core/model/script/tests/lib/NumberExtensionsTest.java
@@ -12,14 +12,14 @@
  */
 /**
  */
-package org.eclipse.smarthome.model.script.tests.lib;
+package org.openhab.core.model.script.tests.lib;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.types.Type;
-import org.eclipse.smarthome.model.script.lib.NumberExtensions;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.types.Type;
+import org.openhab.core.model.script.lib.NumberExtensions;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -521,7 +521,7 @@ public void testOperatorGreaterEqualsThanNullNull() {
     }
 
     /**
-     * Test method for {@link NumberExtensions#operator_equals(org.eclipse.smarthome.core.types.Type, java.lang.Number)}
+     * Test method for {@link NumberExtensions#operator_equals(org.openhab.core.types.Type, java.lang.Number)}
      */
     @Test
     public void testOperatorEqualsTypeNumber() {
@@ -541,7 +541,7 @@ public void testOperatorEqualsTypeNumber() {
 
     /**
      * Test method for
-     * {@link NumberExtensions#operator_notEquals(org.eclipse.smarthome.core.types.Type, java.lang.Number)}
+     * {@link NumberExtensions#operator_notEquals(org.openhab.core.types.Type, java.lang.Number)}
      */
     @Test
     public void testOperatorNotEqualsTypeNumber() {
@@ -561,7 +561,7 @@ public void testOperatorNotEqualsTypeNumber() {
 
     /**
      * Test method for
-     * {@link NumberExtensions#operator_greaterThan(org.eclipse.smarthome.core.types.Type, java.lang.Number)}
+     * {@link NumberExtensions#operator_greaterThan(org.openhab.core.types.Type, java.lang.Number)}
      */
     @Test
     public void testOperatorGreaterThanTypeNumber() {
@@ -581,7 +581,7 @@ public void testOperatorGreaterThanTypeNumber() {
 
     /**
      * Test method for
-     * {@link NumberExtensions#operator_greaterEqualsThan(org.eclipse.smarthome.core.types.Type, java.lang.Number)}
+     * {@link NumberExtensions#operator_greaterEqualsThan(org.openhab.core.types.Type, java.lang.Number)}
      */
     @Test
     public void testOperatorGreaterEqualsThanTypeNumber() {
@@ -607,7 +607,7 @@ public void testOperatorGreaterEqualsThanTypeNumber() {
 
     /**
      * Test method for
-     * {@link NumberExtensions#operator_lessThan(org.eclipse.smarthome.core.types.Type, java.lang.Number)}
+     * {@link NumberExtensions#operator_lessThan(org.openhab.core.types.Type, java.lang.Number)}
      */
     @Test
     public void testOperatorLessThanTypeNumber() {
@@ -627,7 +627,7 @@ public void testOperatorLessThanTypeNumber() {
 
     /**
      * Test method for
-     * {@link NumberExtensions#operator_lessEqualsThan(org.eclipse.smarthome.core.types.Type, java.lang.Number)}
+     * {@link NumberExtensions#operator_lessEqualsThan(org.openhab.core.types.Type, java.lang.Number)}
      */
     @Test
     public void testOperatorLessEqualsThanTypeNumber() {
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/GenericItemChannelLinkProviderJavaTest.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/GenericItemChannelLinkProviderJavaTest.java
index 5d44c396650..f48748be378 100644
--- a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/GenericItemChannelLinkProviderJavaTest.java
+++ b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/GenericItemChannelLinkProviderJavaTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.test;
+package org.openhab.core.model.thing.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -22,18 +22,18 @@
 import java.math.BigDecimal;
 import java.util.Collection;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkProvider;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.thing.internal.GenericItemChannelLinkProvider;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkProvider;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.thing.internal.GenericItemChannelLinkProvider;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericItemChannelLinkProviderTest.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericItemChannelLinkProviderTest.java
index bbf4576c6e9..a57b70c4891 100644
--- a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericItemChannelLinkProviderTest.java
+++ b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericItemChannelLinkProviderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.test.hue;
+package org.openhab.core.model.thing.test.hue;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -20,15 +20,15 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkProvider;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkProvider;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest.java
index 29c1669f3ea..8323686238b 100644
--- a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest.java
+++ b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.test.hue;
+package org.openhab.core.model.thing.test.hue;
 
 import static java.util.stream.Collectors.toSet;
 import static org.hamcrest.CoreMatchers.*;
@@ -26,21 +26,21 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.events.AbstractThingRegistryEvent;
-import org.eclipse.smarthome.core.thing.events.ThingAddedEvent;
-import org.eclipse.smarthome.core.thing.events.ThingRemovedEvent;
-import org.eclipse.smarthome.core.thing.events.ThingUpdatedEvent;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.events.AbstractThingRegistryEvent;
+import org.openhab.core.thing.events.ThingAddedEvent;
+import org.openhab.core.thing.events.ThingRemovedEvent;
+import org.openhab.core.thing.events.ThingUpdatedEvent;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest2.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest2.java
index ac1eb661dd8..539d8b03e1c 100644
--- a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest2.java
+++ b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest2.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.test.hue;
+package org.openhab.core.model.thing.test.hue;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -19,12 +19,12 @@
 import java.io.ByteArrayInputStream;
 import java.util.Collection;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.thing.testsupport.hue.TestHueThingHandlerFactoryX;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.thing.testsupport.hue.TestHueThingHandlerFactoryX;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest3.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest3.java
index 3393062cdf9..65df311809d 100644
--- a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest3.java
+++ b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest3.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.test.hue;
+package org.openhab.core.model.thing.test.hue;
 
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.CoreMatchers.*;
@@ -25,20 +25,20 @@
 import java.util.Locale;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.thing.testsupport.hue.DumbThingHandlerFactory;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.thing.testsupport.hue.DumbThingHandlerFactory;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java
index 7f41c609ed7..e2cc3f25829 100644
--- a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java
+++ b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.test.hue;
+package org.openhab.core.model.thing.test.hue;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -18,23 +18,23 @@
 
 import java.io.ByteArrayInputStream;
 
-import org.eclipse.smarthome.core.service.ReadyMarker;
-import org.eclipse.smarthome.core.service.ReadyService;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.model.core.ModelRepository;
-import org.eclipse.smarthome.model.thing.testsupport.hue.TestHueThingHandlerFactoryX;
-import org.eclipse.smarthome.model.thing.testsupport.hue.TestHueThingTypeProvider;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.service.ReadyMarker;
+import org.openhab.core.service.ReadyService;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseBridgeHandler;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.types.Command;
+import org.openhab.core.model.core.ModelRepository;
+import org.openhab.core.model.thing.testsupport.hue.TestHueThingHandlerFactoryX;
+import org.openhab.core.model.thing.testsupport.hue.TestHueThingTypeProvider;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingHandlerFactory.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingHandlerFactory.java
index b98def0c038..da9ce2dabf9 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingHandlerFactory.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingHandlerFactory.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.testsupport.hue;
+package org.openhab.core.model.thing.testsupport.hue;
 
 import java.util.Collections;
 import java.util.Set;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
 import org.osgi.service.component.ComponentContext;
 
 /**
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingTypeProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingTypeProvider.java
index 16a6a7dfbce..144a8d0579d 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingTypeProvider.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/DumbThingTypeProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.testsupport.hue;
+package org.openhab.core.model.thing.testsupport.hue;
 
 import java.net.URI;
 import java.util.Collection;
@@ -20,13 +20,13 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinitionBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelDefinitionBuilder;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueChannelTypeProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueChannelTypeProvider.java
index dd80ceef5c9..a63e270d43d 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueChannelTypeProvider.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueChannelTypeProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.testsupport.hue;
+package org.openhab.core.model.thing.testsupport.hue;
 
 import java.net.URI;
 import java.util.Arrays;
@@ -18,15 +18,15 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.thing.type.ChannelDefinitionBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ChannelDefinitionBuilder;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeBuilder;
+import org.openhab.core.thing.type.ChannelGroupTypeProvider;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeUID;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueConfigDescriptionProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueConfigDescriptionProvider.java
index 747f57c0cc2..be4748ec38a 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueConfigDescriptionProvider.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueConfigDescriptionProvider.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.testsupport.hue;
+package org.openhab.core.model.thing.testsupport.hue;
 
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toList;
@@ -21,10 +21,10 @@
 import java.util.Locale;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactory.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactory.java
index 0e0a3318ab4..12052ba90a6 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactory.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactory.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.testsupport.hue;
+package org.openhab.core.model.thing.testsupport.hue;
 
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -18,19 +18,19 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.types.Command;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseBridgeHandler;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.types.Command;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactoryX.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactoryX.java
index 97a44b80c19..bb0c3a47bc9 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactoryX.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingHandlerFactoryX.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.model.thing.testsupport.hue;
+package org.openhab.core.model.thing.testsupport.hue;
 
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
 import org.osgi.service.component.ComponentContext;
 
 /**
diff --git a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingTypeProvider.java b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingTypeProvider.java
index 09315931400..4a14d3eaaf4 100644
--- a/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingTypeProvider.java
+++ b/itests/org.openhab.core.model.thing.testsupport/src/main/java/org/openhab/core/model/thing/testsupport/hue/TestHueThingTypeProvider.java
@@ -12,7 +12,7 @@
  */
 /**
  */
-package org.eclipse.smarthome.model.thing.testsupport.hue;
+package org.openhab.core.model.thing.testsupport.hue;
 
 import java.net.URI;
 import java.util.Arrays;
@@ -21,13 +21,13 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinitionBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelDefinitionBuilder;
+import org.openhab.core.thing.type.ChannelGroupDefinition;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/itests/org.openhab.core.storage.json.tests/src/main/java/org/openhab/core/storage/json/internal/JsonStorageServiceOSGiTest.java b/itests/org.openhab.core.storage.json.tests/src/main/java/org/openhab/core/storage/json/internal/JsonStorageServiceOSGiTest.java
index c34ac95b570..aaaf75445eb 100644
--- a/itests/org.openhab.core.storage.json.tests/src/main/java/org/openhab/core/storage/json/internal/JsonStorageServiceOSGiTest.java
+++ b/itests/org.openhab.core.storage.json.tests/src/main/java/org/openhab/core/storage/json/internal/JsonStorageServiceOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.storage.json.internal;
+package org.openhab.core.storage.json.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -24,12 +24,12 @@
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
-import org.eclipse.smarthome.config.core.ConfigConstants;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/cache/ExpiringCacheAsyncTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/cache/ExpiringCacheAsyncTest.java
index 26dd0e052bc..7b75a68a9c7 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/cache/ExpiringCacheAsyncTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/cache/ExpiringCacheAsyncTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.cache;
+package org.openhab.core.cache;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -19,7 +19,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.function.Supplier;
 
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.Test;
 
 /**
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/common/SafeCallerImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/common/SafeCallerImplTest.java
index 75f89f13731..c4cb2d5a76b 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/common/SafeCallerImplTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/common/SafeCallerImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.common;
+package org.openhab.core.internal.common;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -36,8 +36,8 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import org.eclipse.smarthome.core.common.QueueingThreadPoolExecutor;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.common.QueueingThreadPoolExecutor;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/events/OSGiEventManagerOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/events/OSGiEventManagerOSGiTest.java
index 0f42882e3a8..1811fa7ff5e 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/events/OSGiEventManagerOSGiTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/events/OSGiEventManagerOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.events;
+package org.openhab.core.internal.events;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -23,12 +23,12 @@
 import java.util.HashSet;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.events.TopicEventFilter;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.events.TopicEventFilter;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/i18n/TranslationProviderOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/i18n/TranslationProviderOSGiTest.java
index 748a6e50b93..cb27d5418eb 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/i18n/TranslationProviderOSGiTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/i18n/TranslationProviderOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.i18n;
+package org.openhab.core.internal.i18n;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -19,9 +19,9 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/items/ItemUpdaterOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/items/ItemUpdaterOSGiTest.java
index d37656a64c9..1dc47a3e31a 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/items/ItemUpdaterOSGiTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/internal/items/ItemUpdaterOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.internal.items;
+package org.openhab.core.internal.items;
 
 import static org.junit.Assert.*;
 
@@ -20,17 +20,17 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.items.events.ItemStateChangedEvent;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.items.events.ItemStateChangedEvent;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/GroupItemOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/GroupItemOSGiTest.java
index 706776881f3..b31724ba64d 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/GroupItemOSGiTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/GroupItemOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -30,34 +30,34 @@
 import javax.measure.quantity.Pressure;
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.internal.items.GroupFunctionHelper;
-import org.eclipse.smarthome.core.internal.items.ItemStateConverterImpl;
-import org.eclipse.smarthome.core.items.dto.GroupFunctionDTO;
-import org.eclipse.smarthome.core.items.events.GroupItemStateChangedEvent;
-import org.eclipse.smarthome.core.items.events.ItemUpdatedEvent;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.items.ColorItem;
-import org.eclipse.smarthome.core.library.items.DimmerItem;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.items.RollershutterItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.ArithmeticGroupFunction;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.types.RawType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.UnDefType;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.internal.items.GroupFunctionHelper;
+import org.openhab.core.internal.items.ItemStateConverterImpl;
+import org.openhab.core.items.dto.GroupFunctionDTO;
+import org.openhab.core.items.events.GroupItemStateChangedEvent;
+import org.openhab.core.items.events.ItemUpdatedEvent;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.items.ColorItem;
+import org.openhab.core.library.items.DimmerItem;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.items.RollershutterItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.ArithmeticGroupFunction;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.types.RawType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ItemRegistryImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ItemRegistryImplTest.java
index fb9e7c0dff3..48fe5541a89 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ItemRegistryImplTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ItemRegistryImplTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.CoreMatchers.*;
@@ -25,21 +25,21 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.internal.items.ItemRegistryImpl;
-import org.eclipse.smarthome.core.items.events.ItemAddedEvent;
-import org.eclipse.smarthome.core.items.events.ItemRemovedEvent;
-import org.eclipse.smarthome.core.items.events.ItemUpdatedEvent;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.items.StringItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.service.CommandDescriptionService;
-import org.eclipse.smarthome.core.service.StateDescriptionService;
-import org.eclipse.smarthome.test.java.JavaTest;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.internal.items.ItemRegistryImpl;
+import org.openhab.core.items.events.ItemAddedEvent;
+import org.openhab.core.items.events.ItemRemovedEvent;
+import org.openhab.core.items.events.ItemUpdatedEvent;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.items.StringItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.service.CommandDescriptionService;
+import org.openhab.core.service.StateDescriptionService;
+import org.openhab.core.test.java.JavaTest;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ManagedItemProviderOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ManagedItemProviderOSGiTest.java
index ca6c4bf57d9..e11a9f87235 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ManagedItemProviderOSGiTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/ManagedItemProviderOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -19,20 +19,20 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.smarthome.core.items.ManagedItemProvider.PersistedItem;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.items.StringItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.ArithmeticGroupFunction.And;
-import org.eclipse.smarthome.core.library.types.ArithmeticGroupFunction.Avg;
-import org.eclipse.smarthome.core.library.types.ArithmeticGroupFunction.Sum;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.items.ManagedItemProvider.PersistedItem;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.items.StringItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.ArithmeticGroupFunction.And;
+import org.openhab.core.library.types.ArithmeticGroupFunction.Avg;
+import org.openhab.core.library.types.ArithmeticGroupFunction.Sum;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/TestItem.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/TestItem.java
index 09128dba33a..12177f33e6b 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/TestItem.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/TestItem.java
@@ -10,15 +10,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items;
+package org.openhab.core.items;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
 
 /**
  * {@link GenericItem} implementation used for testing.
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriberOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriberOSGiTest.java
index 7b062ad2f85..b8ff6f2bcc1 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriberOSGiTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/items/events/AbstractItemEventSubscriberOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.items.events;
+package org.openhab.core.items.events;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.when;
@@ -19,17 +19,17 @@
 import java.util.Collections;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFactory;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.Metadata;
-import org.eclipse.smarthome.core.items.MetadataKey;
-import org.eclipse.smarthome.core.items.MetadataProvider;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFactory;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.Metadata;
+import org.openhab.core.items.MetadataKey;
+import org.openhab.core.items.MetadataProvider;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/service/AbstractWatchServiceTest.java b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/service/AbstractWatchServiceTest.java
index 2335f928d45..56264739c27 100644
--- a/itests/org.openhab.core.tests/src/main/java/org/openhab/core/service/AbstractWatchServiceTest.java
+++ b/itests/org.openhab.core.tests/src/main/java/org/openhab/core/service/AbstractWatchServiceTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.service;
+package org.openhab.core.service;
 
 import static java.nio.file.StandardWatchEventKinds.*;
 import static org.hamcrest.CoreMatchers.is;
@@ -28,7 +28,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.SystemUtils;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.test.java.JavaTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/SystemWideChannelTypesTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/SystemWideChannelTypesTest.java
index 4ce580c3e24..b65073cf6b2 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/SystemWideChannelTypesTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/SystemWideChannelTypesTest.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
-import static org.eclipse.smarthome.core.thing.DefaultSystemChannelTypeProvider.BINDING_ID;
+import static org.openhab.core.thing.DefaultSystemChannelTypeProvider.BINDING_ID;
 import static org.junit.Assert.*;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.types.StateOption;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.types.StateOption;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/ThingPropertiesTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/ThingPropertiesTest.java
index 20ab040f71b..ea1e88067ec 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/ThingPropertiesTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/ThingPropertiesTest.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing;
+package org.openhab.core.thing;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.binding.ThingFactory;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.binding.ThingFactory;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java
index d4523947b63..64f8f2c992f 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import static java.util.Collections.*;
 import static org.hamcrest.CoreMatchers.*;
@@ -30,40 +30,40 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.config.core.status.ConfigStatusMessage;
-import org.eclipse.smarthome.config.core.status.ConfigStatusProvider;
-import org.eclipse.smarthome.config.core.status.ConfigStatusService;
-import org.eclipse.smarthome.config.core.validation.ConfigValidationException;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingStatusInfoBuilder;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.config.core.status.ConfigStatusMessage;
+import org.openhab.core.config.core.status.ConfigStatusProvider;
+import org.openhab.core.config.core.status.ConfigStatusService;
+import org.openhab.core.config.core.validation.ConfigValidationException;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.BridgeBuilder;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.hamcrest.CoreMatchers;
 import org.junit.After;
 import org.junit.Before;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java
index 0d38343f30c..07808b1b073 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ChangeThingTypeOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -27,37 +27,37 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.items.ManagedItemProvider;
-import org.eclipse.smarthome.core.library.items.StringItem;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ManagedItemChannelLinkProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinitionBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.items.ManagedItemProvider;
+import org.openhab.core.library.items.StringItem;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ManagedItemChannelLinkProvider;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelDefinitionBuilder;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeProvider;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.types.Command;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.service.component.ComponentContext;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java
index bd014f0a942..80e14394a0c 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/ThingFactoryTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding;
+package org.openhab.core.thing.binding;
 
 import static java.util.Collections.*;
 import static java.util.stream.Collectors.*;
@@ -31,31 +31,31 @@
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.type.BridgeType;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinitionBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.type.BridgeType;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelDefinitionBuilder;
+import org.openhab.core.thing.type.ChannelGroupDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeBuilder;
+import org.openhab.core.thing.type.ChannelGroupTypeProvider;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareTest.java
index 00a493efc44..9098f39ffc9 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/firmware/FirmwareTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.binding.firmware;
+package org.openhab.core.thing.binding.firmware;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -23,10 +23,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Test;
 
 /**
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/events/ThingEventFactoryTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/events/ThingEventFactoryTest.java
index b537f0c4425..dfa959e4b54 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/events/ThingEventFactoryTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/events/ThingEventFactoryTest.java
@@ -10,25 +10,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.events;
+package org.openhab.core.thing.events;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.CommonTriggerEvents;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingStatusInfoBuilder;
-import org.eclipse.smarthome.core.thing.dto.ThingDTOMapper;
-import org.eclipse.smarthome.core.thing.events.ThingEventFactory.TriggerEventPayloadBean;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.events.Event;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.CommonTriggerEvents;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder;
+import org.openhab.core.thing.dto.ThingDTOMapper;
+import org.openhab.core.thing.events.ThingEventFactory.TriggerEventPayloadBean;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Test;
 
 import com.google.gson.Gson;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/factory/ManagedThingProviderOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/factory/ManagedThingProviderOSGiTest.java
index dfcb506e277..f508bfe4ad8 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/factory/ManagedThingProviderOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/factory/ManagedThingProviderOSGiTest.java
@@ -10,21 +10,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.factory;
+package org.openhab.core.thing.factory;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import java.util.Collection;
 
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.test.AsyncResultWrapper;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.test.AsyncResultWrapper;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/Constants.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/Constants.java
index 8b3ec73e48d..b57f970e0af 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/Constants.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/Constants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -19,10 +19,10 @@
 import java.util.Collections;
 import java.util.HashMap;
 
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareBuilder;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareBuilder;
 
 /**
  * @author Thomas Höfer - Initial contribution
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
index 45c1a3eaf4e..945230a6799 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -25,14 +25,14 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareBuilder;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareRestriction;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareBuilder;
+import org.openhab.core.thing.binding.firmware.FirmwareRestriction;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
index f53f75c4eec..8ceeb461219 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -24,13 +24,13 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareBuilder;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareBuilder;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
index b2a104cf6d8..8909a22e0e8 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.firmware;
+package org.openhab.core.thing.firmware;
 
-import static org.eclipse.smarthome.core.thing.Thing.*;
-import static org.eclipse.smarthome.core.thing.firmware.FirmwareStatus.*;
+import static org.openhab.core.thing.Thing.*;
+import static org.openhab.core.thing.firmware.FirmwareStatus.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
@@ -23,19 +23,19 @@
 import java.util.Locale;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareBuilder;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressCallback;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareBuilder;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.thing.binding.firmware.ProgressCallback;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java
index e1ee739ac63..db4a4b0655c 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.i18n;
+package org.openhab.core.thing.i18n;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -19,25 +19,25 @@
 import java.io.IOException;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingStatusInfoBuilder;
-import org.eclipse.smarthome.core.thing.testutil.i18n.DefaultLocaleSetter;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.util.BundleResolver;
-import org.eclipse.smarthome.test.SyntheticBundleInstaller;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder;
+import org.openhab.core.thing.testutil.i18n.DefaultLocaleSetter;
+import org.openhab.core.types.Command;
+import org.openhab.core.util.BundleResolver;
+import org.openhab.core.test.SyntheticBundleInstaller;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java
index 89de08df842..d67f02f99ff 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -24,55 +24,55 @@
 
 import javax.measure.quantity.Temperature;
 
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.common.registry.Provider;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.UnitProvider;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemCommandEvent;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.library.types.DecimalType;
-import org.eclipse.smarthome.core.library.types.HSBType;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.PercentType;
-import org.eclipse.smarthome.core.library.types.QuantityType;
-import org.eclipse.smarthome.core.library.unit.SIUnits;
-import org.eclipse.smarthome.core.service.StateDescriptionService;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.events.ThingEventFactory;
-import org.eclipse.smarthome.core.thing.internal.profiles.SystemProfileFactory;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkProvider;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.profiles.ProfileAdvisor;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileContext;
-import org.eclipse.smarthome.core.thing.profiles.ProfileFactory;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeProvider;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.StateProfile;
-import org.eclipse.smarthome.core.thing.profiles.TriggerProfile;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.State;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.common.registry.Provider;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.UnitProvider;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemCommandEvent;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.HSBType;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.PercentType;
+import org.openhab.core.library.types.QuantityType;
+import org.openhab.core.library.unit.SIUnits;
+import org.openhab.core.service.StateDescriptionService;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.events.ThingEventFactory;
+import org.openhab.core.thing.internal.profiles.SystemProfileFactory;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkProvider;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.profiles.ProfileAdvisor;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileContext;
+import org.openhab.core.thing.profiles.ProfileFactory;
+import org.openhab.core.thing.profiles.ProfileTypeProvider;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.StateProfile;
+import org.openhab.core.thing.profiles.TriggerProfile;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/SimpleThingTypeProvider.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/SimpleThingTypeProvider.java
index 65b155de77c..5923a7f5437 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/SimpleThingTypeProvider.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/SimpleThingTypeProvider.java
@@ -10,14 +10,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import java.util.Collection;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ThingType;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.type.ThingType;
 
 /**
  * @author Markus Rathgeb - Initial contribution
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingLinkManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingLinkManagerOSGiTest.java
index 053f9ff85bc..d976e4ca408 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingLinkManagerOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingLinkManagerOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.*;
@@ -27,33 +27,33 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.link.ThingLinkManager;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinitionBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateOption;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.link.ThingLinkManager;
+import org.openhab.core.thing.type.ChannelDefinitionBuilder;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateOption;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java
index 4159d71a43c..37a7f8201a3 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -31,58 +31,58 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.service.ReadyMarker;
-import org.eclipse.smarthome.core.service.ReadyService;
-import org.eclipse.smarthome.core.storage.Storage;
-import org.eclipse.smarthome.core.storage.StorageService;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelGroupUID;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingManager;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingStatusInfoBuilder;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.link.ManagedItemChannelLinkProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinitionBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.service.ReadyMarker;
+import org.openhab.core.service.ReadyService;
+import org.openhab.core.storage.Storage;
+import org.openhab.core.storage.StorageService;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelGroupUID;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingManager;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseBridgeHandler;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerCallback;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.binding.builder.BridgeBuilder;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.link.ManagedItemChannelLinkProvider;
+import org.openhab.core.thing.type.ChannelDefinitionBuilder;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeBuilder;
+import org.openhab.core.thing.type.ChannelGroupTypeProvider;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.types.Command;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -1055,7 +1055,7 @@ private void registerChannelGroupTypeProvider() throws Exception {
 
     private void configureAutoLinking(Boolean on) throws IOException {
         ConfigurationAdmin configAdmin = getService(ConfigurationAdmin.class);
-        org.osgi.service.cm.Configuration config = configAdmin.getConfiguration("org.eclipse.smarthome.links", null);
+        org.osgi.service.cm.Configuration config = configAdmin.getConfiguration("org.openhab.core.links", null);
         Dictionary<String, Object> properties = config.getProperties();
         if (properties == null) {
             properties = new Hashtable<>();
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiTest.java
index 0904171d310..dd14f307323 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import static java.util.Collections.*;
 import static org.hamcrest.CoreMatchers.*;
@@ -32,69 +32,69 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterBuilder;
-import org.eclipse.smarthome.config.core.ConfigDescriptionProvider;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.events.TopicEventFilter;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.items.events.ItemEventFactory;
-import org.eclipse.smarthome.core.items.events.ItemStateEvent;
-import org.eclipse.smarthome.core.library.items.StringItem;
-import org.eclipse.smarthome.core.library.types.OnOffType;
-import org.eclipse.smarthome.core.library.types.StringType;
-import org.eclipse.smarthome.core.service.ReadyMarker;
-import org.eclipse.smarthome.core.service.ReadyMarkerUtils;
-import org.eclipse.smarthome.core.service.ReadyService;
-import org.eclipse.smarthome.core.thing.Bridge;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingManager;
-import org.eclipse.smarthome.core.thing.ThingProvider;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingStatusDetail;
-import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.ThingTypeMigrationService;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BridgeHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.binding.builder.BridgeBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingStatusInfoBuilder;
-import org.eclipse.smarthome.core.thing.events.ThingEventFactory;
-import org.eclipse.smarthome.core.thing.events.ThingStatusInfoChangedEvent;
-import org.eclipse.smarthome.core.thing.events.ThingStatusInfoEvent;
-import org.eclipse.smarthome.core.thing.i18n.ThingStatusInfoI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.thing.link.ManagedItemChannelLinkProvider;
-import org.eclipse.smarthome.core.thing.link.ThingLinkManager;
-import org.eclipse.smarthome.core.thing.testutil.i18n.DefaultLocaleSetter;
-import org.eclipse.smarthome.core.thing.type.ChannelKind;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeUID;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.type.ThingTypeBuilder;
-import org.eclipse.smarthome.core.thing.type.ThingTypeRegistry;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.util.BundleResolver;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameterBuilder;
+import org.openhab.core.config.core.ConfigDescriptionProvider;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.RegistryChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.events.TopicEventFilter;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.items.events.ItemEventFactory;
+import org.openhab.core.items.events.ItemStateEvent;
+import org.openhab.core.library.items.StringItem;
+import org.openhab.core.library.types.OnOffType;
+import org.openhab.core.library.types.StringType;
+import org.openhab.core.service.ReadyMarker;
+import org.openhab.core.service.ReadyMarkerUtils;
+import org.openhab.core.service.ReadyService;
+import org.openhab.core.thing.Bridge;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingManager;
+import org.openhab.core.thing.ThingProvider;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
+import org.openhab.core.thing.ThingTypeMigrationService;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BridgeHandler;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerCallback;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.binding.builder.BridgeBuilder;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.builder.ThingStatusInfoBuilder;
+import org.openhab.core.thing.events.ThingEventFactory;
+import org.openhab.core.thing.events.ThingStatusInfoChangedEvent;
+import org.openhab.core.thing.events.ThingStatusInfoEvent;
+import org.openhab.core.thing.i18n.ThingStatusInfoI18nLocalizationService;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.thing.link.ManagedItemChannelLinkProvider;
+import org.openhab.core.thing.link.ThingLinkManager;
+import org.openhab.core.thing.testutil.i18n.DefaultLocaleSetter;
+import org.openhab.core.thing.type.ChannelKind;
+import org.openhab.core.thing.type.ChannelTypeBuilder;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeUID;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.type.ThingTypeBuilder;
+import org.openhab.core.thing.type.ThingTypeRegistry;
+import org.openhab.core.types.Command;
+import org.openhab.core.util.BundleResolver;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java
index acdaff6533e..ff5103e3e7b 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingRegistryOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal;
+package org.openhab.core.thing.internal;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -25,28 +25,28 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingProvider;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.events.ThingAddedEvent;
-import org.eclipse.smarthome.core.thing.events.ThingRemovedEvent;
-import org.eclipse.smarthome.core.thing.events.ThingUpdatedEvent;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingProvider;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.events.ThingAddedEvent;
+import org.openhab.core.thing.events.ThingRemovedEvent;
+import org.openhab.core.thing.events.ThingUpdatedEvent;
+import org.openhab.core.types.Command;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
index b8c04c75ac2..4b201c4a869 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.firmware;
+package org.openhab.core.thing.internal.firmware;
 
-import static org.eclipse.smarthome.core.thing.firmware.Constants.*;
+import static org.openhab.core.thing.firmware.Constants.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
@@ -28,15 +28,15 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.firmware.Constants;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareProvider;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareRegistry;
-import org.eclipse.smarthome.core.thing.testutil.i18n.DefaultLocaleSetter;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.firmware.Constants;
+import org.openhab.core.thing.firmware.FirmwareProvider;
+import org.openhab.core.thing.firmware.FirmwareRegistry;
+import org.openhab.core.thing.testutil.i18n.DefaultLocaleSetter;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
index cfa3b6c0d17..28d380b4ad3 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.firmware;
+package org.openhab.core.thing.internal.firmware;
 
-import static org.eclipse.smarthome.core.thing.firmware.Constants.*;
-import static org.eclipse.smarthome.core.thing.firmware.FirmwareStatusInfo.*;
+import static org.openhab.core.thing.firmware.Constants.*;
+import static org.openhab.core.thing.firmware.FirmwareStatusInfo.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -38,29 +38,29 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.config.core.validation.ConfigDescriptionValidator;
-import org.eclipse.smarthome.core.common.SafeCaller;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventPublisher;
-import org.eclipse.smarthome.core.i18n.LocaleProvider;
-import org.eclipse.smarthome.core.i18n.TranslationProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.core.thing.binding.firmware.Firmware;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateBackgroundTransferHandler;
-import org.eclipse.smarthome.core.thing.binding.firmware.FirmwareUpdateHandler;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressCallback;
-import org.eclipse.smarthome.core.thing.binding.firmware.ProgressStep;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareRegistry;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareStatusInfo;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareStatusInfoEvent;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateProgressInfoEvent;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateResult;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateResultInfoEvent;
-import org.eclipse.smarthome.core.thing.firmware.FirmwareUpdateService;
-import org.eclipse.smarthome.core.util.BundleResolver;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.validation.ConfigDescriptionValidator;
+import org.openhab.core.common.SafeCaller;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventPublisher;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.i18n.TranslationProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.thing.binding.firmware.Firmware;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateBackgroundTransferHandler;
+import org.openhab.core.thing.binding.firmware.FirmwareUpdateHandler;
+import org.openhab.core.thing.binding.firmware.ProgressCallback;
+import org.openhab.core.thing.binding.firmware.ProgressStep;
+import org.openhab.core.thing.firmware.FirmwareRegistry;
+import org.openhab.core.thing.firmware.FirmwareStatusInfo;
+import org.openhab.core.thing.firmware.FirmwareStatusInfoEvent;
+import org.openhab.core.thing.firmware.FirmwareUpdateProgressInfoEvent;
+import org.openhab.core.thing.firmware.FirmwareUpdateResult;
+import org.openhab.core.thing.firmware.FirmwareUpdateResultInfoEvent;
+import org.openhab.core.thing.firmware.FirmwareUpdateService;
+import org.openhab.core.util.BundleResolver;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactoryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactoryOSGiTest.java
index fe6da5c92e3..24adc74c76a 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactoryOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/profiles/SystemProfileFactoryOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.internal.profiles;
+package org.openhab.core.thing.internal.profiles;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -21,19 +21,19 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.library.CoreItemFactory;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.profiles.ProfileCallback;
-import org.eclipse.smarthome.core.thing.profiles.ProfileContext;
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeProvider;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeUID;
-import org.eclipse.smarthome.core.thing.profiles.SystemProfiles;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.library.CoreItemFactory;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.profiles.ProfileCallback;
+import org.openhab.core.thing.profiles.ProfileContext;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeProvider;
+import org.openhab.core.thing.profiles.ProfileTypeUID;
+import org.openhab.core.thing.profiles.SystemProfiles;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/ItemChannelLinkOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/ItemChannelLinkOSGiTest.java
index 8408a23c75b..3cd3c6d1e4d 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/ItemChannelLinkOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/ItemChannelLinkOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link;
+package org.openhab.core.thing.link;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -18,14 +18,14 @@
 import java.util.Hashtable;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.builder.ChannelBuilder;
-import org.eclipse.smarthome.core.thing.binding.builder.ThingBuilder;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.builder.ChannelBuilder;
+import org.openhab.core.thing.binding.builder.ThingBuilder;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/LinkEventOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/LinkEventOSGiTest.java
index 33e8f94af56..1573deb4f2d 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/LinkEventOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/link/LinkEventOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.link;
+package org.openhab.core.thing.link;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -20,13 +20,13 @@
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.events.Event;
-import org.eclipse.smarthome.core.events.EventFilter;
-import org.eclipse.smarthome.core.events.EventSubscriber;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.link.events.ItemChannelLinkAddedEvent;
-import org.eclipse.smarthome.core.thing.link.events.ItemChannelLinkRemovedEvent;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.events.Event;
+import org.openhab.core.events.EventFilter;
+import org.openhab.core.events.EventSubscriber;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.link.events.ItemChannelLinkAddedEvent;
+import org.openhab.core.thing.link.events.ItemChannelLinkRemovedEvent;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/profiles/i18n/SystemProfileI18nOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/profiles/i18n/SystemProfileI18nOSGiTest.java
index 0f38a4e0f17..cc9b8d3fc36 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/profiles/i18n/SystemProfileI18nOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/profiles/i18n/SystemProfileI18nOSGiTest.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.profiles.i18n;
+package org.openhab.core.thing.profiles.i18n;
 
-import static org.eclipse.smarthome.core.thing.profiles.SystemProfiles.*;
+import static org.openhab.core.thing.profiles.SystemProfiles.*;
 import static org.junit.Assert.*;
 
 import java.util.Collection;
 import java.util.Locale;
 import java.util.Optional;
 
-import org.eclipse.smarthome.core.thing.internal.profiles.SystemProfileFactory;
-import org.eclipse.smarthome.core.thing.profiles.ProfileType;
-import org.eclipse.smarthome.core.thing.profiles.ProfileTypeProvider;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.internal.profiles.SystemProfileFactory;
+import org.openhab.core.thing.profiles.ProfileType;
+import org.openhab.core.thing.profiles.ProfileTypeProvider;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/testutil/i18n/DefaultLocaleSetter.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/testutil/i18n/DefaultLocaleSetter.java
index 9e44f43085f..9b3cb93e5d8 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/testutil/i18n/DefaultLocaleSetter.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/testutil/i18n/DefaultLocaleSetter.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.testutil.i18n;
+package org.openhab.core.thing.testutil.i18n;
 
 import static java.util.Objects.requireNonNull;
 import static org.hamcrest.CoreMatchers.*;
@@ -48,7 +48,7 @@ public DefaultLocaleSetter(ConfigurationAdmin configAdmin) {
     public void setDefaultLocale(Locale locale) throws IOException {
         assertThat(locale, is(notNullValue()));
 
-        Configuration config = configAdmin.getConfiguration("org.eclipse.smarthome.i18n", null);
+        Configuration config = configAdmin.getConfiguration("org.openhab.core.i18n", null);
         assertThat(config, is(notNullValue()));
 
         Dictionary<String, Object> properties = config.getProperties();
diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/type/ChannelStateDescriptionProviderOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/type/ChannelStateDescriptionProviderOSGiTest.java
index 212fd458494..6214ddfd753 100644
--- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/type/ChannelStateDescriptionProviderOSGiTest.java
+++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/type/ChannelStateDescriptionProviderOSGiTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.type;
+package org.openhab.core.thing.type;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -26,42 +26,42 @@
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.Configuration;
-import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemNotFoundException;
-import org.eclipse.smarthome.core.items.ItemProvider;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.library.items.ColorItem;
-import org.eclipse.smarthome.core.library.items.DimmerItem;
-import org.eclipse.smarthome.core.library.items.NumberItem;
-import org.eclipse.smarthome.core.library.items.StringItem;
-import org.eclipse.smarthome.core.library.items.SwitchItem;
-import org.eclipse.smarthome.core.thing.Channel;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingRegistry;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.ThingUID;
-import org.eclipse.smarthome.core.thing.binding.BaseDynamicStateDescriptionProvider;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.i18n.ThingStatusInfoI18nLocalizationService;
-import org.eclipse.smarthome.core.thing.internal.ChannelStateDescriptionProvider;
-import org.eclipse.smarthome.core.thing.internal.SimpleThingTypeProvider;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLink;
-import org.eclipse.smarthome.core.thing.link.ItemChannelLinkRegistry;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.core.types.StateDescriptionFragmentBuilder;
-import org.eclipse.smarthome.core.types.StateOption;
-import org.eclipse.smarthome.core.util.BundleResolver;
-import org.eclipse.smarthome.test.SyntheticBundleInstaller;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.common.registry.ProviderChangeListener;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemNotFoundException;
+import org.openhab.core.items.ItemProvider;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.items.ColorItem;
+import org.openhab.core.library.items.DimmerItem;
+import org.openhab.core.library.items.NumberItem;
+import org.openhab.core.library.items.StringItem;
+import org.openhab.core.library.items.SwitchItem;
+import org.openhab.core.thing.Channel;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingRegistry;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseDynamicStateDescriptionProvider;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.i18n.ThingStatusInfoI18nLocalizationService;
+import org.openhab.core.thing.internal.ChannelStateDescriptionProvider;
+import org.openhab.core.thing.internal.SimpleThingTypeProvider;
+import org.openhab.core.thing.link.ItemChannelLink;
+import org.openhab.core.thing.link.ItemChannelLinkRegistry;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.types.StateDescriptionFragmentBuilder;
+import org.openhab.core.types.StateOption;
+import org.openhab.core.util.BundleResolver;
+import org.openhab.core.test.SyntheticBundleInstaller;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesI18nTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesI18nTest.java
index 9b97af84b41..cb3a9d4eb07 100644
--- a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesI18nTest.java
+++ b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesI18nTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.test;
+package org.openhab.core.thing.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -18,16 +18,16 @@
 import java.util.Collection;
 import java.util.Optional;
 
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.test.BundleCloseable;
-import org.eclipse.smarthome.test.SyntheticBundleInstaller;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeProvider;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.test.BundleCloseable;
+import org.openhab.core.test.SyntheticBundleInstaller;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesTest.java
index 972d21db3b4..41af783c0bf 100644
--- a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesTest.java
+++ b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ChannelTypesTest.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.test;
+package org.openhab.core.thing.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
 import java.util.Collection;
 
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.test.BundleCloseable;
-import org.eclipse.smarthome.test.SyntheticBundleInstaller;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeProvider;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.test.BundleCloseable;
+import org.openhab.core.test.SyntheticBundleInstaller;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ConfigDescriptionsTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ConfigDescriptionsTest.java
index 90753ae8261..ae86beecfb5 100644
--- a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ConfigDescriptionsTest.java
+++ b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ConfigDescriptionsTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.test;
+package org.openhab.core.thing.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -18,13 +18,13 @@
 import java.net.URI;
 import java.util.Collection;
 
-import org.eclipse.smarthome.config.core.ConfigDescription;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameter.Type;
-import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.core.thing.xml.test.LoadedTestBundle.StuffAddition;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ConfigDescription;
+import org.openhab.core.config.core.ConfigDescriptionParameter;
+import org.openhab.core.config.core.ConfigDescriptionParameter.Type;
+import org.openhab.core.config.core.ConfigDescriptionParameterGroup;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.thing.xml.test.LoadedTestBundle.StuffAddition;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/LoadedTestBundle.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/LoadedTestBundle.java
index da8618a342e..582911fd7b9 100644
--- a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/LoadedTestBundle.java
+++ b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/LoadedTestBundle.java
@@ -10,18 +10,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.test;
+package org.openhab.core.thing.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.test.SyntheticBundleInstaller;
-import org.eclipse.smarthome.test.java.JavaTest;
+import org.openhab.core.config.core.ConfigDescriptionRegistry;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.type.ChannelGroupTypeRegistry;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.test.SyntheticBundleInstaller;
+import org.openhab.core.test.java.JavaTest;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java
index 8a4ab17474a..523f2dec638 100644
--- a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java
+++ b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.test;
+package org.openhab.core.thing.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -18,15 +18,15 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeUID;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.xml.test.LoadedTestBundle.StuffAddition;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeRegistry;
+import org.openhab.core.thing.type.ChannelGroupTypeUID;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.xml.test.LoadedTestBundle.StuffAddition;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemWideChannelTypesTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemWideChannelTypesTest.java
index 54817538004..0a77657dd9c 100644
--- a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemWideChannelTypesTest.java
+++ b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/SystemWideChannelTypesTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.test;
+package org.openhab.core.thing.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -19,15 +19,15 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.thing.DefaultSystemChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.xml.test.LoadedTestBundle.StuffAddition;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.DefaultSystemChannelTypeProvider;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeProvider;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.xml.test.LoadedTestBundle.StuffAddition;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypeI18nTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypeI18nTest.java
index d84629c02f3..57dfde6a286 100644
--- a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypeI18nTest.java
+++ b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypeI18nTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.test;
+package org.openhab.core.thing.xml.test;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -18,16 +18,16 @@
 import java.util.Collection;
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.xml.test.LoadedTestBundle.StuffAddition;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeRegistry;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.xml.test.LoadedTestBundle.StuffAddition;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypesTest.java b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypesTest.java
index d7521a5c626..c09371cb166 100644
--- a/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypesTest.java
+++ b/itests/org.openhab.core.thing.xml.tests/src/main/java/org/openhab/core/thing/xml/test/ThingTypesTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.thing.xml.test;
+package org.openhab.core.thing.xml.test;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
@@ -21,18 +21,18 @@
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.thing.binding.ThingTypeProvider;
-import org.eclipse.smarthome.core.thing.type.BridgeType;
-import org.eclipse.smarthome.core.thing.type.ChannelDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupDefinition;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupType;
-import org.eclipse.smarthome.core.thing.type.ChannelGroupTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ChannelType;
-import org.eclipse.smarthome.core.thing.type.ChannelTypeRegistry;
-import org.eclipse.smarthome.core.thing.type.ThingType;
-import org.eclipse.smarthome.core.thing.xml.test.LoadedTestBundle.StuffAddition;
-import org.eclipse.smarthome.core.types.StateDescription;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.thing.binding.ThingTypeProvider;
+import org.openhab.core.thing.type.BridgeType;
+import org.openhab.core.thing.type.ChannelDefinition;
+import org.openhab.core.thing.type.ChannelGroupDefinition;
+import org.openhab.core.thing.type.ChannelGroupType;
+import org.openhab.core.thing.type.ChannelGroupTypeRegistry;
+import org.openhab.core.thing.type.ChannelType;
+import org.openhab.core.thing.type.ChannelTypeRegistry;
+import org.openhab.core.thing.type.ThingType;
+import org.openhab.core.thing.xml.test.LoadedTestBundle.StuffAddition;
+import org.openhab.core.types.StateDescription;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/thing/thing-types.xml
index 48dfb732214..5e7403572ca 100644
--- a/itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/thing/thing-types.xml
+++ b/itests/org.openhab.core.thing.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/thing/thing-types.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <thing:thing-descriptions bindingId="hue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
-	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 org.eclipse.smarthome.thing-description-1.0.0.xsd">
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 org.openhab.core.thing-description-1.0.0.xsd">
 
 	<!-- HUE Bridge -->
 	<bridge-type id="bridge">
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioManagerStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioManagerStub.java
index c85a5daf883..f5bdc9d71ef 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioManagerStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioManagerStub.java
@@ -10,17 +10,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import java.util.Collections;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.audio.AudioException;
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.audio.AudioSource;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.library.types.PercentType;
+import org.openhab.core.audio.AudioException;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioSource;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.library.types.PercentType;
 
 /**
  * Only the get source and get sink methods are used in the tests.
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioSourceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioSourceStub.java
index cbbaa623337..9393612c351 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioSourceStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/AudioSourceStub.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import java.io.IOException;
 import java.util.Locale;
@@ -18,10 +18,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.audio.AudioException;
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioSource;
-import org.eclipse.smarthome.core.audio.AudioStream;
+import org.openhab.core.audio.AudioException;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioSource;
+import org.openhab.core.audio.AudioStream;
 
 /**
  * An {@link AudioSource} stub used for the tests
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/ConsoleStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/ConsoleStub.java
index 19e00533944..4eb7484bc2f 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/ConsoleStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/ConsoleStub.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
-import org.eclipse.smarthome.io.console.Console;
+import org.openhab.core.io.console.Console;
 
 /**
  * A {@link Console} stub used for the tests. In order to keep it as simple as
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/HumanLanguageInterpreterStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/HumanLanguageInterpreterStub.java
index 891c8f66108..f0a8810324d 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/HumanLanguageInterpreterStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/HumanLanguageInterpreterStub.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import java.util.Locale;
 import java.util.Set;
 
-import org.eclipse.smarthome.core.voice.text.HumanLanguageInterpreter;
-import org.eclipse.smarthome.core.voice.text.InterpretationException;
+import org.openhab.core.voice.text.HumanLanguageInterpreter;
+import org.openhab.core.voice.text.InterpretationException;
 
 /**
  * A {@link HumanLanguageInterpreter} stub used for the tests. Since the tests do not cover
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/KSServiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/KSServiceStub.java
index 5e9e484ba19..bd80e68672f 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/KSServiceStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/KSServiceStub.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.voice.KSException;
-import org.eclipse.smarthome.core.voice.KSListener;
-import org.eclipse.smarthome.core.voice.KSService;
-import org.eclipse.smarthome.core.voice.KSServiceHandle;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.voice.KSException;
+import org.openhab.core.voice.KSListener;
+import org.openhab.core.voice.KSService;
+import org.openhab.core.voice.KSServiceHandle;
 
 /**
  * A {@link KSService} stub used for the tests.
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/STTServiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/STTServiceStub.java
index 28741a757af..f370af4b449 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/STTServiceStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/STTServiceStub.java
@@ -10,19 +10,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.voice.STTException;
-import org.eclipse.smarthome.core.voice.STTListener;
-import org.eclipse.smarthome.core.voice.STTService;
-import org.eclipse.smarthome.core.voice.STTServiceHandle;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.voice.STTException;
+import org.openhab.core.voice.STTListener;
+import org.openhab.core.voice.STTService;
+import org.openhab.core.voice.STTServiceHandle;
 
 /**
  * A {@link STTService} stub used for the tests.
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/SinkStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/SinkStub.java
index 42ec397754d..15173b39d34 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/SinkStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/SinkStub.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -21,11 +21,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioSink;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.audio.UnsupportedAudioFormatException;
-import org.eclipse.smarthome.core.library.types.PercentType;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.audio.UnsupportedAudioFormatException;
+import org.openhab.core.library.types.PercentType;
 
 /**
  * An {@link AudioSink} stub used for the tests. Since the tests do not cover all the voice's features,
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/TTSServiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/TTSServiceStub.java
index 8786d965a39..db552391778 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/TTSServiceStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/TTSServiceStub.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -20,11 +20,11 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.smarthome.core.audio.AudioFormat;
-import org.eclipse.smarthome.core.audio.AudioStream;
-import org.eclipse.smarthome.core.voice.TTSException;
-import org.eclipse.smarthome.core.voice.TTSService;
-import org.eclipse.smarthome.core.voice.Voice;
+import org.openhab.core.audio.AudioFormat;
+import org.openhab.core.audio.AudioStream;
+import org.openhab.core.voice.TTSException;
+import org.openhab.core.voice.TTSService;
+import org.openhab.core.voice.Voice;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/VoiceStub.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/VoiceStub.java
index 8dcfad0c0bf..97c3452c905 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/VoiceStub.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/internal/VoiceStub.java
@@ -10,11 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.internal;
+package org.openhab.core.voice.internal;
 
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.voice.Voice;
+import org.openhab.core.voice.Voice;
 
 /**
  * A {@link Voice} stub used for the tests.
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/javavoicemanager/VoiceManagerTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/javavoicemanager/VoiceManagerTest.java
index 20b36cf45a2..7dc9418d244 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/javavoicemanager/VoiceManagerTest.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/javavoicemanager/VoiceManagerTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.javavoicemanager;
+package org.openhab.core.voice.javavoicemanager;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -23,21 +23,21 @@
 import java.util.Hashtable;
 import java.util.Locale;
 
-import org.eclipse.smarthome.config.core.ParameterOption;
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.core.voice.VoiceManager;
-import org.eclipse.smarthome.core.voice.internal.AudioManagerStub;
-import org.eclipse.smarthome.core.voice.internal.AudioSourceStub;
-import org.eclipse.smarthome.core.voice.internal.ConsoleStub;
-import org.eclipse.smarthome.core.voice.internal.HumanLanguageInterpreterStub;
-import org.eclipse.smarthome.core.voice.internal.KSServiceStub;
-import org.eclipse.smarthome.core.voice.internal.STTServiceStub;
-import org.eclipse.smarthome.core.voice.internal.SinkStub;
-import org.eclipse.smarthome.core.voice.internal.TTSServiceStub;
-import org.eclipse.smarthome.core.voice.internal.VoiceManagerImpl;
-import org.eclipse.smarthome.core.voice.internal.VoiceStub;
-import org.eclipse.smarthome.core.voice.text.InterpretationException;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.config.core.ParameterOption;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.voice.VoiceManager;
+import org.openhab.core.voice.internal.AudioManagerStub;
+import org.openhab.core.voice.internal.AudioSourceStub;
+import org.openhab.core.voice.internal.ConsoleStub;
+import org.openhab.core.voice.internal.HumanLanguageInterpreterStub;
+import org.openhab.core.voice.internal.KSServiceStub;
+import org.openhab.core.voice.internal.STTServiceStub;
+import org.openhab.core.voice.internal.SinkStub;
+import org.openhab.core.voice.internal.TTSServiceStub;
+import org.openhab.core.voice.internal.VoiceManagerImpl;
+import org.openhab.core.voice.internal.VoiceStub;
+import org.openhab.core.voice.text.InterpretationException;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -53,7 +53,7 @@
  * @author Velin Yordanov - migrated tests from groovy to java
  */
 public class VoiceManagerTest extends JavaOSGiTest {
-    private static final String PID = "org.eclipse.smarthome.voice";
+    private static final String PID = "org.openhab.core.voice";
     private static final String CONFIG_DEFAULT_HLI = "defaultHLI";
     private static final String CONFIG_DEFAULT_KS = "defaultKS";
     private static final String CONFIG_DEFAULT_STT = "defaultSTT";
@@ -164,7 +164,7 @@ public void interpretSomethingWhenTheDefaultHliIsSetAndItIsARegisteredService()
         Dictionary<String, Object> voiceConfig = new Hashtable<>();
         voiceConfig.put("defaultHLI", hliStub.getId());
         ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class);
-        String pid = "org.eclipse.smarthome.voice";
+        String pid = "org.openhab.core.voice";
         Configuration configuration = configAdmin.getConfiguration(pid);
         configuration.update(voiceConfig);
 
@@ -249,7 +249,7 @@ public void startDialogWithoutPassingAnyParameters() throws IOException, Interru
         config.put(CONFIG_DEFAULT_VOICE, voice.getUID());
 
         ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class);
-        String pid = "org.eclipse.smarthome.voice";
+        String pid = "org.openhab.core.voice";
         Configuration configuration = configAdmin.getConfiguration(pid);
         configuration.update(config);
 
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/InterpretCommandTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/InterpretCommandTest.java
index feed6dce718..966bec6ac5a 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/InterpretCommandTest.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/InterpretCommandTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.voiceconsolecommandextension;
+package org.openhab.core.voice.voiceconsolecommandextension;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
@@ -19,9 +19,9 @@
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.eclipse.smarthome.core.voice.internal.HumanLanguageInterpreterStub;
-import org.eclipse.smarthome.core.voice.internal.TTSServiceStub;
-import org.eclipse.smarthome.core.voice.internal.VoiceStub;
+import org.openhab.core.voice.internal.HumanLanguageInterpreterStub;
+import org.openhab.core.voice.internal.TTSServiceStub;
+import org.openhab.core.voice.internal.VoiceStub;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.service.cm.Configuration;
@@ -61,7 +61,7 @@ public void setUp() throws IOException, InterruptedException {
         config.put(CONFIG_DEFAULT_HLI, hliStub.getId());
         config.put(CONFIG_DEFAULT_VOICE, voice.getUID());
         ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class);
-        String pid = "org.eclipse.smarthome.voice";
+        String pid = "org.openhab.core.voice";
         Configuration configuration = configAdmin.getConfiguration(pid);
         configuration.update(config);
     }
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java
index 2a03f822642..cc4dc1b4c6f 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/SayCommandTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.voiceconsolecommandextension;
+package org.openhab.core.voice.voiceconsolecommandextension;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -21,16 +21,16 @@
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
-import org.eclipse.smarthome.core.library.items.StringItem;
-import org.eclipse.smarthome.core.thing.ManagedThingProvider;
-import org.eclipse.smarthome.core.thing.ThingProvider;
-import org.eclipse.smarthome.core.voice.TTSService;
-import org.eclipse.smarthome.core.voice.internal.SinkStub;
-import org.eclipse.smarthome.core.voice.internal.TTSServiceStub;
-import org.eclipse.smarthome.core.voice.internal.VoiceStub;
-import org.eclipse.smarthome.test.storage.VolatileStorageService;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.items.StringItem;
+import org.openhab.core.thing.ManagedThingProvider;
+import org.openhab.core.thing.ThingProvider;
+import org.openhab.core.voice.TTSService;
+import org.openhab.core.voice.internal.SinkStub;
+import org.openhab.core.voice.internal.TTSServiceStub;
+import org.openhab.core.voice.internal.VoiceStub;
+import org.openhab.core.test.storage.VolatileStorageService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -112,7 +112,7 @@ public void testSayCommand() throws IOException {
             Dictionary<String, Object> config = new Hashtable<>();
             config.put(CONFIG_DEFAULT_TTS, defaultTTSService);
             ConfigurationAdmin configAdmin = super.getService(ConfigurationAdmin.class);
-            String pid = "org.eclipse.smarthome.voice";
+            String pid = "org.openhab.core.voice";
             Configuration configuration = configAdmin.getConfiguration(pid);
             configuration.update(config);
         }
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java
index 9bbb8039fe4..23f83c8926e 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java
@@ -10,20 +10,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.voiceconsolecommandextension;
+package org.openhab.core.voice.voiceconsolecommandextension;
 
 import static org.junit.Assert.assertNotNull;
 
-import org.eclipse.smarthome.core.audio.AudioManager;
-import org.eclipse.smarthome.core.voice.VoiceManager;
-import org.eclipse.smarthome.core.voice.internal.AudioManagerStub;
-import org.eclipse.smarthome.core.voice.internal.AudioSourceStub;
-import org.eclipse.smarthome.core.voice.internal.ConsoleStub;
-import org.eclipse.smarthome.core.voice.internal.SinkStub;
-import org.eclipse.smarthome.core.voice.internal.VoiceConsoleCommandExtension;
-import org.eclipse.smarthome.core.voice.internal.VoiceManagerImpl;
-import org.eclipse.smarthome.io.console.extensions.ConsoleCommandExtension;
-import org.eclipse.smarthome.test.java.JavaOSGiTest;
+import org.openhab.core.audio.AudioManager;
+import org.openhab.core.voice.VoiceManager;
+import org.openhab.core.voice.internal.AudioManagerStub;
+import org.openhab.core.voice.internal.AudioSourceStub;
+import org.openhab.core.voice.internal.ConsoleStub;
+import org.openhab.core.voice.internal.SinkStub;
+import org.openhab.core.voice.internal.VoiceConsoleCommandExtension;
+import org.openhab.core.voice.internal.VoiceManagerImpl;
+import org.openhab.core.io.console.extensions.ConsoleCommandExtension;
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.junit.Before;
 
 /**
diff --git a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoicesCommandTest.java b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoicesCommandTest.java
index 43f1246d829..c216f4b9c61 100644
--- a/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoicesCommandTest.java
+++ b/itests/org.openhab.core.voice.tests/src/main/java/org/openhab/core/voice/voiceconsolecommandextension/VoicesCommandTest.java
@@ -10,16 +10,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.smarthome.core.voice.voiceconsolecommandextension;
+package org.openhab.core.voice.voiceconsolecommandextension;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 import java.util.Locale;
 
-import org.eclipse.smarthome.core.voice.internal.SinkStub;
-import org.eclipse.smarthome.core.voice.internal.TTSServiceStub;
-import org.eclipse.smarthome.core.voice.internal.VoiceStub;
+import org.openhab.core.voice.internal.SinkStub;
+import org.openhab.core.voice.internal.TTSServiceStub;
+import org.openhab.core.voice.internal.VoiceStub;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.BundleContext;
diff --git a/pom.xml b/pom.xml
index 5f0eaddb0a2..42cabcef153 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@ Import-Package: \\
   !*.internal.*,\\
   !*.impl.*, \\
   org.openhab.*,\\
-  org.eclipse.smarthome.*
+  org.openhab.core.*
 -sources: false
 -contract: *
 -includeresource: -${.}/NOTICE, -${.}/*.xsd]]></bnd>
@@ -442,9 +442,9 @@ Import-Package: \\
               <headerDefinition>licenses/epl-2.0/xml-header-style.xml</headerDefinition>
             </headerDefinitions>
             <includes>
-              <include>**/org/eclipse/smarthome/**/*.java</include>
-              <include>**/org/eclipse/smarthome/**/*.mwe2</include>
-              <include>**/org/eclipse/smarthome/**/*.xtend</include>
+              <include>**/org/openhab/core/**/*.java</include>
+              <include>**/org/openhab/core/**/*.mwe2</include>
+              <include>**/org/openhab/core/**/*.xtend</include>
               <include>**/org/openhab/**/*.java</include>
               <include>**/org.openhab.core.semantics/**/*.groovy</include>
               <include>**/feature.xml</include>
diff --git a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__BindingConstants.java b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__BindingConstants.java
index f0bec2ab5de..94155500bc0 100644
--- a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__BindingConstants.java
+++ b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__BindingConstants.java
@@ -16,7 +16,7 @@
 package ${package}.internal;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingTypeUID;
 
 /**
  * The {@link ${bindingIdCamelCase}BindingConstants} class defines common constants, which are
diff --git a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__Handler.java b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__Handler.java
index c4b53209205..a70bd66a421 100644
--- a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__Handler.java
+++ b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__Handler.java
@@ -19,12 +19,12 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.ChannelUID;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingStatus;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
-import org.eclipse.smarthome.core.types.Command;
-import org.eclipse.smarthome.core.types.RefreshType;
+import org.openhab.core.thing.ChannelUID;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingStatus;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__HandlerFactory.java b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__HandlerFactory.java
index 6c81b7fbaff..7545e50bb40 100644
--- a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__HandlerFactory.java
+++ b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/java/internal/__bindingIdCamelCase__HandlerFactory.java
@@ -22,11 +22,11 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.smarthome.core.thing.Thing;
-import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
-import org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory;
+import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.binding.BaseThingHandlerFactory;
+import org.openhab.core.thing.binding.ThingHandler;
+import org.openhab.core.thing.binding.ThingHandlerFactory;
 import org.osgi.service.component.annotations.Component;
 
 /**
diff --git a/tools/static-code-analysis/checkstyle/ruleset.properties b/tools/static-code-analysis/checkstyle/ruleset.properties
index df698fdae92..61927a47c60 100644
--- a/tools/static-code-analysis/checkstyle/ruleset.properties
+++ b/tools/static-code-analysis/checkstyle/ruleset.properties
@@ -1,4 +1,4 @@
-checkstyle.beforeExecutionExclusionFileFilter.fileNamePattern=.+org.eclipse.smarthome.core.internal.i18n.I18nProviderImpl\.java$|.+org.eclipse.smarthome.core.i18n.TranslationProvider\.java$
+checkstyle.beforeExecutionExclusionFileFilter.fileNamePattern=.+org.openhab.core.internal.i18n.I18nProviderImpl\.java$|.+org.openhab.core.i18n.TranslationProvider\.java$
 checkstyle.forbiddenPackageUsageCheck.exceptions=
 checkstyle.forbiddenPackageUsageCheck.forbiddenPackages=com.google.common
 checkstyle.headerCheck.content=^/\\*\\*$\\n^ \\* Copyright \\(c\\) {0}-{1} Contributors to the openHAB project$\\n^ \\*$\\n^ \\* See the NOTICE file\\(s\\) distributed with this work for additional$\\n^ \\* information.$\\n^ \\*$\\n^ \\* This program and the accompanying materials are made available under the$\\n^ \\* terms of the Eclipse Public License 2\\.0 which is available at$\\n^ \\* http://www.eclipse.org/legal/epl\\-2\\.0$\\n^ \\*$\\n^ \\* SPDX-License-Identifier: EPL-2.0$
diff --git a/tools/static-code-analysis/checkstyle/suppressions.xml b/tools/static-code-analysis/checkstyle/suppressions.xml
index 594644c83f0..5f0eaf7074f 100644
--- a/tools/static-code-analysis/checkstyle/suppressions.xml
+++ b/tools/static-code-analysis/checkstyle/suppressions.xml
@@ -20,13 +20,13 @@
     <!-- These bundles are generated trough XText -->
     <suppress files=".+org.openhab.core.model.+" checks="RequireBundleCheck|ExportInternalPackageCheck|ManifestPackageVersionCheck|ImportExportedPackagesCheck|PackageExportsNameCheck|PomXmlCheck"/>
 
-    <suppress files=".+org.eclipse.smarthome.config.discovery.mdns.internal.MDNSDiscoveryService.java|.+org.eclipse.smarthome.config.discovery.upnp.internal.UpnpDiscoveryService.java|.+org.eclipse.smarthome.io.console.eclipse.internal.ConsoleSupportEclipse.java|.+org.eclipse.smarthome.io.console.rfc147.internal.CommandWrapper.java|.+org.eclipse.smarthome.core.library.unit.MetricPrefix.java" checks="MethodNameCheck"/>
+    <suppress files=".+org.openhab.core.config.discovery.mdns.internal.MDNSDiscoveryService.java|.+org.openhab.core.config.discovery.upnp.internal.UpnpDiscoveryService.java|.+org.openhab.core.io.console.eclipse.internal.ConsoleSupportEclipse.java|.+org.openhab.core.io.console.rfc147.internal.CommandWrapper.java|.+org.openhab.core.library.unit.MetricPrefix.java" checks="MethodNameCheck"/>
 
 	<!-- Add suppression as discussed in https://github.com/openhab/static-code-analysis/issues/265 -->
-	<suppress files=".+org.eclipse.smarthome.core.common.registry.AbstractRegistry.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
-	<suppress files=".+org.eclipse.smarthome.core.thing.binding.BaseThingHandler.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
-	<suppress files=".+org.eclipse.smarthome.core.thing.binding.BaseThingHandlerFactory.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
-	<suppress files=".+org.eclipse.smarthome.core.transform.AbstractFileTransformationService.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
+	<suppress files=".+org.openhab.core.common.registry.AbstractRegistry.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
+	<suppress files=".+org.openhab.core.thing.binding.BaseThingHandler.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
+	<suppress files=".+org.openhab.core.thing.binding.BaseThingHandlerFactory.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
+	<suppress files=".+org.openhab.core.transform.AbstractFileTransformationService.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
 	<suppress files=".+org.openhab.core.automation.internal.commands.AbstractCommandProvider.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
 	<suppress files=".+org.openhab.core.automation.sample.rest.api.internal.Activator.java" checks="DeclarativeServicesDependencyInjectionCheck"/>
 </suppressions>
diff --git a/tools/static-code-analysis/pmd/suppressions.properties b/tools/static-code-analysis/pmd/suppressions.properties
index c5c4317ccd8..6ad955a4346 100644
--- a/tools/static-code-analysis/pmd/suppressions.properties
+++ b/tools/static-code-analysis/pmd/suppressions.properties
@@ -1,16 +1,16 @@
-org.eclipse.smarthome.core.common.registry.AbstractRegistry=AvoidCatchingThrowable
-org.eclipse.smarthome.core.internal.common.SafeCallManagerImpl=CompareObjectsWithEquals
-org.eclipse.smarthome.core.internal.events.ThreadedEventHandler=CompareObjectsWithEquals
-org.eclipse.smarthome.core.internal.events.ThreadedEventHandler=EmptyIfStmt
-org.eclipse.smarthome.core.thing.internal.ChannelItemProvider=CompareObjectsWithEquals
-org.eclipse.smarthome.core.thing.internal.ThingManager=CompareObjectsWithEquals
-org.eclipse.smarthome.io.console.karaf.internal.OSGiConsole=SystemPrintln
-org.eclipse.smarthome.io.console.rfc147.internal.CommandWrapper=SystemPrintln
-org.eclipse.smarthome.io.console.rfc147.internal.OSGiConsole=SystemPrintln
-org.eclipse.smarthome.io.net.http.internal.SecureHttpClientFactory=AvoidThrowingRawExceptionTypes
-org.eclipse.smarthome.model.core.internal.ModelRepositoryImpl=AvoidCatchingNPE
-org.eclipse.smarthome.model.script.interpreter.ScriptInterpreter=AvoidCatchingThrowable
-org.eclipse.smarthome.ui.internal.proxy.ProxyServletService=AvoidCatchingThrowable
+org.openhab.core.common.registry.AbstractRegistry=AvoidCatchingThrowable
+org.openhab.core.internal.common.SafeCallManagerImpl=CompareObjectsWithEquals
+org.openhab.core.internal.events.ThreadedEventHandler=CompareObjectsWithEquals
+org.openhab.core.internal.events.ThreadedEventHandler=EmptyIfStmt
+org.openhab.core.thing.internal.ChannelItemProvider=CompareObjectsWithEquals
+org.openhab.core.thing.internal.ThingManager=CompareObjectsWithEquals
+org.openhab.core.io.console.karaf.internal.OSGiConsole=SystemPrintln
+org.openhab.core.io.console.rfc147.internal.CommandWrapper=SystemPrintln
+org.openhab.core.io.console.rfc147.internal.OSGiConsole=SystemPrintln
+org.openhab.core.io.net.http.internal.SecureHttpClientFactory=AvoidThrowingRawExceptionTypes
+org.openhab.core.model.core.internal.ModelRepositoryImpl=AvoidCatchingNPE
+org.openhab.core.model.script.interpreter.ScriptInterpreter=AvoidCatchingThrowable
+org.openhab.core.ui.internal.proxy.ProxyServletService=AvoidCatchingThrowable
 org.openhab.core.automation.internal.RuleEngineImpl=AvoidCatchingThrowable
 org.openhab.core.automation.internal.RuleRegistryImpl=CompareObjectsWithEquals
 org.openhab.core.automation.internal.provider.AutomationResourceBundlesEventQueue=AvoidCatchingThrowable
diff --git a/tools/static-code-analysis/spotbugs/suppressions.xml b/tools/static-code-analysis/spotbugs/suppressions.xml
index 5453388a292..30da81f39f8 100644
--- a/tools/static-code-analysis/spotbugs/suppressions.xml
+++ b/tools/static-code-analysis/spotbugs/suppressions.xml
@@ -26,7 +26,7 @@
   </Match>
   <!-- The format string is parameter, it can't be constant -->
   <Match>
-    <Class name="org.eclipse.smarthome.model.script.actions.LogAction"/>
+    <Class name="org.openhab.core.model.script.actions.LogAction"/>
     <Bug pattern="SLF4J_FORMAT_SHOULD_BE_CONST"/>
   </Match>
   <Match>

From 6e5fe9b8c050ef25d9b2a68aef5b519eb037d4d1 Mon Sep 17 00:00:00 2001
From: Christoph Weitkamp <github@christophweitkamp.de>
Date: Fri, 27 Dec 2019 11:11:20 +0100
Subject: [PATCH 3/3] Changes in ScriptImportSectionNamespaceScopeProvider

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
---
 .../ScriptImportSectionNamespaceScopeProvider.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java
index 77457602bb4..acd229a2ce5 100644
--- a/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java
+++ b/bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/scoping/ScriptImportSectionNamespaceScopeProvider.java
@@ -20,16 +20,16 @@
 
 public class ScriptImportSectionNamespaceScopeProvider extends XImportSectionNamespaceScopeProvider {
 
-    public static final QualifiedName CORE_LIBRARY_TYPES_PACKAGE = QualifiedName.create("org", "eclipse", "smarthome",
+    public static final QualifiedName CORE_LIBRARY_TYPES_PACKAGE = QualifiedName.create("org", "openhab",
             "core", "library", "types");
-    public static final QualifiedName CORE_LIBRARY_ITEMS_PACKAGE = QualifiedName.create("org", "eclipse", "smarthome",
+    public static final QualifiedName CORE_LIBRARY_ITEMS_PACKAGE = QualifiedName.create("org", "openhab",
             "core", "library", "items");
-    public static final QualifiedName CORE_ITEMS_PACKAGE = QualifiedName.create("org", "eclipse", "smarthome", "core",
+    public static final QualifiedName CORE_ITEMS_PACKAGE = QualifiedName.create("org", "openhab", "core",
             "items");
-    public static final QualifiedName CORE_PERSISTENCE_PACKAGE = QualifiedName.create("org", "eclipse", "smarthome",
+    public static final QualifiedName CORE_PERSISTENCE_PACKAGE = QualifiedName.create("org", "openhab",
             "core", "persistence");
-    public static final QualifiedName MODEL_SCRIPT_ACTIONS_PACKAGE = QualifiedName.create("org", "eclipse", "smarthome",
-            "model", "script", "actions");
+    public static final QualifiedName MODEL_SCRIPT_ACTIONS_PACKAGE = QualifiedName.create("org", "openhab",
+            "core", "model", "script", "actions");
     public static final QualifiedName JODA_TIME_PACKAGE = QualifiedName.create("org", "joda", "time");
 
     @Override