CORE-5196: Injected deservice facade and properties into disk res svc
CORE-5196: Moved classes into more appropriate packages
CORE-5196: Replaced previously deleted TODOs, etc.