rearranged spec_helper and spec dir