Yan reorganise project dirs

This is a very sensitive merge which needs further tests