Direct plugin refactored to common, classes deprecated (fixes #610)