Suite refactoring model