Updated the package structure