diff --git a/src/oidcop/oauth2/device_authorization.py b/backburner/device_authorization.py
similarity index 93%
rename from src/oidcop/oauth2/device_authorization.py
rename to backburner/device_authorization.py
index 5b2833f0..4bd3fc02 100644
--- a/src/oidcop/oauth2/device_authorization.py
+++ b/backburner/device_authorization.py
@@ -6,7 +6,7 @@
 from oidcop.endpoint import Endpoint
 
 
-class AuthorizationEndpoint(Endpoint):
+class DeviceAuthorizationEndpoint(Endpoint):
     request_cls = AuthorizationRequest
     response_cls = AuthorizationResponse
     request_format = "urlencoded"
@@ -21,6 +21,9 @@ def __init__(self, server_get, **kwargs):
         self.expires_in = kwargs.get("expires_in", 300)
         self.interval = kwargs.get("interval", 5)
 
+        _context = server_get("endpoint_context")
+        _context.dev_auth_db = {}
+
     def process_request(self, request=None, **kwargs):
         """
         Produces a device code and an end-user
diff --git a/src/oidcop/oauth2/add_on/device_authorization.py b/src/oidcop/oauth2/add_on/device_authorization.py
deleted file mode 100644
index 54fc08e3..00000000
--- a/src/oidcop/oauth2/add_on/device_authorization.py
+++ /dev/null
@@ -1,6 +0,0 @@
-def add_support(endpoint, **kwargs):
-    _context = endpoint["token"].endpoint_context
-
-    _db = kwargs.get("db")
-    if not _db:
-        _context.dev_auth_db = {}