Always load case on diagnosis

- Also restructure current states file into separate files