Modify structure for master branch