Move modules from contrib.
Remove contrib.