diff --git a/moonraker/app.py b/moonraker/app.py
index b4747d0..f4107a0 100644
--- a/moonraker/app.py
+++ b/moonraker/app.py
@@ -48,7 +48,7 @@ from typing import (
 )
 if TYPE_CHECKING:
     from tornado.httpserver import HTTPServer
-    from moonraker import Server
+    from server import Server
     from eventloop import EventLoop
     from confighelper import ConfigHelper
     from klippy_connection import KlippyConnection as Klippy
diff --git a/moonraker/components/http_client.py b/moonraker/components/http_client.py
index f6112bf..e33ebce 100644
--- a/moonraker/components/http_client.py
+++ b/moonraker/components/http_client.py
@@ -27,7 +27,7 @@ from typing import (
     Any
 )
 if TYPE_CHECKING:
-    from moonraker import Server
+    from server import Server
     from confighelper import ConfigHelper
     from io import BufferedWriter
     StrOrPath = Union[str, pathlib.Path]
diff --git a/moonraker/components/template.py b/moonraker/components/template.py
index 60160e7..67113f6 100644
--- a/moonraker/components/template.py
+++ b/moonraker/components/template.py
@@ -17,7 +17,7 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from moonraker import Server
+    from server import Server
     from confighelper import ConfigHelper
     from .secrets import Secrets
 
diff --git a/moonraker/components/update_manager/update_manager.py b/moonraker/components/update_manager/update_manager.py
index cbc7f37..05f83c9 100644
--- a/moonraker/components/update_manager/update_manager.py
+++ b/moonraker/components/update_manager/update_manager.py
@@ -37,7 +37,7 @@ from typing import (
     cast
 )
 if TYPE_CHECKING:
-    from moonraker import Server
+    from server import Server
     from confighelper import ConfigHelper
     from websockets import WebRequest
     from klippy_connection import KlippyConnection
diff --git a/moonraker/components/webcam.py b/moonraker/components/webcam.py
index 4ec5050..ee2fccc 100644
--- a/moonraker/components/webcam.py
+++ b/moonraker/components/webcam.py
@@ -20,7 +20,7 @@ from typing import (
 )
 
 if TYPE_CHECKING:
-    from moonraker import Server
+    from server import Server
     from confighelper import ConfigHelper
     from websockets import WebRequest
     from .database import MoonrakerDatabase
diff --git a/moonraker/confighelper.py b/moonraker/confighelper.py
index 0d122a2..bb5711a 100644
--- a/moonraker/confighelper.py
+++ b/moonraker/confighelper.py
@@ -34,7 +34,7 @@ from typing import (
     Type,
 )
 if TYPE_CHECKING:
-    from moonraker import Server
+    from server import Server
     from components.gpio import GpioFactory, GpioOutputPin
     from components.template import TemplateFactory
     from io import TextIOWrapper
diff --git a/moonraker/moonraker.py b/moonraker/server.py
similarity index 100%
rename from moonraker/moonraker.py
rename to moonraker/server.py
diff --git a/moonraker/websockets.py b/moonraker/websockets.py
index b876beb..6942110 100644
--- a/moonraker/websockets.py
+++ b/moonraker/websockets.py
@@ -30,7 +30,7 @@ from typing import (
     List,
 )
 if TYPE_CHECKING:
-    from moonraker import Server
+    from server import Server
     from app import APIDefinition
     from klippy_connection import KlippyConnection as Klippy
     from .components.extensions import ExtensionManager