Correcting the package structure