Move Extras to separate suite

They have sat in the shard startup code for too long