For anyone interested, here is a great article on git-subtree and where I learned about it from:

https://developer.atlassian.com/blog/2015/05/the-power-of-gi...