Changed file structure of project