Updated Folder Hierarchy