Refactoring the folder structure