Refactoring: rename $extra_files into $app_extra_files