Update package script to match current directory structure