diff --git a/rpcserver.py b/rpcserver.py
new file mode 100644
index 0000000..4da8aa6
--- /dev/null
+++ b/rpcserver.py
@@ -0,0 +1,12 @@
+import xmlrpc.server as xrs
+
+
+class RPCServer(xrs.SimpleXMLRPCServer):
+
+    def __init__(self, host, port, *args, **kwargs):
+        addr = (host, port)
+        kwargs.setdefault("allow_none", True)
+        super().__init__(addr, *args, **kwargs)
+
+
+
diff --git a/rpcserverthread.py b/rpcserverthread.py
index 5fd8b6e..b0640d5 100644
--- a/rpcserverthread.py
+++ b/rpcserverthread.py
@@ -1,6 +1,6 @@
 import atexit
-import xmlrpc.server as xrs
 from threading import Thread
+from rpcserver import RPCServer
 
 
 class RPCServerThread(Thread):
@@ -36,15 +36,6 @@ class RPCServerThread(Thread):
 
 
 
-class RPCServer(xrs.SimpleXMLRPCServer):
-
-    def __init__(self, host, port, *args, **kwargs):
-        addr = (host, port)
-        kwargs.setdefault("allow_none", True)
-        super().__init__(addr, *args, **kwargs)
-
-
-
 
 
 if __name__ == "__main__":