Refactored two Ads + Payment models.
Merge remote-tracking branch 'origin/master'