1. Cleanup imports
2. Move helpers into helpers package
3. Update tests and dependencies due to change in 2