[VP] updated package structure