Simplified plugin loading
Added separate files for plugins
Added new aliases