fix & separating plugin to a directory