Modify structure for theme2 branch