Update+restructure www+gps-wapoints