Updatig: reorganizing contrib/linux