Inner structure of quadrature refactored

2 jobs for feature_quadrature in 5 minutes and 47 seconds (queued for 2 seconds)