added namespace handling after testing packaging - will need some more work (@see TODO)