Moved plugin to its own module