Add recipe steps to clone CF modules
Remove CF submodules
Fix conflict