Moved cfb code to cfb folder