Reorganize the code before merging.