It was. A portion of what was HUQ-1 was moved over to HSC-3, and some of the other bodies were moved over to the Wing.
While there are still FSs operating with HSM at the moment, the plan is that HSC will be the owner and -3 will be the RAG. The sims you trained on, Fester, will go away and may or may not be replaced with Manned Flight units (I'm guessing they won't unless the SOF-support mission gets continued).