wip
move files around; sync with current images