rearrange aqua blocks lib; modify template for testimonial shortcode