Merge pull request #1 from ipa-fmw/indigo_new_structure

Indigo new structure