Moved templates into templates directory and renamed/recompiled with -k each.