Updated hierarchy
Updated Folder management