Reorganized the path names and their handling.