Refactor packages and project name