Fixed the new top-N directory structure.