WaterSmart-404: Refactored and cleaned up all 4 maps to prepare for incorporating directive.