Updated path filters and directory organization