#87 #88 Ad collector is moved into a separate application