fix completion
reorganise /web