Rearranged folder structure of project.