directory structure refactoring