Update packaging to support source package creation and upload
More readability fixes