Re arrange the structure between location and watchlist