Modify structure for theme3 branch