make classes public.
Remove CoreData