Move spec files around to match their new counterpart names