renaming a class
Rearranging some stuff.