Updated demo POMs to new Util
Replaced most Java with Xtend