Refactor - simplify loading of namespaces
Refactor - Add missing headers on load-org-trello* files