changed all the files with new project folder structure