Added plugin dirs and classes