Trip object rather than list, moved data_model

This might be super buggy, because I haven't been able to test it.
simulationLogic creates Trip objects and imports data_model (which I
moved to the same directory)
Am I me yet?