moved plugins
addtional fixes to get plugins working