moved plugin to proper folder
few bugs