Fix organization on plugin