Better fixture directory structure
Reorganize specs