Spec + changed dir structure