further polishing to the directory structure