refactoring in directory structure