diff --git a/addons/binding/org.openhab.binding.bosesoundtouch/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.bosesoundtouch/META-INF/MANIFEST.MF
index 04b75bc8cc8e4..73bddc2e1ad2a 100644
--- a/addons/binding/org.openhab.binding.bosesoundtouch/META-INF/MANIFEST.MF
+++ b/addons/binding/org.openhab.binding.bosesoundtouch/META-INF/MANIFEST.MF
@@ -31,11 +31,7 @@ Import-Package:
  org.eclipse.smarthome.core.thing.type,
  org.eclipse.smarthome.core.types,
  org.eclipse.smarthome.io.net.http,
- org.openhab.binding.bosesoundtouch,
- org.openhab.binding.bosesoundtouch.handler,
  org.osgi.service.component.annotations;resolution:=optional,
  org.slf4j
 Service-Component: OSGI-INF/*.xml
-Export-Package: org.openhab.binding.bosesoundtouch,
- org.openhab.binding.bosesoundtouch.handler
 Automatic-Module-Name: org.openhab.binding.bosesoundtouch
diff --git a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/BoseSoundTouchBindingConstants.java b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchBindingConstants.java
similarity index 96%
rename from addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/BoseSoundTouchBindingConstants.java
rename to addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchBindingConstants.java
index 4526dd8713387..3845ffd5efdd1 100644
--- a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/BoseSoundTouchBindingConstants.java
+++ b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchBindingConstants.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.bosesoundtouch;
+package org.openhab.binding.bosesoundtouch.internal;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/BoseSoundTouchConfiguration.java b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchConfiguration.java
similarity index 91%
rename from addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/BoseSoundTouchConfiguration.java
rename to addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchConfiguration.java
index 5251ff4221d70..4fb45f449ac62 100644
--- a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/BoseSoundTouchConfiguration.java
+++ b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchConfiguration.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.bosesoundtouch;
+package org.openhab.binding.bosesoundtouch.internal;
 
 import org.eclipse.smarthome.core.thing.Thing;
 
diff --git a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchHandlerFactory.java b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchHandlerFactory.java
index 2f2b133bc9ccc..ebc01839d8d1c 100644
--- a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchHandlerFactory.java
+++ b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/BoseSoundTouchHandlerFactory.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
-import static org.openhab.binding.bosesoundtouch.BoseSoundTouchBindingConstants.SUPPORTED_THING_TYPES_UIDS;
+import static org.openhab.binding.bosesoundtouch.internal.BoseSoundTouchBindingConstants.SUPPORTED_THING_TYPES_UIDS;
 
 import org.eclipse.smarthome.core.storage.Storage;
 import org.eclipse.smarthome.core.storage.StorageService;
@@ -21,7 +21,7 @@
 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.binding.bosesoundtouch.handler.BoseSoundTouchHandler;
+import org.openhab.binding.bosesoundtouch.internal.handler.BoseSoundTouchHandler;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
diff --git a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/CommandExecutor.java b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/CommandExecutor.java
index 2ea46794b094a..207f8955a4b7b 100644
--- a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/CommandExecutor.java
+++ b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/CommandExecutor.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.bosesoundtouch.internal;
 
-import static org.openhab.binding.bosesoundtouch.BoseSoundTouchBindingConstants.*;
+import static org.openhab.binding.bosesoundtouch.internal.BoseSoundTouchBindingConstants.*;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -26,7 +26,7 @@
 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.binding.bosesoundtouch.handler.BoseSoundTouchHandler;
+import org.openhab.binding.bosesoundtouch.internal.handler.BoseSoundTouchHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java
index 5bf14cfb90cf5..57d59ccc994dd 100644
--- a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java
+++ b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseHandler.java
@@ -15,7 +15,7 @@
 import static org.eclipse.smarthome.core.thing.Thing.PROPERTY_FIRMWARE_VERSION;
 import static org.eclipse.smarthome.core.thing.Thing.PROPERTY_HARDWARE_VERSION;
 import static org.eclipse.smarthome.core.thing.Thing.PROPERTY_MODEL_ID;
-import static org.openhab.binding.bosesoundtouch.BoseSoundTouchBindingConstants.*;
+import static org.openhab.binding.bosesoundtouch.internal.BoseSoundTouchBindingConstants.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,8 +31,7 @@
 import org.eclipse.smarthome.core.types.State;
 import org.eclipse.smarthome.core.types.UnDefType;
 import org.eclipse.smarthome.io.net.http.HttpUtil;
-import org.openhab.binding.bosesoundtouch.BoseSoundTouchConfiguration;
-import org.openhab.binding.bosesoundtouch.handler.BoseSoundTouchHandler;
+import org.openhab.binding.bosesoundtouch.internal.handler.BoseSoundTouchHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
diff --git a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseProcessor.java b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseProcessor.java
index 072cb25f5db23..cbc6b47156db0 100644
--- a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseProcessor.java
+++ b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/XMLResponseProcessor.java
@@ -17,7 +17,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.openhab.binding.bosesoundtouch.handler.BoseSoundTouchHandler;
+import org.openhab.binding.bosesoundtouch.internal.handler.BoseSoundTouchHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
diff --git a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java
index a5a0f6c1fd796..578adfd507750 100644
--- a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java
+++ b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/discovery/SoundTouchDiscoveryParticipant.java
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.bosesoundtouch.internal.discovery;
 
-import static org.openhab.binding.bosesoundtouch.BoseSoundTouchBindingConstants.*;
+import static org.openhab.binding.bosesoundtouch.internal.BoseSoundTouchBindingConstants.*;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -32,7 +32,7 @@
 import org.eclipse.smarthome.core.thing.Thing;
 import org.eclipse.smarthome.core.thing.ThingTypeUID;
 import org.eclipse.smarthome.core.thing.ThingUID;
-import org.openhab.binding.bosesoundtouch.BoseSoundTouchConfiguration;
+import org.openhab.binding.bosesoundtouch.internal.BoseSoundTouchConfiguration;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/handler/BoseSoundTouchHandler.java b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/handler/BoseSoundTouchHandler.java
similarity index 97%
rename from addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/handler/BoseSoundTouchHandler.java
rename to addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/handler/BoseSoundTouchHandler.java
index fe06516dca9cf..b318df962094b 100644
--- a/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/handler/BoseSoundTouchHandler.java
+++ b/addons/binding/org.openhab.binding.bosesoundtouch/src/main/java/org/openhab/binding/bosesoundtouch/internal/handler/BoseSoundTouchHandler.java
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.openhab.binding.bosesoundtouch.handler;
+package org.openhab.binding.bosesoundtouch.internal.handler;
 
-import static org.openhab.binding.bosesoundtouch.BoseSoundTouchBindingConstants.*;
+import static org.openhab.binding.bosesoundtouch.internal.BoseSoundTouchBindingConstants.*;
 
 import java.io.IOException;
 import java.net.URI;
@@ -52,8 +52,8 @@
 import org.eclipse.smarthome.core.types.RefreshType;
 import org.eclipse.smarthome.core.types.State;
 import org.eclipse.smarthome.core.types.StateOption;
-import org.openhab.binding.bosesoundtouch.BoseSoundTouchConfiguration;
 import org.openhab.binding.bosesoundtouch.internal.APIRequest;
+import org.openhab.binding.bosesoundtouch.internal.BoseSoundTouchConfiguration;
 import org.openhab.binding.bosesoundtouch.internal.BoseSoundTouchNotificationChannelConfiguration;
 import org.openhab.binding.bosesoundtouch.internal.BoseStateDescriptionOptionProvider;
 import org.openhab.binding.bosesoundtouch.internal.CommandExecutor;