diff --git a/src/DataStructures/StrictList.php b/src/DataStructures/StrictList.php
index 17b0791..2634156 100644
--- a/src/DataStructures/StrictList.php
+++ b/src/DataStructures/StrictList.php
@@ -24,7 +24,7 @@ namespace OCC\Basics\DataStructures;
 
 use InvalidArgumentException;
 use SplDoublyLinkedList;
-use OCC\Basics\Trait\Getter;
+use OCC\Basics\Traits\Getter;
 
 /**
  * A type-sensitive, taversable List.
@@ -141,7 +141,7 @@ class StrictList extends SplDoublyLinkedList
 
     /**
      * Magic getter method for $this->allowedTypes.
-     * @see OCC\Basics\Trait\Getter
+     * @see OCC\Basics\Traits\Getter
      *
      * @return array The list of allowed item types
      */
diff --git a/src/HelperFunction/throwErrorException.php b/src/Functions/throwErrorException.php
similarity index 92%
rename from src/HelperFunction/throwErrorException.php
rename to src/Functions/throwErrorException.php
index 2c23e75..1c5e4ae 100644
--- a/src/HelperFunction/throwErrorException.php
+++ b/src/Functions/throwErrorException.php
@@ -20,14 +20,14 @@
 
 declare(strict_types=1);
 
-namespace OCC\Basics\HelperFunction;
+namespace OCC\Basics\Functions;
 
 use ErrorException;
 
 /**
  * Converts an internal PHP error into an ErrorException.
  *
- * Usage: set_error_handler('\\OCC\\Basics\\HelperFunction\\throwErrorException');
+ * Usage: set_error_handler('\\OCC\\Basics\\Functions\\throwErrorException');
  *
  * @author Sebastian Meyer <sebastian.meyer@opencultureconsulting.com>
  * @package opencultureconsulting/basics
diff --git a/src/InterfaceTrait/ArrayAccess.php b/src/InterfaceTraits/ArrayAccess.php
similarity index 98%
rename from src/InterfaceTrait/ArrayAccess.php
rename to src/InterfaceTraits/ArrayAccess.php
index cd941b8..e1b8ed7 100644
--- a/src/InterfaceTrait/ArrayAccess.php
+++ b/src/InterfaceTraits/ArrayAccess.php
@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace OCC\Basics\InterfaceTrait;
+namespace OCC\Basics\InterfaceTraits;
 
 /**
  * A generic implementation of the ArrayAccess interface.
diff --git a/src/InterfaceTrait/Countable.php b/src/InterfaceTraits/Countable.php
similarity index 97%
rename from src/InterfaceTrait/Countable.php
rename to src/InterfaceTraits/Countable.php
index 8f9e399..90978f1 100644
--- a/src/InterfaceTrait/Countable.php
+++ b/src/InterfaceTraits/Countable.php
@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace OCC\Basics\InterfaceTrait;
+namespace OCC\Basics\InterfaceTraits;
 
 /**
  * A generic implementation of the Countable interface.
diff --git a/src/InterfaceTrait/Iterator.php b/src/InterfaceTraits/Iterator.php
similarity index 98%
rename from src/InterfaceTrait/Iterator.php
rename to src/InterfaceTraits/Iterator.php
index 038e966..198e25b 100644
--- a/src/InterfaceTrait/Iterator.php
+++ b/src/InterfaceTraits/Iterator.php
@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace OCC\Basics\InterfaceTrait;
+namespace OCC\Basics\InterfaceTraits;
 
 /**
  * A generic implementation of the Iterator interface.
diff --git a/src/InterfaceTrait/IteratorAggregate.php b/src/InterfaceTraits/IteratorAggregate.php
similarity index 97%
rename from src/InterfaceTrait/IteratorAggregate.php
rename to src/InterfaceTraits/IteratorAggregate.php
index 7ec2d49..fddb307 100644
--- a/src/InterfaceTrait/IteratorAggregate.php
+++ b/src/InterfaceTraits/IteratorAggregate.php
@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace OCC\Basics\InterfaceTrait;
+namespace OCC\Basics\InterfaceTraits;
 
 use ArrayIterator;
 
diff --git a/src/Trait/Getter.php b/src/Traits/Getter.php
similarity index 98%
rename from src/Trait/Getter.php
rename to src/Traits/Getter.php
index 1a21f84..dd0a2fa 100644
--- a/src/Trait/Getter.php
+++ b/src/Traits/Getter.php
@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace OCC\Basics\Trait;
+namespace OCC\Basics\Traits;
 
 use InvalidArgumentException;
 
diff --git a/src/Trait/Setter.php b/src/Traits/Setter.php
similarity index 98%
rename from src/Trait/Setter.php
rename to src/Traits/Setter.php
index 44d0ed2..3e0815b 100644
--- a/src/Trait/Setter.php
+++ b/src/Traits/Setter.php
@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace OCC\Basics\Trait;
+namespace OCC\Basics\Traits;
 
 use InvalidArgumentException;
 
diff --git a/src/Trait/Singleton.php b/src/Traits/Singleton.php
similarity index 98%
rename from src/Trait/Singleton.php
rename to src/Traits/Singleton.php
index e209f6a..1bbba94 100644
--- a/src/Trait/Singleton.php
+++ b/src/Traits/Singleton.php
@@ -20,7 +20,7 @@
 
 declare(strict_types=1);
 
-namespace OCC\Basics\Trait;
+namespace OCC\Basics\Traits;
 
 use LogicException;