Added wro4j & small cleanup.