rename and refactor project