yeah, I would see it as a 2 step process… otherwise you may do a lot of refactor work only to find out people disagree what is public.