moved content; cleaned up imports

also created helpers.py
more refactoring; added a test