Adding more package structure