updated package structure 2.4