Changing directory stucture before merging with master