More reorganizing and renaming