Packaging: On the road to a cleaner package

Based on Zigo's recommendations, this commit is trying to make the
package better.