Refactor offline bits out of Features class and use for CCR
#3477
+923
−494
Features class and use for CCR
#3477