restructure for rb296 and rb299 support