build steps, plugin refactoring