refactoring directory structure