Refactor packages and class names