Refactor class names and package structures