More glob based. Getting rid of dirs.