Some reorganizing and renaming