Final cxf cleanup

Rearranging poms and cleaning out Spring XML of CXF leftovers