Restructure so GAM easier to find & change later.
Merge branch 'master' of https://github.com/rdegennaro/bip-gam