Move GPS to device specific tree instead of common