As per the commit message - keep the class files just for defining the class symbols, and instantiate them outside of the class (in this case, the main plugin file).