SW: Move plugin components back to main
Authored by: arcachofo 2017-06-19
Parent: [r98]
Child: [r100]