fix2 directory structure