Refactor. Rename.
Refactor. Move.
Refactor. Rename.
Refactor. Move.