Refactoring requirements layout