Remove some rendering classes
Revert "Remove some rendering classes"

This reverts commit b31527c0b6cfcad6102d9b8cafaf1535459f538d.