Directory reorganization to newer layout