Rearrange spec/ directory to clean up hierarchies