Refactor the kata structure.