Changed file name and dir