Readd xorg class

Change-Id: I1634fd106e5cffed51b1d28cfce787191c072d2c