renaming and reorganizing (mostly Utils classes)