Move contrib module to their own folder