refactoring dir structure