diff --git a/hyperglass/api/__init__.py b/hyperglass/api/__init__.py
index 8dd2f52..e593e9e 100644
--- a/hyperglass/api/__init__.py
+++ b/hyperglass/api/__init__.py
@@ -19,6 +19,7 @@ from hyperglass.api.error_handlers import http_handler
 from hyperglass.api.error_handlers import validation_handler
 from hyperglass.api.events import on_shutdown
 from hyperglass.api.events import on_startup
+from hyperglass.api.models.response import QueryResponse
 from hyperglass.api.routes import docs
 from hyperglass.api.routes import queries
 from hyperglass.api.routes import query
@@ -27,7 +28,6 @@ from hyperglass.configuration import URL_DEV
 from hyperglass.configuration import params
 from hyperglass.constants import __version__
 from hyperglass.exceptions import HyperglassError
-from hyperglass.models.response import QueryResponse
 from hyperglass.util import log
 
 STATIC_DIR = Path(__file__).parent.parent / "static"
@@ -117,7 +117,7 @@ app.add_api_route(
     tags=[params.docs.group_title],
     response_class=UJSONResponse,
 )
-app.add_api_route(path="api/docs", endpoint=docs, include_in_schema=False)
+app.add_api_route(path="/api/docs", endpoint=docs, include_in_schema=False)
 app.mount("/images", StaticFiles(directory=IMAGES_DIR), name="images")
 app.mount("/", StaticFiles(directory=UI_DIR, html=True), name="ui")
 
diff --git a/hyperglass/api/models/__init__.py b/hyperglass/api/models/__init__.py
new file mode 100644
index 0000000..b3e8ce4
--- /dev/null
+++ b/hyperglass/api/models/__init__.py
@@ -0,0 +1,10 @@
+"""Query & Response Validation Models."""
+
+# Project Imports
+from hyperglass.api.models import query
+from hyperglass.api.models import response
+from hyperglass.api.models import rfc8522
+from hyperglass.api.models import types
+from hyperglass.api.models import validators
+
+# flake8: noqa: F401
diff --git a/hyperglass/models/query.py b/hyperglass/api/models/query.py
similarity index 94%
rename from hyperglass/models/query.py
rename to hyperglass/api/models/query.py
index 5363e84..5041672 100644
--- a/hyperglass/models/query.py
+++ b/hyperglass/api/models/query.py
@@ -9,14 +9,14 @@ from pydantic import StrictStr
 from pydantic import validator
 
 # Project Imports
+from hyperglass.api.models.types import SupportedQuery
+from hyperglass.api.models.validators import validate_aspath
+from hyperglass.api.models.validators import validate_community
+from hyperglass.api.models.validators import validate_ip
 from hyperglass.configuration import devices
 from hyperglass.configuration import params
 from hyperglass.configuration.models.vrfs import Vrf
 from hyperglass.exceptions import InputInvalid
-from hyperglass.models.types import SupportedQuery
-from hyperglass.models.validators import validate_aspath
-from hyperglass.models.validators import validate_community
-from hyperglass.models.validators import validate_ip
 
 
 def get_vrf_object(vrf_name):
diff --git a/hyperglass/models/response.py b/hyperglass/api/models/response.py
similarity index 100%
rename from hyperglass/models/response.py
rename to hyperglass/api/models/response.py
diff --git a/hyperglass/models/rfc8522.py b/hyperglass/api/models/rfc8522.py
similarity index 100%
rename from hyperglass/models/rfc8522.py
rename to hyperglass/api/models/rfc8522.py
diff --git a/hyperglass/models/types.py b/hyperglass/api/models/types.py
similarity index 100%
rename from hyperglass/models/types.py
rename to hyperglass/api/models/types.py
diff --git a/hyperglass/models/validators.py b/hyperglass/api/models/validators.py
similarity index 100%
rename from hyperglass/models/validators.py
rename to hyperglass/api/models/validators.py
diff --git a/hyperglass/api/routes.py b/hyperglass/api/routes.py
index 3096f72..607ff0e 100644
--- a/hyperglass/api/routes.py
+++ b/hyperglass/api/routes.py
@@ -11,12 +11,12 @@ from fastapi.openapi.docs import get_swagger_ui_html
 from starlette.requests import Request
 
 # Project Imports
+from hyperglass.api.models.query import Query
 from hyperglass.configuration import REDIS_CONFIG
 from hyperglass.configuration import devices
 from hyperglass.configuration import params
 from hyperglass.exceptions import HyperglassError
 from hyperglass.execution.execute import Execute
-from hyperglass.models.query import Query
 from hyperglass.util import log
 
 Cache = aredis.StrictRedis(db=params.cache.database, **REDIS_CONFIG)
diff --git a/hyperglass/models/__init__.py b/hyperglass/models/__init__.py
deleted file mode 100644
index be019c4..0000000
--- a/hyperglass/models/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""Query & Response Validation Models."""
-
-# Project Imports
-# flake8: noqa: F401
-
-from hyperglass.models import query
-from hyperglass.models import response
-from hyperglass.models import rfc8522
-from hyperglass.models import types
-from hyperglass.models import validators