Move modules into contrib directory