Reorganised package structure