Refactor offline bits out of Features class and use for CCR
#3477
+856
−317
Features class and use for CCR
#3477