reorganize master to make building and future branching easier with git