diff --git a/tests/pycommons/lang/__init__.py b/pycommons/__init__.py
similarity index 100%
rename from tests/pycommons/lang/__init__.py
rename to pycommons/__init__.py
diff --git a/pycommons/base/atomic/atomic.py b/pycommons/base/atomic/atomic.py
index d19b643..603b57d 100644
--- a/pycommons/base/atomic/atomic.py
+++ b/pycommons/base/atomic/atomic.py
@@ -1,6 +1,6 @@
 from typing import TypeVar, Generic, Optional
 
-from pycommons.base.base.synchronized import RLockSynchronized, synchronized
+from pycommons.base.synchronized import RLockSynchronized, synchronized
 from pycommons.base.container import Container
 
 _T = TypeVar("_T")
diff --git a/pycommons/base/atomic/boolean.py b/pycommons/base/atomic/boolean.py
index b4dc5e0..4fc7d7e 100644
--- a/pycommons/base/atomic/boolean.py
+++ b/pycommons/base/atomic/boolean.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from pycommons.base.atomic.atomic import Atomic
-from pycommons.base.base.synchronized import synchronized
+from pycommons.base.synchronized import synchronized
 from pycommons.base.container.boolean import BooleanContainer
 
 
diff --git a/pycommons/base/atomic/integer.py b/pycommons/base/atomic/integer.py
index b103deb..781dd74 100644
--- a/pycommons/base/atomic/integer.py
+++ b/pycommons/base/atomic/integer.py
@@ -1,5 +1,5 @@
 from pycommons.base.atomic.atomic import Atomic
-from pycommons.base.base.synchronized import synchronized
+from pycommons.base.synchronized import synchronized
 from pycommons.base.container import IntegerContainer
 
 
diff --git a/pycommons/base/base/__init__.py b/pycommons/base/base/__init__.py
deleted file mode 100644
index 77277ef..0000000
--- a/pycommons/base/base/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from .char import Char, CharType
-from .synchronized import Synchronized
-
-__all__ = ["Char", "CharType"]
diff --git a/pycommons/base/base/char.py b/pycommons/base/char.py
similarity index 100%
rename from pycommons/base/base/char.py
rename to pycommons/base/char.py
diff --git a/pycommons/base/base/synchronized.py b/pycommons/base/synchronized.py
similarity index 100%
rename from pycommons/base/base/synchronized.py
rename to pycommons/base/synchronized.py
diff --git a/pycommons/base/utils/objectutils.py b/pycommons/base/utils/objectutils.py
index 00a44fa..f501347 100644
--- a/pycommons/base/utils/objectutils.py
+++ b/pycommons/base/utils/objectutils.py
@@ -1,11 +1,13 @@
 import typing
 from typing import TypeVar, Optional
 
+from pycommons.base.utils.utils import UtilityClass
+
 _T = TypeVar("_T")
 _E = TypeVar("_E", Exception, RuntimeError)
 
 
-class ObjectUtils:
+class ObjectUtils(UtilityClass):
     @classmethod
     def require_not_none(cls, t: Optional[_T], e: Optional[_E] = None) -> None:
         if t is None:
diff --git a/pycommons/base/utils/utils.py b/pycommons/base/utils/utils.py
new file mode 100644
index 0000000..4863d7b
--- /dev/null
+++ b/pycommons/base/utils/utils.py
@@ -0,0 +1,3 @@
+class UtilityClass:
+    def __init__(self) -> None:
+        raise ValueError("A utility class cannot be instantiated")
diff --git a/tests/pycommons/lang/atomic/__init__.py b/tests/pycommons/base/__init__.py
similarity index 100%
rename from tests/pycommons/lang/atomic/__init__.py
rename to tests/pycommons/base/__init__.py
diff --git a/tests/pycommons/lang/container/__init__.py b/tests/pycommons/base/atomic/__init__.py
similarity index 100%
rename from tests/pycommons/lang/container/__init__.py
rename to tests/pycommons/base/atomic/__init__.py
diff --git a/tests/pycommons/lang/atomic/test_atomic.py b/tests/pycommons/base/atomic/test_atomic.py
similarity index 100%
rename from tests/pycommons/lang/atomic/test_atomic.py
rename to tests/pycommons/base/atomic/test_atomic.py
diff --git a/tests/pycommons/lang/atomic/test_boolean.py b/tests/pycommons/base/atomic/test_boolean.py
similarity index 100%
rename from tests/pycommons/lang/atomic/test_boolean.py
rename to tests/pycommons/base/atomic/test_boolean.py
diff --git a/tests/pycommons/lang/char_tests.py b/tests/pycommons/base/char_tests.py
similarity index 97%
rename from tests/pycommons/lang/char_tests.py
rename to tests/pycommons/base/char_tests.py
index 1ce6759..404e603 100644
--- a/tests/pycommons/lang/char_tests.py
+++ b/tests/pycommons/base/char_tests.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from pycommons.base.base import Char
+from pycommons.base.char import Char
 
 
 class CharTest(TestCase):
diff --git a/tests/pycommons/lang/utils/__init__.py b/tests/pycommons/base/container/__init__.py
similarity index 100%
rename from tests/pycommons/lang/utils/__init__.py
rename to tests/pycommons/base/container/__init__.py
diff --git a/tests/pycommons/lang/container/test_boolean.py b/tests/pycommons/base/container/test_boolean.py
similarity index 100%
rename from tests/pycommons/lang/container/test_boolean.py
rename to tests/pycommons/base/container/test_boolean.py
diff --git a/tests/pycommons/lang/container/test_container.py b/tests/pycommons/base/container/test_container.py
similarity index 100%
rename from tests/pycommons/lang/container/test_container.py
rename to tests/pycommons/base/container/test_container.py
diff --git a/tests/pycommons/lang/container/test_optional.py b/tests/pycommons/base/container/test_optional.py
similarity index 100%
rename from tests/pycommons/lang/container/test_optional.py
rename to tests/pycommons/base/container/test_optional.py
diff --git a/tests/pycommons/base/utils/__init__.py b/tests/pycommons/base/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/pycommons/lang/utils/test_objectutils.py b/tests/pycommons/base/utils/test_objectutils.py
similarity index 100%
rename from tests/pycommons/lang/utils/test_objectutils.py
rename to tests/pycommons/base/utils/test_objectutils.py