Refactor and modularize mock plugin
refactor builder