Adding rename with extension
Adding flexibility on imput files