Refactoring the directory structure and requirement management