Make count_lines work with the new directory layout