code restructuring

2 jobs for !10 with entropy_closure in 5 minutes and 32 seconds (queued for 1 second)
merge request