Reorganization and add various plugins, options