Fixed some Template Organization