reorged dir structure