Moved groovy class to the right package