fixed typo  g1 -> g2
(#343)
updated after file restructuring
(#343)
resolved merge
(#343)