Add some New Util Classes, add Filters for Shortcode code, and JS fixes
Some files were left behind
Merge