Overhaul of the package structure