restructuring master branch