Updated Folder Layout / Removed Duplicates