revisit pack structure, fix pack include, fix find scripts