Moving and renaming things is probably a good part of the cleanup. It's always nice to cleanly separate refactoring from feature work when you have the...