directory structure refactoring.