moved tracker to separate folder