Restructure map