restructure aquifer mods
updates for DCV