Tidying up namespaces - easier to rename first, then change project level.  Also changed html to be simpler.