brandon_r6: restructured