Refactoring folder directories