Restructured classes, added bitmap render surface