Changed folder structure (one subfolder less)