restructured map structure