diff --git a/docs/conf.py b/docs/conf.py
index 4d3630a5b..3e1acae41 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -7,7 +7,7 @@
 import os
 import sys
 
-from pkg_resources import DistributionNotFound, get_distribution
+from importlib.metadata import version, PackageNotFoundError
 
 # -- Path setup --------------------------------------------------------------
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -28,15 +28,14 @@ def chdir(directory):
 
 
 try:
-    dist = get_distribution("weaviate")
-except DistributionNotFound:
+    dist = version("weaviate")
+except PackageNotFoundError:
     # The project is not installed in readthedocs environment. Read the version with setuptools_scm.
     import setuptools_scm
 
     with chdir(".."):
         release = setuptools_scm.get_version()
-else:
-    release = dist.version
+
 
 # -- Project information -----------------------------------------------------
 
diff --git a/docs/weaviate.batch.rst b/docs/weaviate.batch.rst
deleted file mode 100644
index d55cccb81..000000000
--- a/docs/weaviate.batch.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-weaviate.batch package
-======================
-
-.. automodule:: weaviate.batch
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-weaviate.batch.crud\_batch module
----------------------------------
-
-.. automodule:: weaviate.batch.crud_batch
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-weaviate.batch.requests module
-------------------------------
-
-.. automodule:: weaviate.batch.requests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/weaviate.classification.rst b/docs/weaviate.classification.rst
deleted file mode 100644
index f7909b6a0..000000000
--- a/docs/weaviate.classification.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-weaviate.classification package
-===============================
-
-.. automodule:: weaviate.classification
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-weaviate.classification.classification module
----------------------------------------------
-
-.. automodule:: weaviate.classification.classification
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-weaviate.classification.config\_builder module
-----------------------------------------------
-
-.. automodule:: weaviate.classification.config_builder
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/weaviate.contextionary.rst b/docs/weaviate.contextionary.rst
deleted file mode 100644
index 2879e5250..000000000
--- a/docs/weaviate.contextionary.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-weaviate.contextionary package
-==============================
-
-.. automodule:: weaviate.contextionary
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-weaviate.contextionary.crud\_contextionary module
--------------------------------------------------
-
-.. automodule:: weaviate.contextionary.crud_contextionary
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/weaviate.data.references.rst b/docs/weaviate.data.references.rst
deleted file mode 100644
index f095fac77..000000000
--- a/docs/weaviate.data.references.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-weaviate.data.references package
-================================
-
-.. automodule:: weaviate.data.references
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-weaviate.data.references.crud\_references module
-------------------------------------------------
-
-.. automodule:: weaviate.data.references.crud_references
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/weaviate.data.replication.rst b/docs/weaviate.data.replication.rst
deleted file mode 100644
index 270fe44df..000000000
--- a/docs/weaviate.data.replication.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-weaviate.data.replication package
-=================================
-
-.. automodule:: weaviate.data.replication
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-weaviate.data.replication.replication module
---------------------------------------------
-
-.. automodule:: weaviate.data.replication.replication
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/weaviate.data.rst b/docs/weaviate.data.rst
deleted file mode 100644
index ebc06d6c1..000000000
--- a/docs/weaviate.data.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-weaviate.data package
-=====================
-
-.. automodule:: weaviate.data
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   weaviate.data.references
-   weaviate.data.replication
-
-Submodules
-----------
-
-weaviate.data.crud\_data module
--------------------------------
-
-.. automodule:: weaviate.data.crud_data
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/weaviate.proto.rst b/docs/weaviate.proto.rst
deleted file mode 100644
index 8f3ad3dff..000000000
--- a/docs/weaviate.proto.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-weaviate.proto package
-======================
-
-.. automodule:: weaviate.proto
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   weaviate.proto.v1
diff --git a/docs/weaviate.proto.v1.rst b/docs/weaviate.proto.v1.rst
deleted file mode 100644
index 0bb0733f8..000000000
--- a/docs/weaviate.proto.v1.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-weaviate.proto.v1 package
-=========================
-
-.. automodule:: weaviate.proto.v1
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-weaviate.proto.v1.base\_pb2 module
-----------------------------------
-
-.. automodule:: weaviate.proto.v1.base_pb2
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-weaviate.proto.v1.base\_pb2\_grpc module
-----------------------------------------
-
-.. automodule:: weaviate.proto.v1.base_pb2_grpc
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-weaviate.proto.v1.batch\_pb2 module
------------------------------------
-
-.. automodule:: weaviate.proto.v1.batch_pb2
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-weaviate.proto.v1.batch\_pb2\_grpc module
------------------------------------------
-
-.. automodule:: weaviate.proto.v1.batch_pb2_grpc
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-weaviate.proto.v1.search\_get\_pb2 module
------------------------------------------
-
-.. automodule:: weaviate.proto.v1.search_get_pb2
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-weaviate.proto.v1.search\_get\_pb2\_grpc module
------------------------------------------------
-
-.. automodule:: weaviate.proto.v1.search_get_pb2_grpc
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-weaviate.proto.v1.weaviate\_pb2 module
---------------------------------------
-
-.. automodule:: weaviate.proto.v1.weaviate_pb2
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-weaviate.proto.v1.weaviate\_pb2\_grpc module
---------------------------------------------
-
-.. automodule:: weaviate.proto.v1.weaviate_pb2_grpc
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/weaviate.schema.properties.rst b/docs/weaviate.schema.properties.rst
deleted file mode 100644
index 3aca3885a..000000000
--- a/docs/weaviate.schema.properties.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-weaviate.schema.properties package
-==================================
-
-.. automodule:: weaviate.schema.properties
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
-----------
-
-weaviate.schema.properties.crud\_properties module
---------------------------------------------------
-
-.. automodule:: weaviate.schema.properties.crud_properties
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/weaviate.schema.rst b/docs/weaviate.schema.rst
deleted file mode 100644
index a0d648566..000000000
--- a/docs/weaviate.schema.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-weaviate.schema package
-=======================
-
-.. automodule:: weaviate.schema
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
------------
-
-.. toctree::
-   :maxdepth: 4
-
-   weaviate.schema.properties
-
-Submodules
-----------
-
-weaviate.schema.crud\_schema module
------------------------------------
-
-.. automodule:: weaviate.schema.crud_schema
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/setup.cfg b/setup.cfg
index 7e3d6eb58..21aa664cd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,8 +23,10 @@ packages =
     weaviate.collections
     weaviate.connect
     weaviate.gql
+    weaviate.outputs
     weaviate.proto
     weaviate.proto.v1
+    weaviate.rbac
 
 platforms = any
 include_package_data = True