grand folder refactoring