Refactoring codec WIP 6