Update templates in order to user Template engine custom helper tags
dir rename