Location restructure