Re-organize chsc.h a bit more to move the structure I forgot