renames some classes and cleans up