Updating structure to reflect latest plugin structure