Added some plugins, fixed dirs