Added more decoding.
Renamed dir gsr->src