Update to latest version of inuit fork

* Adds support for folder based includes
* Upated cherry-pick demo to used folder based includes