General Cleanup and reconfiguration of the POMs to actually get things to build.