Rearrange spec files
That's apparently important
Fix a bunch of specs