Starting scaffolder refactoring