diff --git a/.pylintrc b/.pylintrc
index da39a7ea7..0ef4ee6be 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -441,6 +441,7 @@ good-names=i,
            k,
            ex,
            Run,
+           do,
            _
 
 # Good variable names regexes, separated by a comma. If names match any regex,
diff --git a/weaviate/__init__.py b/weaviate/__init__.py
index 1bb96a982..dd05eb1dc 100644
--- a/weaviate/__init__.py
+++ b/weaviate/__init__.py
@@ -42,7 +42,7 @@
     'SchemaValidationException',
 ]
 
-from .auth import AuthClientCredentials, AuthClientPassword
+from .version import __version__
 from .exceptions import *
+from .auth import AuthClientCredentials, AuthClientPassword
 from .client import Client
-from .version import __version__
diff --git a/weaviate/batch/crud_batch.py b/weaviate/batch/crud_batch.py
index fe202bce0..a100e4c59 100644
--- a/weaviate/batch/crud_batch.py
+++ b/weaviate/batch/crud_batch.py
@@ -6,7 +6,7 @@
 from numbers import Real
 from typing import Tuple, Callable, Optional, Sequence
 from requests import ReadTimeout, Response
-from weaviate import RequestsConnectionError, UnexpectedStatusCodeException
+from weaviate.exceptions import RequestsConnectionError, UnexpectedStatusCodeException
 from weaviate.connect import Connection
 from .requests import BatchRequest, ObjectsBatchRequest, ReferenceBatchRequest
 
diff --git a/weaviate/classification/classification.py b/weaviate/classification/classification.py
index a77dfceb0..94d3abace 100644
--- a/weaviate/classification/classification.py
+++ b/weaviate/classification/classification.py
@@ -2,7 +2,7 @@
 Classification class definition.
 """
 import validators
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from weaviate.exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from weaviate.connect import Connection
 from .config_builder import ConfigBuilder
 
diff --git a/weaviate/client.py b/weaviate/client.py
index 366a6da9d..e33600092 100644
--- a/weaviate/client.py
+++ b/weaviate/client.py
@@ -3,7 +3,8 @@
 """
 from typing import Optional, Tuple, Union
 from numbers import Real
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from .auth import AuthCredentials
+from .exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from .connect import Connection
 from .classification import Classification
 from .schema import Schema
@@ -11,7 +12,6 @@
 from .batch import Batch
 from .data import DataObject
 from .gql import Query
-from .auth import AuthCredentials
 
 
 class Client:
diff --git a/weaviate/connect/connection.py b/weaviate/connect/connection.py
index 76008c15a..38a999747 100644
--- a/weaviate/connect/connection.py
+++ b/weaviate/connect/connection.py
@@ -7,7 +7,7 @@
 from numbers import Real
 import requests
 from requests import RequestException
-from weaviate import AuthenticationFailedException
+from weaviate.exceptions import AuthenticationFailedException
 from weaviate.auth import AuthCredentials
 from weaviate.util import _get_valid_timeout_config
 
diff --git a/weaviate/contextionary/crud_contextionary.py b/weaviate/contextionary/crud_contextionary.py
index 8ca4df0c2..3f4b2b331 100644
--- a/weaviate/contextionary/crud_contextionary.py
+++ b/weaviate/contextionary/crud_contextionary.py
@@ -1,7 +1,7 @@
 """
 Contextionary class definition.
 """
-from weaviate import RequestsConnectionError, UnexpectedStatusCodeException
+from weaviate.exceptions import RequestsConnectionError, UnexpectedStatusCodeException
 from weaviate.connect import Connection
 
 
diff --git a/weaviate/data/crud_data.py b/weaviate/data/crud_data.py
index 0c9fcdb6c..5c254ba71 100644
--- a/weaviate/data/crud_data.py
+++ b/weaviate/data/crud_data.py
@@ -4,9 +4,11 @@
 from typing import Union, Optional, List, Sequence
 import validators
 from weaviate.connect import Connection
-from weaviate import ObjectAlreadyExistsException
-from weaviate import RequestsConnectionError
-from weaviate import UnexpectedStatusCodeException
+from weaviate.exceptions import (
+    ObjectAlreadyExistsException,
+    RequestsConnectionError,
+    UnexpectedStatusCodeException
+)
 from weaviate.util import _get_dict_from_object, get_vector, get_valid_uuid
 from weaviate.data.references import Reference
 
diff --git a/weaviate/data/references/crud_references.py b/weaviate/data/references/crud_references.py
index 6c8a5d9be..b775df0e5 100644
--- a/weaviate/data/references/crud_references.py
+++ b/weaviate/data/references/crud_references.py
@@ -3,7 +3,7 @@
 """
 from typing import Union
 from weaviate.connect import Connection
-from weaviate import RequestsConnectionError, UnexpectedStatusCodeException
+from weaviate.exceptions import RequestsConnectionError, UnexpectedStatusCodeException
 from weaviate.util import get_valid_uuid
 
 
diff --git a/weaviate/gql/filter.py b/weaviate/gql/filter.py
index cce9e95d8..b66be6aa1 100644
--- a/weaviate/gql/filter.py
+++ b/weaviate/gql/filter.py
@@ -7,7 +7,7 @@
 from typing import Optional
 from abc import ABC, abstractmethod
 from weaviate.connect import Connection
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from weaviate.exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from weaviate.util import get_vector
 
 class GraphQL(ABC):
diff --git a/weaviate/gql/query.py b/weaviate/gql/query.py
index 0071eaa18..d6c4c7a95 100644
--- a/weaviate/gql/query.py
+++ b/weaviate/gql/query.py
@@ -3,7 +3,7 @@
 """
 from typing import List, Union
 from weaviate.connect import Connection
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from weaviate.exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from .get import GetBuilder
 from .aggregate import AggregateBuilder
 
diff --git a/weaviate/schema/crud_schema.py b/weaviate/schema/crud_schema.py
index 469c0aba1..f205ee406 100644
--- a/weaviate/schema/crud_schema.py
+++ b/weaviate/schema/crud_schema.py
@@ -4,7 +4,7 @@
 from typing import Union, Optional
 from weaviate.connect import Connection
 from weaviate.util import _get_dict_from_object, _is_sub_schema
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from weaviate.exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from weaviate.schema.validate_schema import validate_schema, check_class
 from weaviate.schema.properties import Property
 
diff --git a/weaviate/schema/properties/crud_properties.py b/weaviate/schema/properties/crud_properties.py
index 932241587..0eaed4817 100644
--- a/weaviate/schema/properties/crud_properties.py
+++ b/weaviate/schema/properties/crud_properties.py
@@ -1,7 +1,7 @@
 """
 Property class definition.
 """
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from weaviate.exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from weaviate.schema.validate_schema import check_property
 from weaviate.util import _get_dict_from_object
 from weaviate.connect import Connection
diff --git a/weaviate/schema/validate_schema.py b/weaviate/schema/validate_schema.py
index 046d1dfc3..e337df4e9 100644
--- a/weaviate/schema/validate_schema.py
+++ b/weaviate/schema/validate_schema.py
@@ -2,7 +2,7 @@
 Schema validation module.
 """
 from typing import Any
-from weaviate import SchemaValidationException
+from weaviate.exceptions import SchemaValidationException
 
 
 def validate_schema(schema: dict) -> None:
diff --git a/weaviate/util.py b/weaviate/util.py
index e05f06fa4..3af381813 100644
--- a/weaviate/util.py
+++ b/weaviate/util.py
@@ -4,7 +4,7 @@
 import os
 import json
 import base64
-import uuid
+import uuid as uuid_lib
 from typing import Union, Sequence, Tuple, Any
 from numbers import Real
 from io import BufferedReader
@@ -446,4 +446,4 @@ def generate_uuid5(identifier: Any, namespace: Any = "") -> str:
         The UUID as a string.
     """
 
-    return str(uuid.uuid5(uuid.NAMESPACE_DNS, str(namespace) + str(identifier)))
+    return str(uuid_lib.uuid5(uuid_lib.NAMESPACE_DNS, str(namespace) + str(identifier)))
diff --git a/weaviate/version.py b/weaviate/version.py
index 3c357caa2..84e4891db 100644
--- a/weaviate/version.py
+++ b/weaviate/version.py
@@ -2,4 +2,4 @@
 Weaviate-Python-Client version.
 """
 
-__version__ = "3.0.0"
+__version__ = "3.1.0.dev0"
diff --git a/weaviate/wcs/crud_wcs.py b/weaviate/wcs/crud_wcs.py
index fbdf5ec13..5a5b821f7 100644
--- a/weaviate/wcs/crud_wcs.py
+++ b/weaviate/wcs/crud_wcs.py
@@ -7,7 +7,7 @@
 import json
 from tqdm import tqdm
 from weaviate.connect import Connection
-from weaviate import RequestsConnectionError, UnexpectedStatusCodeException
+from weaviate.exceptions import RequestsConnectionError, UnexpectedStatusCodeException
 from weaviate.auth import AuthCredentials