rearrange some imports

24 jobs for !194 with shearlet_admm in 47 minutes and 32 seconds (queued for 3 seconds)
merge request