tweaks and file renames, reorg