Move tools to contrib/tools