Refactored Scaffolders and Generators