1207 before refactoring dirs