Merge pull request #29 from ipa-fxm/groovy_dev

minor cleaning up
Merge pull request #30 from ipa-fxm/groovy_dev

remove obsolete files
Merge pull request #31 from ipa-fxm/groovy_dev

Harmonizing and beautifying