Ads refactoring

Ads are now partials