Refactored high-level class names
Refactored high-level class names