Reorganized water controller library

Made file organization consistent with other libraries. Ie. one .h and
.cpp file for each type of water controller.