Move all changes into the angeli files.

4 jobs for !2613 with feature/improve-angeli
latest merge request