Namespaced the lib better, made OO members public.