fixed packaging

please note the commit messages