change gfw data structure
Merge branch '2.0' into 3.0