File and file name refactoring.