update package script for file locations
(cherry picked from commit 511a0c8c04cfc7ef406c06a8b2c187aade88ac41)
update packaging script for post-3.6 file moves