Refactored packages and class names