Tidied up cross platform packager.