Switched to appropriate names for dir/files
Added arbor graphs for orvsd, prod clusters