Support directory structure as required