re organize plugin