Resolve #3588703 "Single directory components"

Manuel Bermúdezrequested to merge
issue/artisan-3588703:3588703-single-directory-components into 3.x

Closes #3588703

Merge request reports