Fixed count issues with files, dirs and imports