1207 directories refactored