Removed complicated logic of handling same name files within a dir tree. Yet to replace with simpler logic. Some UI improvements.