Added support for multiple folder structures.