Fix plugin/admin export standalone HTML
Reorganization