+1 on moving this into a dedicated package.  For future reference, you can use `git mv` instead of `mv` to make sure that the history follows the file.