Change plugin structure to a more personal understandable format