Organised specs into submodules.
Fixed up organisation of `run` calls.
Update dependencies.