change name of project
Re-organize folders