File name and directories refactoring