Refactor of filename.
Added ext to filename