Add UserIdQuery(0204),refactor package name to A/B