Reorganization of diffeomorphism modeling/learning