Updated plugin dir structure