Ads refactoring
Merge pull request #20 from jcarlosgarcia/ads-refactoring

Ads refactoring