move files into subdirs, update references