Moving the spec to new format