GPS: Rearrange xml and conf

Rearrange and adding info into gps.xml and gps.conf