Changing directory structure and file name changes