Updates for factoring out irrelevant classes.
Moved all of the Disk Resource model objects now that old models are out