small bugfix

use classes instead of strcuts