Refactor orignal structure.