Changed the folder structure and added some more problems.