reorganize master to facilitate building and working with git