Adjusting paths to be more intuitive.
Merge pull request #37 from cschroed-usgs/WATERSMART-268

Adjusting paths to be more intuitive.