minor mods, renaming, reorganizing