My 2nd map: A church with many different places (hallway, graveyard, underwater hall etc.) Try it out
Good but still slightly sloppy in its design. It is a big improvement from your previous map.