Changed the class name to avoid conflict with the other demo plugin.
Re-ordered the classes to place parent classes prior to the extended classes.