reorg files, fix glplugin