Rename project and refactor code