3.7/plugin updates
Merge branch 'restructure'