Refactor offline bits out of Features class and use for CCR
#3477
+931
−502
Features class and use for CCR
#3477