migrate some remaining Java classes to Xtend