Refactored classes, eliminated unused classes