Rewrite almost

for new directory construction rule