Restructure StatusChecks