Change plugin structure