Updated filter to match new directory structure