Changed plugin structure.