Update with new approj structure. Add Amazon iap support.