cleanup and reformating

trying to save myself grief later with the hydraulic system for when
other use it. I've split it into two parts api for working with FM and
core for using the pipe network system.