Refactor code layout.