Rev groovy, refactor develop-extras