Modified the package structure