Move privacy server to separate class