Package tidy-up

Renamed classes and moved packaged to make hotel vs flight distinction
more explicit