Moving uneeded modules into contrib