We should probably revisit our contribs and decide which should go away, which should be promoted into the main src and which should stay contrib