Add groovy, remove presentation-layer refs