- move UBO declarations in UibGenerator, i.e. next to their Uniform Interface Block definition. This should help forgetting to update one but not the other. - move UniformInterfaceBlock.h and SamplerInferfaceBlock.h under private/filament/. - do the same things for samplers