Rearranged folderstructure