update structure of plugin slightly.