Merge "Encapsulate textures into their own Texture class" into klp-dev