Refactoring Resources and Bookings