Cleanup and renaming some classes