diff --git a/src/ol/render/webgl/webglreplay.js b/src/ol/render/webgl/webglreplay.js
index ee9d2190f3..07d847eab8 100644
--- a/src/ol/render/webgl/webglreplay.js
+++ b/src/ol/render/webgl/webglreplay.js
@@ -11,8 +11,8 @@ goog.require('ol.extent');
 goog.require('ol.render.IReplayGroup');
 goog.require('ol.render.webgl.imagereplay.shader.Color');
 goog.require('ol.render.webgl.imagereplay.shader.Default');
-goog.require('ol.structs.Buffer');
 goog.require('ol.vec.Mat4');
+goog.require('ol.webgl.Buffer');
 
 
 
@@ -97,7 +97,7 @@ ol.render.webgl.ImageReplay = function(tolerance, maxExtent) {
   this.indices_ = [];
 
   /**
-   * @type {ol.structs.Buffer}
+   * @type {ol.webgl.Buffer}
    * @private
    */
   this.indicesBuffer_ = null;
@@ -181,7 +181,7 @@ ol.render.webgl.ImageReplay = function(tolerance, maxExtent) {
   this.vertices_ = [];
 
   /**
-   * @type {ol.structs.Buffer}
+   * @type {ol.webgl.Buffer}
    * @private
    */
   this.verticesBuffer_ = null;
@@ -429,7 +429,7 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) {
   goog.asserts.assert(this.images_.length == this.groupIndices_.length);
 
   // create, bind, and populate the vertices buffer
-  this.verticesBuffer_ = new ol.structs.Buffer(this.vertices_);
+  this.verticesBuffer_ = new ol.webgl.Buffer(this.vertices_);
   context.bindBuffer(goog.webgl.ARRAY_BUFFER, this.verticesBuffer_);
 
   var indices = this.indices_;
@@ -439,7 +439,7 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) {
       indices[indices.length - 1], context.hasOESElementIndexUint);
 
   // create, bind, and populate the indices buffer
-  this.indicesBuffer_ = new ol.structs.Buffer(indices);
+  this.indicesBuffer_ = new ol.webgl.Buffer(indices);
   context.bindBuffer(goog.webgl.ELEMENT_ARRAY_BUFFER, this.indicesBuffer_);
 
   goog.asserts.assert(this.textures_.length === 0);
diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js
index 39d5248f10..4f09f7b881 100644
--- a/src/ol/renderer/webgl/webgllayerrenderer.js
+++ b/src/ol/renderer/webgl/webgllayerrenderer.js
@@ -10,7 +10,7 @@ goog.require('ol.render.webgl.Immediate');
 goog.require('ol.renderer.Layer');
 goog.require('ol.renderer.webgl.map.shader.Color');
 goog.require('ol.renderer.webgl.map.shader.Default');
-goog.require('ol.structs.Buffer');
+goog.require('ol.webgl.Buffer');
 
 
 
@@ -26,9 +26,9 @@ ol.renderer.webgl.Layer = function(mapRenderer, layer) {
 
   /**
    * @private
-   * @type {ol.structs.Buffer}
+   * @type {ol.webgl.Buffer}
    */
-  this.arrayBuffer_ = new ol.structs.Buffer([
+  this.arrayBuffer_ = new ol.webgl.Buffer([
     -1, -1, 0, 0,
     1, -1, 1, 0,
     -1, 1, 0, 1,
diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js
index 426f0fbc4e..005eebcf38 100644
--- a/src/ol/renderer/webgl/webgltilelayerrenderer.js
+++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js
@@ -16,8 +16,8 @@ goog.require('ol.layer.Tile');
 goog.require('ol.math');
 goog.require('ol.renderer.webgl.Layer');
 goog.require('ol.renderer.webgl.tilelayer.shader');
-goog.require('ol.structs.Buffer');
 goog.require('ol.tilecoord');
+goog.require('ol.webgl.Buffer');
 
 
 
@@ -52,9 +52,9 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
 
   /**
    * @private
-   * @type {ol.structs.Buffer}
+   * @type {ol.webgl.Buffer}
    */
-  this.renderArrayBuffer_ = new ol.structs.Buffer([
+  this.renderArrayBuffer_ = new ol.webgl.Buffer([
     0, 0, 0, 1,
     1, 0, 1, 1,
     0, 1, 0, 0,
diff --git a/src/ol/structs/buffer.js b/src/ol/webgl/buffer.js
similarity index 71%
rename from src/ol/structs/buffer.js
rename to src/ol/webgl/buffer.js
index 7faf1a4029..a39194ccf6 100644
--- a/src/ol/structs/buffer.js
+++ b/src/ol/webgl/buffer.js
@@ -1,4 +1,4 @@
-goog.provide('ol.structs.Buffer');
+goog.provide('ol.webgl.Buffer');
 
 goog.require('goog.array');
 goog.require('goog.webgl');
@@ -8,7 +8,7 @@ goog.require('ol');
 /**
  * @enum {number}
  */
-ol.structs.BufferUsage = {
+ol.webgl.BufferUsage = {
   STATIC_DRAW: goog.webgl.STATIC_DRAW,
   STREAM_DRAW: goog.webgl.STREAM_DRAW,
   DYNAMIC_DRAW: goog.webgl.DYNAMIC_DRAW
@@ -22,7 +22,7 @@ ol.structs.BufferUsage = {
  * @param {number=} opt_usage Usage.
  * @struct
  */
-ol.structs.Buffer = function(opt_arr, opt_usage) {
+ol.webgl.Buffer = function(opt_arr, opt_usage) {
 
   /**
    * @private
@@ -35,7 +35,7 @@ ol.structs.Buffer = function(opt_arr, opt_usage) {
    * @type {number}
    */
   this.usage_ = goog.isDef(opt_usage) ?
-      opt_usage : ol.structs.BufferUsage.STATIC_DRAW;
+      opt_usage : ol.webgl.BufferUsage.STATIC_DRAW;
 
 };
 
@@ -43,7 +43,7 @@ ol.structs.Buffer = function(opt_arr, opt_usage) {
 /**
  * @return {Array.<number>} Array.
  */
-ol.structs.Buffer.prototype.getArray = function() {
+ol.webgl.Buffer.prototype.getArray = function() {
   return this.arr_;
 };
 
@@ -51,6 +51,6 @@ ol.structs.Buffer.prototype.getArray = function() {
 /**
  * @return {number} Usage.
  */
-ol.structs.Buffer.prototype.getUsage = function() {
+ol.webgl.Buffer.prototype.getUsage = function() {
   return this.usage_;
 };
diff --git a/src/ol/webgl/context.js b/src/ol/webgl/context.js
index 4920b290ef..cacb9aeb5f 100644
--- a/src/ol/webgl/context.js
+++ b/src/ol/webgl/context.js
@@ -6,12 +6,12 @@ goog.require('goog.events');
 goog.require('goog.log');
 goog.require('goog.object');
 goog.require('ol.has');
-goog.require('ol.structs.Buffer');
+goog.require('ol.webgl.Buffer');
 goog.require('ol.webgl.WebGLContextEventType');
 
 
 /**
- * @typedef {{buf: ol.structs.Buffer,
+ * @typedef {{buf: ol.webgl.Buffer,
  *            buffer: WebGLBuffer}}
  */
 ol.webgl.BufferCacheEntry;
@@ -91,7 +91,7 @@ ol.webgl.Context = function(canvas, gl) {
  * the WebGL buffer, bind it, populate it, and add an entry to
  * the cache.
  * @param {number} target Target.
- * @param {ol.structs.Buffer} buf Buffer.
+ * @param {ol.webgl.Buffer} buf Buffer.
  */
 ol.webgl.Context.prototype.bindBuffer = function(target, buf) {
   var gl = this.getGL();
@@ -124,7 +124,7 @@ ol.webgl.Context.prototype.bindBuffer = function(target, buf) {
 
 
 /**
- * @param {ol.structs.Buffer} buf Buffer.
+ * @param {ol.webgl.Buffer} buf Buffer.
  */
 ol.webgl.Context.prototype.deleteBuffer = function(buf) {
   var gl = this.getGL();
diff --git a/test/spec/ol/structs/buffer.test.js b/test/spec/ol/webgl/buffer.test.js
similarity index 76%
rename from test/spec/ol/structs/buffer.test.js
rename to test/spec/ol/webgl/buffer.test.js
index 454e36ce77..7d7153e32e 100644
--- a/test/spec/ol/structs/buffer.test.js
+++ b/test/spec/ol/webgl/buffer.test.js
@@ -1,7 +1,7 @@
-goog.provide('ol.test.structs.Buffer');
+goog.provide('ol.test.webgl.Buffer');
 
 
-describe('ol.structs.Buffer', function() {
+describe('ol.webgl.Buffer', function() {
 
   describe('constructor', function() {
 
@@ -9,7 +9,7 @@ describe('ol.structs.Buffer', function() {
 
       var b;
       beforeEach(function() {
-        b = new ol.structs.Buffer();
+        b = new ol.webgl.Buffer();
       });
 
       it('constructs an empty instance', function() {
@@ -22,7 +22,7 @@ describe('ol.structs.Buffer', function() {
 
       var b;
       beforeEach(function() {
-        b = new ol.structs.Buffer([0, 1, 2, 3]);
+        b = new ol.webgl.Buffer([0, 1, 2, 3]);
       });
 
       it('constructs a populated instance', function() {
@@ -37,7 +37,7 @@ describe('ol.structs.Buffer', function() {
 
     var b;
     beforeEach(function() {
-      b = new ol.structs.Buffer();
+      b = new ol.webgl.Buffer();
     });
 
     describe('getArray', function() {
@@ -52,4 +52,4 @@ describe('ol.structs.Buffer', function() {
 
 });
 
-goog.require('ol.structs.Buffer');
+goog.require('ol.webgl.Buffer');