Fix project namespaces
Tidy up for doxygen generation
Merge branch 'master' of https://github.com/V02460/CTT.git