file restructure + map