moving the classes to another plugin