standardize class capitalization and remove unused imports, and split proxy classes