Added plugin and autoload dirs