Updating the latest code with a partial reimplementation for the
template codes. Adding helper classes to the source list cmake file for
inclusion into the build