Added proposed final maps, cleaned up structure