Package the contrib files differently.

Adept to the new structure.