Added caching in privacy service, moved classes in privacy manager to separate files