Folder-structure now matches internal structure & names