Planning with diffeomorphisms (reorganization)