Put Mitch's refactor as the root, and the old/bad version in the old/ folder, just in case we need to reference it for any reason at some point.