More directory structure refactoring