Put the runners in their own module + small changes.