Changing build structure to work in Git