Remove discovery dir, move rest to drivers