renamend and strucktured the plugins