Removed TODO comment.
Rearraged namespaces.