Tidy-up of packages