Refactor: Initiate factory refactor for trips

* Modularize file structure so that trip & trip factory are in same module
* Create factory for trip for persistence