Refactor namespaces and update tests accordingly.
Update include instructions