updated package structre