Directory structure refactoring