Refactored models into a subdirectory
All data now in data/'
Calibrate & homogenise script put together
Minor edits
Cleaning after refactor