Move convenience instances into a new package

This means some general cleanup and minuses.