updated package structure