Updated templates to match the VS ones (this avoids changes in the VCS log)
Updated namespace calculation to also use the project namespace.
New build