Refactor everything to column family