diff --git a/src/flextype/flextype.php b/src/flextype/flextype.php
index 65c273c3..ae2a2e13 100644
--- a/src/flextype/flextype.php
+++ b/src/flextype/flextype.php
@@ -348,28 +348,28 @@ container()->set('serializers', new Serializers());
 container()->set('images', static function () {
 
     // Get image settings driver
-    $imagesSettingsDriver = ['driver' => registry()->get('flextype.settings.images.driver')];
+    $imagesSettingsDriver = ['driver' => registry()->get('flextype.settings.api.images.driver')];
 
     // Set source filesystem
     $source = new Flysystem(
-        new Local(PATH['project'] . registry()->get('flextype.settings.images.directory')),
+        new Local(PATH['project'] . registry()->get('flextype.settings.api.images.directory')),
     );
 
     // Set cache filesystem
     $cache = new Flysystem(
-        new Local(PATH['tmp'] . registry()->get('flextype.settings.images.cache.directory'))
+        new Local(PATH['tmp'] . registry()->get('flextype.settings.api.images.cache.directory'))
     );
 
     // Set watermarks filesystem
     $watermarks = new Flysystem(
-        new Local(PATH['project'] . registry()->get('flextype.settings.images.watermarks.directory'))
+        new Local(PATH['project'] . registry()->get('flextype.settings.api.images.watermarks.directory'))
     );
 
     // Set image manager
     $imageManager = new ImageManager($imagesSettingsDriver);
 
     // Set max image size
-    $maxImageSize = registry()->get('flextype.settings.images.max_image_size.width') * registry()->get('flextype.settings.images.max_image_size.height');
+    $maxImageSize = registry()->get('flextype.settings.api.images.max_image_size.width') * registry()->get('flextype.settings.api.images.max_image_size.height');
 
     // Set manipulators
     $manipulators = [
@@ -400,7 +400,7 @@ container()->set('images', static function () {
     ]);
 
     // Set presets
-    $server->setPresets(registry()->get('flextype.settings.images.presets'));
+    $server->setPresets(registry()->get('flextype.settings.api.images.presets'));
 
     // Set Glide response factory
     $server->setResponseFactory(
diff --git a/src/flextype/settings.yaml b/src/flextype/settings.yaml
index c3bd3659..7da27c9b 100644
--- a/src/flextype/settings.yaml
+++ b/src/flextype/settings.yaml
@@ -666,31 +666,6 @@ upload:
   process:
     image:
       quality: 70
-
-# Images
-#
-# - driver:               Images driver (gd, imagick)
-#
-# - directory:            Images directory.
-#
-# - watermarks.directory: Watermarks directory.
-#
-# - cache.enabled:        Set to true to enable images caching.
-#
-# - cache.directory:      Images cache directory.
-#
-# - presets:              Group of presets for images processing.
-images:
-  driver: gd
-  directory: '/uploads'
-  max_image_size: 
-    width: 2000 
-    height: 2000
-  watermarks: 
-    directory: '/watermarks'
-  cache:
-    directory: '/images'
-  presets: []
     
 # Session
 #
@@ -698,15 +673,63 @@ images:
 # Standard PHP session configuration options
 # https://secure.php.net/manual/en/session.configuration.php
 session:
+
+  # Session name
   name: Flextype
 
 # Flextype Rest APIs
 api:
+
+  # Entries API
   entries:
+
+    # Set to true to enable Entries API
     enabled: true
+
+  # Registry API
   registry:
+
+    # Set to true to enable Registry API
     enabled: true
+
+  # Images API
   images:
+
+    # Set to true to enable Images API
     enabled: true
+
+    # Images driver (gd, imagick)
+    driver: gd
+
+    # Images directory.
+    directory: '/uploads'
+
+    # Images max size
+    max_image_size: 
+
+      # Image max width
+      width: 2000 
+
+      # Image max height
+      height: 2000
+
+    # Images watermarks
+    watermarks: 
+
+      # Images watermarks directory
+      directory: '/watermarks'
+
+    # Images cache
+    cache:
+
+      # Images cache directory
+      directory: '/images'
+    
+    # Group of presets for images processing.
+    presets: []
+
+  # Utils API
   utils:
+
+    # Set to true to enable Utils API
     enabled: true
\ No newline at end of file