diff --git a/v2/skyflow/client/__init__.py b/v2/skyflow/client/__init__.py
index 1e682f1..7f40ee0 100644
--- a/v2/skyflow/client/__init__.py
+++ b/v2/skyflow/client/__init__.py
@@ -1 +1 @@
-from ._skyflow import Skyflow
\ No newline at end of file
+from .skyflow import Skyflow
\ No newline at end of file
diff --git a/v2/skyflow/client/_skyflow.py b/v2/skyflow/client/skyflow.py
similarity index 94%
rename from v2/skyflow/client/_skyflow.py
rename to v2/skyflow/client/skyflow.py
index 30500a2..a137897 100644
--- a/v2/skyflow/client/_skyflow.py
+++ b/v2/skyflow/client/skyflow.py
@@ -1,5 +1,4 @@
 from typing import List, Optional
-from v2.skyflow.management.config import ManagementConfig
 from v2.skyflow.utils import LogLevel
 from v2.skyflow.vault.config import VaultConfig, CredentialsConfig, ConnectionConfig
 
@@ -7,7 +6,7 @@
 class Skyflow:
     def __init__(self,
                  vault_config: List[VaultConfig],
-                 skyflow_credentials: Optional[CredentialsConfig],
+                 skyflow_credentials: Optional[CredentialsConfig] = None,
                  connection_config: Optional[List[ConnectionConfig]] = None,
                  log_level: Optional[LogLevel] = None):
         self.vault_config = vault_config
@@ -47,7 +46,7 @@ def update_connection_config(self, connection_config: ConnectionConfig):
         def update_log_level(self, log_level: LogLevel):
             pass
 
-        def log_level(self, log_level: str):
+        def set_log_level(self, log_level: str):
             pass
 
         def build(self):
diff --git a/v2/skyflow/data/__init__.py b/v2/skyflow/data/__init__.py
deleted file mode 100644
index 1c9887b..0000000
--- a/v2/skyflow/data/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from v2.skyflow.vault import (
-    InsertRequest,
-)
\ No newline at end of file
diff --git a/v2/skyflow/utils/_validations/__init__.py b/v2/skyflow/utils/_validations/__init__.py
new file mode 100644
index 0000000..c9c70fe
--- /dev/null
+++ b/v2/skyflow/utils/_validations/__init__.py
@@ -0,0 +1 @@
+from ._validations import Validations
\ No newline at end of file
diff --git a/v2/skyflow/utils/_validations.py b/v2/skyflow/utils/_validations/_validations.py
similarity index 100%
rename from v2/skyflow/utils/_validations.py
rename to v2/skyflow/utils/_validations/_validations.py
diff --git a/v2/skyflow/vault/controller/_audit.py b/v2/skyflow/vault/controller/_audit.py
index 67ecd6f..ebda25f 100644
--- a/v2/skyflow/vault/controller/_audit.py
+++ b/v2/skyflow/vault/controller/_audit.py
@@ -1,4 +1,4 @@
-class Audit:
+class AuditController:
     #members
     def __init__(self):
         pass
diff --git a/v2/skyflow/vault/controller/_bin_look_up.py b/v2/skyflow/vault/controller/_bin_look_up.py
index 5e85e08..eade965 100644
--- a/v2/skyflow/vault/controller/_bin_look_up.py
+++ b/v2/skyflow/vault/controller/_bin_look_up.py
@@ -1,4 +1,4 @@
-class BinLookUp:
+class BinLookUpController:
     #members
     def __init__(self):
         pass
diff --git a/v2/skyflow/vault/controller/_connections.py b/v2/skyflow/vault/controller/_connections.py
index 0f0caa8..580f1bf 100644
--- a/v2/skyflow/vault/controller/_connections.py
+++ b/v2/skyflow/vault/controller/_connections.py
@@ -1,4 +1,4 @@
-class Connection:
+class ConnectionController:
     #members
     def __init__(self):
         pass
diff --git a/v2/skyflow/vault/controller/_detect.py b/v2/skyflow/vault/controller/_detect.py
deleted file mode 100644
index 0b0d8aa..0000000
--- a/v2/skyflow/vault/controller/_detect.py
+++ /dev/null
@@ -1,5 +0,0 @@
-class Detect:
-    #members
-    def __init__(self):
-        pass
-    #methods
\ No newline at end of file
diff --git a/v2/skyflow/vault/controller/_vault.py b/v2/skyflow/vault/controller/_vault.py
index ab76d90..421f4f2 100644
--- a/v2/skyflow/vault/controller/_vault.py
+++ b/v2/skyflow/vault/controller/_vault.py
@@ -1,4 +1,4 @@
-class Vault:
+class VaultController:
     #members
     def __init__(self):
         pass
diff --git a/v2/skyflow/vault/model/data/options/_insert_options.py b/v2/skyflow/vault/model/data/options/insert_options.py
similarity index 100%
rename from v2/skyflow/vault/model/data/options/_insert_options.py
rename to v2/skyflow/vault/model/data/options/insert_options.py
diff --git a/v2/skyflow/vault/model/data/request/__init__.py b/v2/skyflow/vault/model/data/request/__init__.py
index 7b03049..1637524 100644
--- a/v2/skyflow/vault/model/data/request/__init__.py
+++ b/v2/skyflow/vault/model/data/request/__init__.py
@@ -1,2 +1,2 @@
 from ._detokenize import DetokenizeRequest
-from ._insert import InsertRequest
\ No newline at end of file
+from .insert import InsertRequest
\ No newline at end of file
diff --git a/v2/skyflow/vault/model/data/request/_insert.py b/v2/skyflow/vault/model/data/request/insert.py
similarity index 100%
rename from v2/skyflow/vault/model/data/request/_insert.py
rename to v2/skyflow/vault/model/data/request/insert.py
diff --git a/v2/skyflow/vault/model/data/response/__init__.py b/v2/skyflow/vault/model/data/response/__init__.py
index 89c379f..049d28c 100644
--- a/v2/skyflow/vault/model/data/response/__init__.py
+++ b/v2/skyflow/vault/model/data/response/__init__.py
@@ -1,2 +1,2 @@
-from _insert import InsertResponse
+from insert import InsertResponse
 from _detokenize import DetokenizeResponse
\ No newline at end of file
diff --git a/v2/skyflow/vault/model/data/response/_insert.py b/v2/skyflow/vault/model/data/response/insert.py
similarity index 100%
rename from v2/skyflow/vault/model/data/response/_insert.py
rename to v2/skyflow/vault/model/data/response/insert.py