Yes, the Calguns.net upgrade is in progress. You can check on progress on the Calguns FB page or in the Announcements and Suggestions forum on Calguns.org.
As for Calguns.org, it is working just fine for me.
Should be just another day or two according to the Admin.