Changed the packaging a bit