Fixing readme and refactoring plugin definition