Rearrange code.
2 files changed