Changed code structure for testability
Added consituent types enum and fixed a display value for parameters
supported
Merge pull request #5 from thongsav-usgs/NAWQAAN-333

Changed code structure for testability