updated the package structure