Refactor: Change physical layout of code and logical namespaces to improve Doxygen generated docs