Move some classes out to more generic utils repo and update imports.