Changing plugin structure