harmonize with cob structure
beautifying
Merge pull request #31 from ipa-fxm/groovy_dev

Harmonizing and beautifying