Renamed Booking class, and new Booking class

Everything refactored.