move server to mqtt module

bumper/__init__.py

@@ -6,7 +6,7 @@ import sys
 
 from bumper.db import revoke_expired_oauths, revoke_expired_tokens
 from bumper.mqtt.helper_bot import HelperBot
-from bumper.mqttserver import MQTTServer
+from bumper.mqtt.server import MQTTServer
 from bumper.util import get_logger, log_to_stdout
 from bumper.web.server import WebServer, WebserverBinding
 from bumper.xmppserver import XMPPServer

bumper/mqtt/server.py

@@ -1,4 +1,4 @@
-"""Mqtt module."""
+"""Server module."""
 
 import os
 from typing import Any
@@ -44,7 +44,7 @@ class MQTTServer:
             # The below adds a plugin to the amqtt.broker.plugins without having to futz with setup.py
             distribution = pkg_resources.Distribution("amqtt.broker.plugins")
             bumper_plugin = pkg_resources.EntryPoint.parse(
-                "bumper = bumper.mqttserver:BumperMQTTServerPlugin", dist=distribution
+                "bumper = bumper.mqtt.server:BumperMQTTServerPlugin", dist=distribution
             )
             distribution._ep_map = {"amqtt.broker.plugins": {"bumper": bumper_plugin}}  # type: ignore[attr-defined]
             pkg_resources.working_set.add(distribution)