Fix specs to match tree layout of resources