[Issue #15] Refactored the binary namespace.