Refactor, Reorganize, Redo!