Move types to drivers, add schema