Changed Folder Structure.