Refactor project name and package