Moved remaining files from queryj-templates. refs #464