Refactoring and cleaning folders