Common Code Base

Common Source Code for AVoD & SVoD
Revert "Common Code Base"

This reverts commit c148f34d5c3fbf1fd2a8a4541f195c79f8f1c465.