Refactor code to search for binaries either in root of binary folder or in a subfolder named after the binary.