Server Disk Space monitoring changes

Server Disk Space monitoring changes - plus refactoring