Last fix of package structure.