Shuffle some things around.
Add jenkins silo mock.