diff --git a/src-php/Adapters/CloudinaryAdapter.php b/src-php/Adapters/CloudinaryAdapter.php
index 8530d01..6212ff5 100644
--- a/src-php/Adapters/CloudinaryAdapter.php
+++ b/src-php/Adapters/CloudinaryAdapter.php
@@ -19,11 +19,19 @@ class CloudinaryAdapter extends CloudinaryBaseAdapter
      */
     public function writeStream($path, $resource, Config $config)
     {
-        $path = pathinfo($path)['filename'];
+        $pathinfo = pathinfo($path);
+        $folder = $pathinfo['dirname'];
+        $path = $pathinfo['filename'];
+
+        $options = ['public_id' => $path, 'resource_type' => 'auto'];
+
+        if ($folder != '.') {
+            $options['folder'] = $folder;
+        }
 
         $resource_metadata = stream_get_meta_data($resource);
-        $uploaded_metadata = Uploader::upload($resource_metadata['uri'], ['public_id' => $path, 'resource_type' => 'auto']);
-        
+        $uploaded_metadata = Uploader::upload($resource_metadata['uri'], $options);
+
         return $uploaded_metadata;
     }