g2 - reorganize, refactor.