Flatten spec directory structure a bit