Organize plugin structure