Re-organization + plugins update