Move trail out of the contrib directory in preparation for eventual merge