trying the binasher namespacing model

also, yes, I need better variable names. I'm bad at it

Change-Id: Id07ac77a50b7fbe1575d9edd4bb8826a24b9329d
Merge "trying the binasher namespacing model" into production