Merge pull request #1 from ipa-fmw/indigo_new_structure

Indigo new structure
Merge pull request #11 from ipa-cob4-2/indigo_dev

Merge pull request #1 from ipa-fmw/indigo_new_structure