Improvements to shortcode includes

Improvements to shortcode includes and remove templates.