It's annoying to move code between modules, especially when doing a _bulk_ move, since you can't easily verify the move, and you can't easily review the move decision without reviewing huge patches. I'm working on a tool to fix that by doing a two step annotate-then-move process.