Cleaning up SVN mess from package re-org