move classes to get them into provider jars