Spec splitting

...