Refactored plugin loading, and removed addon packages.