Better subdir handling