Moved contents of Action into Plugin