Remove namespaces
Cleanup comment
Move types into collector files