move driver to more logical namespace