Remove old and very useless contributed modules and move newer contributed modules into 'contrib'