moved more stuff to groovy-psi