fix moved Remapping msg module, closes #45
Merge branch 'hydro-devel' into opp
move services