Directory structure refactoring.