renaming a few classes / packages