Coming from a mod's POV, I do lump X-Men under Marvel. The way I see it is, if it's ~technically~ Marvel (be it MAU, MCU, or a combination), it's getting put under that general heading. I would also put Agents of S.H.I.E.L.D. in with the rest of the Marvel universe.