Updated the project settings and renamed some files