Clean-up changes to Buffer, Shader, Shape
Added a missing file