Removed some cruft.
Moved a few functions into helpers.py
Cleaned up some file structure