renaming some files, make scratch project clean