shifted around the classes to be more composer-friendly.. because it expects one class per file
updated the base example to use the proper class