refactoring intor directories