restructure, user location