Little tidying of packages