Clean up pom, Code style fixes, Pull cxf service definition into separate file.