Re-org
Broke functions into functions.py and updated other modules to load
from there (some trouble when loading functions from __init__.)