More directory refactoring