various small changes, moves around data and renames files