Delete unused classes and standardize class naming