Changed folder structure of project