Directory layout refactoring