Add Class event type in addition to services

I would like to see two different options, one for booking services, one for booking classes. For a class, a user would create a one time or recurring class. When a visitor visits the website, they can select the class without having to select the employee, time slot, etc. (simimlar to the way Amelia Plugin works). You can have classes but then you can have separate events. For example, when booking a massage, it makes sense to pick your masseuse, day, time, type, etc. But classes are different and should be selected from a list of events or a calendar and booked with one or two steps.