<Minor> Moved some draw classes