Refactoring dir structure