refactor bookingFactory out of flaps