I think it's fine separated this way. I suspect the $brand.header stuff is going to get refactored soon anyhow.