Move MapData into its own file