moved third-party code to contrib