Move some stuff to the contrib directory