Move CF & name it proper

Change-Id: I61281a882b56abe7dfaaff0da522907bf376a8fd