Fixing packaging... Yay!

Packaging fixed. Kinda. Still need to work out how the installer is installing (or not) and what's going on there.