Changed template files to match new Builder interface and compile.
Templates in this commit are still empty, but at least compile.