Re-organize as subproject of CAF