moved templates into their own appropriate namespaces. started test templates