Reorganize the `uniforms` module a bit