Move Uniform and UniformArray into separate files