Move everything to the new namespace caf