Harmonising directory structure for punch