update new dir structure for dev spm3.x