refactored model extension on files in model package