COMMONS-190: unified search - reorganize portlet code (cleanup template files)