Refactored class names. Added Privacy policy