Fixing hydromap performance and correctness
Adding Bill's fix for the discharge file
Moving files to their correct location