NEI Consolidation

Addons and Plugins moved under NEI.