diff --git a/homeassistant/components/upb/__init__.py b/homeassistant/components/upb/__init__.py
index 2e5a69393d4..ca4375d1232 100644
--- a/homeassistant/components/upb/__init__.py
+++ b/homeassistant/components/upb/__init__.py
@@ -4,9 +4,7 @@ import upb_lib
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_COMMAND, CONF_FILE_PATH, CONF_HOST, Platform
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import Entity
+from homeassistant.core import HomeAssistant
 
 from .const import (
     ATTR_ADDRESS,
@@ -65,60 +63,3 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
         upb.disconnect()
         hass.data[DOMAIN].pop(config_entry.entry_id)
     return unload_ok
-
-
-class UpbEntity(Entity):
-    """Base class for all UPB entities."""
-
-    _attr_should_poll = False
-
-    def __init__(self, element, unique_id, upb):
-        """Initialize the base of all UPB devices."""
-        self._upb = upb
-        self._element = element
-        element_type = "link" if element.addr.is_link else "device"
-        self._unique_id = f"{unique_id}_{element_type}_{element.addr}"
-
-    @property
-    def unique_id(self):
-        """Return unique id of the element."""
-        return self._unique_id
-
-    @property
-    def extra_state_attributes(self):
-        """Return the default attributes of the element."""
-        return self._element.as_dict()
-
-    @property
-    def available(self):
-        """Is the entity available to be updated."""
-        return self._upb.is_connected()
-
-    def _element_changed(self, element, changeset):
-        pass
-
-    @callback
-    def _element_callback(self, element, changeset):
-        """Handle callback from an UPB element that has changed."""
-        self._element_changed(element, changeset)
-        self.async_write_ha_state()
-
-    async def async_added_to_hass(self):
-        """Register callback for UPB changes and update entity state."""
-        self._element.add_callback(self._element_callback)
-        self._element_callback(self._element, {})
-
-
-class UpbAttachedEntity(UpbEntity):
-    """Base class for UPB attached entities."""
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Device info for the entity."""
-        return DeviceInfo(
-            identifiers={(DOMAIN, self._element.index)},
-            manufacturer=self._element.manufacturer,
-            model=self._element.product,
-            name=self._element.name,
-            sw_version=self._element.version,
-        )
diff --git a/homeassistant/components/upb/entity.py b/homeassistant/components/upb/entity.py
new file mode 100644
index 00000000000..13037adf680
--- /dev/null
+++ b/homeassistant/components/upb/entity.py
@@ -0,0 +1,64 @@
+"""Support the UPB PIM."""
+
+from homeassistant.core import callback
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity import Entity
+
+from .const import DOMAIN
+
+
+class UpbEntity(Entity):
+    """Base class for all UPB entities."""
+
+    _attr_should_poll = False
+
+    def __init__(self, element, unique_id, upb):
+        """Initialize the base of all UPB devices."""
+        self._upb = upb
+        self._element = element
+        element_type = "link" if element.addr.is_link else "device"
+        self._unique_id = f"{unique_id}_{element_type}_{element.addr}"
+
+    @property
+    def unique_id(self):
+        """Return unique id of the element."""
+        return self._unique_id
+
+    @property
+    def extra_state_attributes(self):
+        """Return the default attributes of the element."""
+        return self._element.as_dict()
+
+    @property
+    def available(self):
+        """Is the entity available to be updated."""
+        return self._upb.is_connected()
+
+    def _element_changed(self, element, changeset):
+        pass
+
+    @callback
+    def _element_callback(self, element, changeset):
+        """Handle callback from an UPB element that has changed."""
+        self._element_changed(element, changeset)
+        self.async_write_ha_state()
+
+    async def async_added_to_hass(self):
+        """Register callback for UPB changes and update entity state."""
+        self._element.add_callback(self._element_callback)
+        self._element_callback(self._element, {})
+
+
+class UpbAttachedEntity(UpbEntity):
+    """Base class for UPB attached entities."""
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Device info for the entity."""
+        return DeviceInfo(
+            identifiers={(DOMAIN, self._element.index)},
+            manufacturer=self._element.manufacturer,
+            model=self._element.product,
+            name=self._element.name,
+            sw_version=self._element.version,
+        )
diff --git a/homeassistant/components/upb/light.py b/homeassistant/components/upb/light.py
index 881eda3525f..07bd50b7d9f 100644
--- a/homeassistant/components/upb/light.py
+++ b/homeassistant/components/upb/light.py
@@ -15,8 +15,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import UpbAttachedEntity
 from .const import DOMAIN, UPB_BLINK_RATE_SCHEMA, UPB_BRIGHTNESS_RATE_SCHEMA
+from .entity import UpbAttachedEntity
 
 SERVICE_LIGHT_FADE_START = "light_fade_start"
 SERVICE_LIGHT_FADE_STOP = "light_fade_stop"
diff --git a/homeassistant/components/upb/scene.py b/homeassistant/components/upb/scene.py
index 276b620d5b5..5a5e17b3e4c 100644
--- a/homeassistant/components/upb/scene.py
+++ b/homeassistant/components/upb/scene.py
@@ -8,8 +8,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_platform
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import UpbEntity
 from .const import DOMAIN, UPB_BLINK_RATE_SCHEMA, UPB_BRIGHTNESS_RATE_SCHEMA
+from .entity import UpbEntity
 
 SERVICE_LINK_DEACTIVATE = "link_deactivate"
 SERVICE_LINK_FADE_STOP = "link_fade_stop"