Completely refactor SRG module