Dfp refactor

@sdillingham please make sure this matches your criteria.

Listen Live is empty without OAS now, so that will need to be addressed.