Move extras/ to contrib/