[minor] Re-order internal structure for class exposure