Improvement/packaging

This might break some of the current work for @matteverson, so he's probably the best approver on this PR