refactoring file and directory names