initial package restructure