Improvements to namespaces and file inclusion