Add template Controller and move search controller