Add support for nested directories