Tidying up packaging a little