moved template files to correct location and corrected a few config errors