move data files around, clean up dir structure