diff --git a/docs/source/client_handlers.rst b/docs/source/client_handlers.rst
index 88b4f6d..baf509b 100644
--- a/docs/source/client_handlers.rst
+++ b/docs/source/client_handlers.rst
@@ -14,4 +14,4 @@ NpmClientHandler
 PipClientHandler
 ----------------
 
-.. autoclass:: lsp_utils.PipClientHandler
+.. autoclass:: lsp_utils.pip_client_handler.PipClientHandler
diff --git a/st3/lsp_utils/__init__.py b/st3/lsp_utils/__init__.py
index 2476ecf..50805fc 100644
--- a/st3/lsp_utils/__init__.py
+++ b/st3/lsp_utils/__init__.py
@@ -4,7 +4,6 @@
 from .api_wrapper_interface import ApiWrapperInterface
 from .generic_client_handler import GenericClientHandler
 from .npm_client_handler import NpmClientHandler
-from .pip_client_handler import PipClientHandler
 from .server_npm_resource import ServerNpmResource
 from .server_pip_resource import ServerPipResource
 from .server_resource_interface import ServerResourceInterface
@@ -15,9 +14,8 @@
     'ClientHandler',
     'GenericClientHandler',
     'NpmClientHandler',
-    'PipClientHandler',
     'ServerResourceInterface',
-    'ServerStatus'
+    'ServerStatus',
     'ServerNpmResource',
     'ServerPipResource',
     'notification_handler',