Move of CXF into seperate bundles