diff --git a/src/ConfigObject.php b/src/Config/ConfigObject.php
similarity index 62%
rename from src/ConfigObject.php
rename to src/Config/ConfigObject.php
index 4b688b86..940cbf75 100644
--- a/src/ConfigObject.php
+++ b/src/Config/ConfigObject.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Digia\GraphQL;
+namespace Digia\GraphQL\Config;
 
 class ConfigObject
 {
diff --git a/src/ConfigTrait.php b/src/Config/ConfigTrait.php
similarity index 97%
rename from src/ConfigTrait.php
rename to src/Config/ConfigTrait.php
index 252e638a..7f87d322 100644
--- a/src/ConfigTrait.php
+++ b/src/Config/ConfigTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Digia\GraphQL;
+namespace Digia\GraphQL\Config;
 
 trait ConfigTrait
 {
diff --git a/src/Language/AST/Node/AbstractNode.php b/src/Language/AST/Node/AbstractNode.php
index 8b82b423..5a7dd0a9 100644
--- a/src/Language/AST/Node/AbstractNode.php
+++ b/src/Language/AST/Node/AbstractNode.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Language\AST\Node;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\Location;
 use Digia\GraphQL\SerializationInterface;
 use function Digia\GraphQL\Util\jsonEncode;
diff --git a/src/Type/Definition/Argument.php b/src/Type/Definition/Argument.php
index 50b931de..4940fa66 100644
--- a/src/Type/Definition/Argument.php
+++ b/src/Type/Definition/Argument.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 
diff --git a/src/Type/Definition/Directive.php b/src/Type/Definition/Directive.php
index 1fa3791e..f6dc2b38 100644
--- a/src/Type/Definition/Directive.php
+++ b/src/Type/Definition/Directive.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 
 class Directive extends ConfigObject implements DirectiveInterface
 {
diff --git a/src/Type/Definition/EnumType.php b/src/Type/Definition/EnumType.php
index f76ae9af..00e13f73 100644
--- a/src/Type/Definition/EnumType.php
+++ b/src/Type/Definition/EnumType.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\EnumTypeDefinitionNode;
 use Digia\GraphQL\Language\AST\Node\NodeInterface;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
diff --git a/src/Type/Definition/EnumValue.php b/src/Type/Definition/EnumValue.php
index a98d788f..92cd8018 100644
--- a/src/Type/Definition/EnumValue.php
+++ b/src/Type/Definition/EnumValue.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\EnumValueDefinitionNode;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 
diff --git a/src/Type/Definition/Field.php b/src/Type/Definition/Field.php
index 137a9a9c..6aa0c666 100644
--- a/src/Type/Definition/Field.php
+++ b/src/Type/Definition/Field.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 
 class Field extends ConfigObject
diff --git a/src/Type/Definition/InputField.php b/src/Type/Definition/InputField.php
index 06c588b2..83093226 100644
--- a/src/Type/Definition/InputField.php
+++ b/src/Type/Definition/InputField.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\InputValueDefinitionNode;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 
diff --git a/src/Type/Definition/InputObjectType.php b/src/Type/Definition/InputObjectType.php
index 260faca3..4876e84b 100644
--- a/src/Type/Definition/InputObjectType.php
+++ b/src/Type/Definition/InputObjectType.php
@@ -18,7 +18,7 @@
  *     });
  */
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\InputObjectTypeDefinitionNode;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use function Digia\GraphQL\Type\isAssocArray;
diff --git a/src/Type/Definition/InterfaceType.php b/src/Type/Definition/InterfaceType.php
index 0d0b82e5..fed1fd86 100644
--- a/src/Type/Definition/InterfaceType.php
+++ b/src/Type/Definition/InterfaceType.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\InterfaceTypeDefinitionNode;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 
diff --git a/src/Type/Definition/ObjectType.php b/src/Type/Definition/ObjectType.php
index a2613a67..3905cfc8 100644
--- a/src/Type/Definition/ObjectType.php
+++ b/src/Type/Definition/ObjectType.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\ObjectTypeDefinitionNode;
 use function Digia\GraphQL\Type\resolveThunk;
diff --git a/src/Type/Definition/ScalarType.php b/src/Type/Definition/ScalarType.php
index a7a47225..a16d531d 100644
--- a/src/Type/Definition/ScalarType.php
+++ b/src/Type/Definition/ScalarType.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\NodeInterface;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\ScalarTypeDefinitionNode;
diff --git a/src/Type/Definition/UnionType.php b/src/Type/Definition/UnionType.php
index aa0d2253..7124e39d 100644
--- a/src/Type/Definition/UnionType.php
+++ b/src/Type/Definition/UnionType.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type\Definition;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use function Digia\GraphQL\Type\resolveThunk;
 use function Digia\GraphQL\Util\invariant;
diff --git a/src/Type/Schema.php b/src/Type/Schema.php
index 4b106cf4..0eaa4fac 100644
--- a/src/Type/Schema.php
+++ b/src/Type/Schema.php
@@ -2,7 +2,7 @@
 
 namespace Digia\GraphQL\Type;
 
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Config\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\SchemaDefinitionNode;
 use Digia\GraphQL\Type\Definition\AbstractTypeInterface;