Update for imports due to package refactor