Refactored shuttles data models

Refactored the shuttles data model and pretty much everything that goes with it.

Gonna need some serious testing because I'm sure I missed some things. I also haven't updated the local notifications to use the new manager yet - will do this week.
Ahh I thought I removed all of these. thanks