Added hierarchical folder structure