- [misc] additional structure reorganization