Updating: reorganizing contrib/linux