More structural changes. Damn.
Rebuilt plugin system.