diff --git a/opvious/__init__.py b/opvious/__init__.py
index c650eb1..c633238 100644
--- a/opvious/__init__.py
+++ b/opvious/__init__.py
@@ -1,6 +1,6 @@
 import logging
 
-from .client import Client, ClientSetting, Problem
+from .client import Client, DEMO_ENDPOINT, Problem
 from .common import __version__, Annotation
 from .data.outcomes import (
     AbortedOutcome,
@@ -51,7 +51,7 @@
 __all__ = [
     # Client
     "Client",
-    "ClientSetting",
+    "DEMO_ENDPOINT",
     # Executors
     "executors",
     # Specifications
diff --git a/opvious/client/__init__.py b/opvious/client/__init__.py
index 7f4efb2..b8c07e0 100644
--- a/opvious/client/__init__.py
+++ b/opvious/client/__init__.py
@@ -1,5 +1,5 @@
-from .common import Problem
-from .handlers import Client, DEMO_ENDPOINT
+from .common import DEMO_ENDPOINT, Problem
+from .handlers import Client
 
 __all__ = [
     "Client",