Moving things around, renaming classes