Replaced CL_Sprite/CL_Surface/CL_PixelBuffer with Sprite/Surface/PixelBuffer