Minor tweaks
Reorganized files and cleaned up utils.py. Also started working on Wellington