Refactored class and file names