change dir structure again