Merge "Update script to match upstream structure"