New driver scheme. Started cleanup of the code transition.
Repo cleanup and rough refactoring