Minor CMake file fix
DeclNode refactor
Namespace refactor