Refactoring package upload to make cufts import cleaner
More refactoring of package upload